Bug fixes

cassiano · Dec 31, 2011 · c09fbe8 · c09fbe8
1 parent e77152d
commit c09fbe8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tt_ruby/ruby.rb b/tt_ruby/ruby.rb
@@ -52,6 +52,9 @@ def eval(context)
 end
 
 class IdentifierNode < Treetop::Runtime::SyntaxNode
+  def eval(context)
+    context.locals[name]
+  end
 end
 
 class ConstantNode < Treetop::Runtime::SyntaxNode
@@ -77,7 +80,8 @@ def eval(context)
       context.locals[method.name]
     else
       # Method call.
-      object          = receiver ? (IdentifierNode === receiver ? context.locals[receiver.name] : receiver.eval(context)) : context.current_self
+      # object          = receiver ? (IdentifierNode === receiver ? context.locals[receiver.name] : receiver.eval(context)) : context.current_self
+      object          = receiver ? receiver.eval(context) : context.current_self
       evaluated_parms = !params.empty? ? params.eval(context) : []
 
       object.call method.name, evaluated_parms

diff --git a/tt_ruby/ruby.treetop b/tt_ruby/ruby.treetop
@@ -36,13 +36,17 @@ grammar Ruby
   rule terminator
     newline
     /
-    ';'
+    delimiter
   end
 
   rule newline
     "\n"
   end
 
+  rule delimiter
+    ';'
+  end
+
   rule literal
     number
     /