From 40949f3e290920de2184e7ceb32d8224ccdc13e1 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Fri, 12 Jun 2015 21:41:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/annimon/ownlang/parser/Parser.java    |  4 +--
 .../parser/ast/VariableExpression.java        | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 src/com/annimon/ownlang/parser/ast/VariableExpression.java

diff --git a/src/com/annimon/ownlang/parser/Parser.java b/src/com/annimon/ownlang/parser/Parser.java
index 53a9e97..bb48bb0 100644
--- a/src/com/annimon/ownlang/parser/Parser.java
+++ b/src/com/annimon/ownlang/parser/Parser.java
@@ -5,7 +5,7 @@ import com.annimon.ownlang.parser.ast.AssignmentStatement;
 import com.annimon.ownlang.parser.ast.BinaryExpression;
 import com.annimon.ownlang.parser.ast.BlockStatement;
 import com.annimon.ownlang.parser.ast.ConditionalExpression;
-import com.annimon.ownlang.parser.ast.VariabletExpression;
+import com.annimon.ownlang.parser.ast.VariableExpression;
 import com.annimon.ownlang.parser.ast.Expression;
 import com.annimon.ownlang.parser.ast.ForStatement;
 import com.annimon.ownlang.parser.ast.IfStatement;
@@ -239,7 +239,7 @@ public final class Parser {
             return new ValueExpression(Long.parseLong(current.getText(), 16));
         }
         if (match(TokenType.WORD)) {
-            return new VariabletExpression(current.getText());
+            return new VariableExpression(current.getText());
         }
         if (match(TokenType.TEXT)) {
             return new ValueExpression(current.getText());
diff --git a/src/com/annimon/ownlang/parser/ast/VariableExpression.java b/src/com/annimon/ownlang/parser/ast/VariableExpression.java
new file mode 100644
index 0000000..4943913
--- /dev/null
+++ b/src/com/annimon/ownlang/parser/ast/VariableExpression.java
@@ -0,0 +1,29 @@
+package com.annimon.ownlang.parser.ast;
+
+import com.annimon.ownlang.lib.Value;
+import com.annimon.ownlang.lib.Variables;
+
+/**
+ *
+ * @author aNNiMON
+ */
+public final class VariableExpression implements Expression {
+    
+    private final String name;
+    
+    public VariableExpression(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public Value eval() {
+        if (!Variables.isExists(name)) throw new RuntimeException("Constant does not exists");
+        return Variables.get(name);
+    }
+
+    @Override
+    public String toString() {
+//        return String.format("%s [%f]", name, Constants.get(name));
+        return String.format("%s", name);
+    }
+}