Parse variable, with test

ajlopez · Dec 16, 2011 · 7c010ec · 7c010ec
1 parent 2ca779c
commit 7c010ec
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Src/AjLang.Tests/Compiler/ParserTests.cs b/Src/AjLang.Tests/Compiler/ParserTests.cs
@@ -26,5 +26,21 @@ public void ParseInteger()
 
             Assert.IsNull(parser.ParseExpression());
         }
+
+        [TestMethod]
+        public void ParseVariable()
+        {
+            Parser parser = new Parser("foo");
+            IExpression expr = parser.ParseExpression();
+
+            Assert.IsNotNull(expr);
+            Assert.IsInstanceOfType(expr, typeof(VariableExpression));
+
+            VariableExpression vexpr = (VariableExpression)expr;
+
+            Assert.AreEqual("foo", vexpr.Name);
+
+            Assert.IsNull(parser.ParseExpression());
+        }
     }
 }
diff --git a/Src/AjLang/Compiler/Parser.cs b/Src/AjLang/Compiler/Parser.cs
@@ -32,6 +32,8 @@ public IExpression ParseExpression()
             {
                 case TokenType.Integer:
                     return new ConstantExpression(int.Parse(token.Value, CultureInfo.InvariantCulture));
+                case TokenType.Name:
+                    return new VariableExpression(token.Value);
             }
 
             throw new ParserException(string.Format("Unexpected '{0}'", token.Value));

diff --git a/Src/AjLang/Expressions/VariableExpression.cs b/Src/AjLang/Expressions/VariableExpression.cs
@@ -12,7 +12,9 @@ public class VariableExpression : IExpression
         public VariableExpression(string name)
         {
             this.name = name;
-        }
+        }
+
+        public string Name { get { return this.name; } }
 
         public object Evaluate(Context context)
         {