Parser

metacritical · Mar 21, 2013 · a432596 · a432596
1 parent 800bb9b
commit a432596
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/io/tokens.rb b/lib/io/tokens.rb
@@ -13,7 +13,7 @@ module Io
      :MINUS, :ASTERISK, :MODULUS, :SLASH, :AND, :OR, :COMPARISON, :NOT_EQUALS, :NOT, :LESSTHAN_EQUALS, :GREATERTHAN_EQUALS,
      :LESSTHAN, :GREATERTHAN, :SEMICOLON, :COMMA, :GETTER_SETTER, :SETSLOT, :UPDATESLOT, :EXPONENT
     ]
-  
+
   class Token
     attr_accessor :type , :value , :line , :column
     def initialize(token)

diff --git a/src/parser.rb b/src/parser.rb
@@ -71,6 +71,7 @@ def expression(type=nil)
 
   def addition
     check_type(current_token)
+    node = { :PLUS => AST::Addition }
     if current_token.type == :PLUS
       AST::Addition.new({:left => tree_stack.pop, :right => read_token})
     else
@@ -81,6 +82,7 @@ def addition
 
   def subtraction
     check_type(current_token)
+    node = { :MINUS => AST::Subtraction }
     if current_token.type == :MINUS
       AST::Subtraction.new({:left => tree_stack.pop, :right => read_token})
     else
@@ -91,11 +93,9 @@ def subtraction
 
   def multiplication
     check_type(current_token)
+    node = { :ASTERISK => AST::Multiplication }
     if current_token.type == :ASTERISK
       AST::Multiplication.new({:left => tree_stack.pop, :right => read_token})
-    else
-      read_token
-      AST::Multiplication.new({:left => look_behind, :right => read_token})
     end
   end
 

diff --git a/test/spec_helper.rb b/test/spec_helper.rb
@@ -72,7 +72,7 @@ def simple_code
 end
 
 def simple_addition
-  %Q{1 + 2 * 3 - 5} #- 4 + 5 + 6 - 7}
+  %Q{1 + 2 * 3} #- 4 + 5 + 6 - 7}
 end
 
 =begin