update the reader rewrite and reflect name changes

lib/phisol/compiler/basic_values.rb

@@ -3,7 +3,7 @@ module Phisol
 
   Compiler.class_eval do
 
-    # Constant expressions can by definition be evaluated at compile time.
+    # Constant statements can by definition be evaluated at compile time.
     # But that does not solve their storage, ie they need to be accessible at runtime from _somewhere_
     # So we view ConstantExpressions like functions that return the value of the constant.
     # In other words, their storage is the return slot as it would be for a method
@@ -11,34 +11,34 @@ module Phisol
     # The current approach moves the constant into a variable before using it
     # But in the future (in the one that holds great things) we optimize those unneccesay moves away
 
-    def on_int expression
-      int = expression.first
+    def on_int statement
+      int = statement.first
       to =  Virtual::Return.new(Virtual::Integer , int)
       @method.source.add_code Virtual::Set.new( int , to )
       to
     end
 
-    def on_true expression
+    def on_true statement
       to = Virtual::Return.new(Virtual::Reference , true )
       @method.source.add_code Virtual::Set.new( true , to )
       to
     end
 
-    def on_false expression
+    def on_false statement
       to = Virtual::Return.new(Virtual::Reference , false)
       @method.source.add_code Virtual::Set.new( false , to )
       to
     end
 
-    def on_nil expression
+    def on_nil statement
       to = Virtual::Return.new(Virtual::Reference , nil)
       @method.source.add_code Virtual::Set.new( nil , to )
       to
     end
 
-    def on_string expression
+    def on_string statement
       # Clearly a TODO here to implement strings rather than reusing symbols
-      value = expression.first.to_sym
+      value = statement.first.to_sym
       to = Virtual::Return.new(Virtual::Reference , value)
       @method.source.constants << value
       @method.source.add_code Virtual::Set.new( value , to )

lib/phisol/compiler/call_site.rb

@@ -1,8 +1,8 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_call expression
-      name , arguments , receiver = *expression
+    def on_call statement
+      name , arguments , receiver = *statement
       name = name.to_a.first
       raise "not inside method " unless @method
       if receiver
@@ -65,7 +65,7 @@ module Phisol
       end
       raise "Method not implemented #{me.value}.#{name}" unless method
       # the effect of the method is that the NewMessage Return slot will be filled, return it
-      # (this is what is moved _inside_ above loop for such expressions that are calls (or constants))
+      # (this is what is moved _inside_ above loop for such statements that are calls (or constants))
       Virtual::Return.new( method.source.return_type )
     end
   end

lib/phisol/compiler/class_field.rb

@@ -1,9 +1,9 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_class_field expression
-      #puts expression.inspect
-      type , name , value = *expression
+    def on_class_field statement
+      #puts statement.inspect
+      type , name , value = *statement
 
       for_class = @clazz
       raise "no class" unless for_class

lib/phisol/compiler/class_statement.rb

@@ -0,0 +1,15 @@
+module Phisol
+  Compiler.class_eval do
+
+    def on_class statement
+      #puts statement.inspect
+      name , derives , statements = *statement
+      raise "classes dont yet play babushka, get coding #{name}" if @clazz
+      @clazz = Parfait::Space.object_space.get_class_by_name! name
+      puts "Compiling class #{@clazz.name.inspect}"
+      statement_value = process_all(statements).last
+      @clazz = nil
+      return statement_value
+    end
+  end
+end

lib/phisol/compiler/collections.rb

@@ -2,7 +2,7 @@ module Phisol
   Compiler.class_eval do
 
 #    attr_reader :values
-    def on_array expession, context
+    def on_array statement, context
     end
 #    attr_reader :key , :value
     def on_association context

lib/phisol/compiler/expression_list.rb

@@ -1,8 +0,0 @@
-module Phisol
-  Compiler.class_eval do
-#    list - attr_reader  :expressions
-    def on_expressions expession
-      process_all(  expession.children  )
-    end
-  end
-end

lib/phisol/compiler/field_access.rb

@@ -1,9 +1,9 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_field_access expression
-      #puts expression.inspect
-      receiver_ast , field_ast = *expression
+    def on_field_access statement
+      #puts statement.inspect
+      receiver_ast , field_ast = *statement
       receiver = receiver_ast.first_from(:name)
       field_name = field_ast.first_from(:name)
 

lib/phisol/compiler/field_def.rb

@@ -1,9 +1,9 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_field_def expression
-      #puts expression.inspect
-      type , name , value = *expression
+    def on_field_def statement
+      #puts statement.inspect
+      type , name , value = *statement
 
       index = @method.ensure_local( name , type )
 

lib/phisol/compiler/function_definition.rb

@@ -1,9 +1,9 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_function  expression
-      #puts expression.inspect
-      return_type , name , parameters, kids , receiver = *expression
+    def on_function  statement
+      #puts statement.inspect
+      return_type , name , parameters, kids , receiver = *statement
       name =  name.to_a.first
       args = parameters.to_a.collect do |p|
         raise "error, argument must be a identifier, not #{p}" unless p.type == :parameter

lib/phisol/compiler/if_statement.rb

