Adding spaces to expressions

cassiano · Dec 20, 2011 · eb2bbe3 · eb2bbe3
1 parent ca3f292
commit eb2bbe3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tt_ruby/ruby.rb b/tt_ruby/ruby.rb
@@ -57,7 +57,7 @@ def eval(context)
   end
 end
 
-Context = Struct.new(:current_self, :locals)
-@context = Context.new(nil, {})
+Context = Struct.new(:current_self, :current_class, :locals, :constants)
+@context = Context.new(self, self.class, {}, {})
 
 @parser = RubyParser.new
diff --git a/tt_ruby/ruby.treetop b/tt_ruby/ruby.treetop
@@ -4,7 +4,7 @@ grammar Ruby
   end
 
   rule expressions
-    expression others:(terminator expression)* <ExpressionsNode>
+    spaces expression spaces others:(terminator spaces expression spaces)* <ExpressionsNode>
   end
 
   rule expression
@@ -15,6 +15,10 @@ grammar Ruby
     assignment
   end
 
+  rule spaces
+    ' '*
+  end
+
   rule terminator
     newline
     /
@@ -72,7 +76,7 @@ grammar Ruby
   end
 
   rule assignment
-    identifier '=' expression   <AssignmentNode>
+    identifier spaces '=' spaces expression   <AssignmentNode>
   end
 
   rule identifier