@@ -2,8 +2,8 @@ module Phisol
   Compiler.class_eval do
 #    if - attr_reader  :cond, :if_true, :if_false
 
-    def on_if expression
-      condition , if_true , if_false = *expression
+    def on_if statement
+      condition , if_true , if_false = *statement
       condition = condition.first
       # to execute the logic as the if states it, the blocks are the other way around
       # so we can the jump over the else if true ,
@@ -25,7 +25,7 @@ module Phisol
       # compile the false block
       @method.source.current false_block
       last = process_all(if_false).last if if_false
-      @method.source.add_code Register::AlwaysBranch.new(expression, merge_block )
+      @method.source.add_code Register::AlwaysBranch.new(statement, merge_block )
 
       #puts "compiled if: end"
       @method.source.current merge_block

lib/phisol/compiler/module_expression.rb

@@ -1,20 +0,0 @@
-module Phisol
-  Compiler.class_eval do
-#    module attr_reader  :name ,:expressions
-    def on_module expression
-      name , rest = *expression
-      return process_all(rest).last
-    end
-
-    def on_class expression
-      #puts expression.inspect
-      name , derives , expressions = *expression
-      raise "classes dont yet play babushka, get coding #{name}" if @clazz
-      @clazz = Parfait::Space.object_space.get_class_by_name! name
-      puts "Compiling class #{@clazz.name.inspect}"
-      expression_value = process_all(expressions).last
-      @clazz = nil
-      return expression_value
-    end
-  end
-end

lib/phisol/compiler/name_expression.rb

@@ -5,8 +5,8 @@ module Phisol
       # compiling name needs to check if it's a variable and if so resolve it
       # otherwise it's a method without args and a send is issued.
       # whichever way this goes the result is stored in the return slot (as all compiles)
-      def on_name expression
-        name = expression.to_a.first
+      def on_name statement
+        name = statement.to_a.first
         return Virtual::Self.new( Virtual::Reference.new(@clazz)) if name == :self
         # either an argument, so it's stored in message
         if( index = @method.has_arg(name))

lib/phisol/compiler/operator_value.rb

@@ -1,30 +1,30 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_operator expression
-      puts "operator #{expression.inspect}"
-      operator , left_e , right_e = *expression
+    def on_operator statement
+      puts "operator #{statement.inspect}"
+      operator , left_e , right_e = *statement
       left_slot = process(left_e)
       right_slot = process(right_e)
       puts "left #{left_slot}"
       puts "right #{right_slot}"
       tmp1 = Register.tmp_reg
       tmp2 = tmp1.next_reg_use
-      get = Register.get_slot_to(expression , left_slot , tmp1 )
-      get2 = Register.get_slot_to(expression , right_slot , tmp2 )
+      get = Register.get_slot_to(statement , left_slot , tmp1 )
+      get2 = Register.get_slot_to(statement , right_slot , tmp2 )
       puts "GET #{get}"
       puts "GET2 #{get2}"
       @method.source.add_code get
       @method.source.add_code get2
 
-      @method.source.add_code Register::OperatorInstruction.new(expression,operator, tmp1,tmp2)
+      @method.source.add_code Register::OperatorInstruction.new(statement,operator, tmp1,tmp2)
 
       Virtual::Return.new(:int )
     end
 
-    def on_assign expression
-      puts expression.inspect
-      name , value = *expression
+    def on_assign statement
+      puts statement.inspect
+      name , value = *statement
       name = name.to_a.first
       v = process(value)
       index = @method.has_local( name )

lib/phisol/compiler/return_expression.rb

@@ -1,9 +0,0 @@
-module Phisol
-  Compiler.class_eval do
-
-#    return attr_reader  :expression
-    def on_return expression
-      return process(expression.to_a.first )
-    end
-  end
-end

lib/phisol/compiler/return_statement.rb

@@ -0,0 +1,9 @@
+module Phisol
+  Compiler.class_eval do
+
+#    return attr_reader  :statement
+    def on_return statement
+      return process(statement.to_a.first )
+    end
+  end
+end

lib/phisol/compiler/statement_list.rb

@@ -0,0 +1,8 @@
+module Phisol
+  Compiler.class_eval do
+
+    def on_statements statement
+      process_all(  statement.children  )
+    end
+  end
+end

lib/phisol/compiler/while_statement.rb

@@ -1,9 +1,9 @@
 module Phisol
   Compiler.class_eval do
 
-    def on_while expression
-      #puts expression.inspect
-      condition , expressions = *expression
+    def on_while statement
+      #puts statement.inspect
+      condition , statements = *statement
       condition = condition.first
 
       # this is where the while ends and both branches meet
@@ -16,10 +16,10 @@ module Phisol
 
       @method.source.add_code Register::IsZeroBranch.new(condition,merge)
 
-      last = process_all(expressions).last
+      last = process_all(statements).last
 
       # unconditionally branch to the start
-      @method.source.add_code Register::AlwaysBranch.new(expression,start)
+      @method.source.add_code Register::AlwaysBranch.new(statement,start)
 
       # continue execution / compiling at the merge block
       @method.source.current merge