refactor name expression for compiler

lib/typed/compiler/name_expression.rb

@@ -1,5 +1,5 @@
 module Typed
-  Compiler.class_eval do
+  module NameExpression
 
       #    attr_reader  :name
       # compiling name needs to check if it's a local variable
@@ -7,39 +7,47 @@ module Typed
       # whichever way this goes the result is stored in the return slot (as all compiles)
       def on_NameExpression statement
         name = statement.name
-        if( name == :self)
-          ret = use_reg @clazz.name
-          add_code Register.get_slot(statement , :message , :receiver , ret )
-          return ret
-        end
-        if(name == :space)
-          space = Parfait::Space.object_space
-          reg = use_reg :Space , space
-          add_code Register::LoadConstant.new( statement, space , reg )
-          return reg
-        end
-        if(name == :message)
-          reg = use_reg :Message
-          add_code Register::RegisterTransfer.new( statement, Register.message_reg , reg )
-          return reg
+        [:self , :space , :message].each do |special|
+          return send(:"handle_special_#{special}" , statement ) if name == special
         end
         # either an argument, so it's stored in message
         if( index = @method.has_arg(name))
           ret = use_reg @method.arguments[index].value_type
           add_code Register.get_slot(statement , :message , Parfait::Message.get_indexed(index), ret )
           return ret
-        else # or a local so it is in the frame
-          index = @method.has_local( name )
-          if(index)
-            frame = use_reg :Frame
-            add_code Register.get_slot(statement , :message , :frame , frame )
-            ret = use_reg @method.locals[index].value_type
-            add_code Register.get_slot(statement , frame , Parfait::Frame.get_indexed(index), ret )
-            return ret
-          end
         end
-        raise "must define variable '#{name}' before using it"
+        # or a local so it is in the frame
+        handle_local(statement)
       end
 
+      private
+
+      def handle_local statement
+        index = @method.has_local( name )
+        raise "must define variable '#{name}' before using it" unless index
+        frame = use_reg :Frame
+        add_code Register.get_slot(statement , :message , :frame , frame )
+        ret = use_reg @method.locals[index].value_type
+        add_code Register.get_slot(statement , frame , Parfait::Frame.get_indexed(index), ret )
+        return ret
+      end
+
+      def handle_special_self(statement)
+        ret = use_reg @clazz.name
+        add_code Register.get_slot(statement , :message , :receiver , ret )
+        return ret
+      end
+
+      def handle_special_space(statement)
+        space = Parfait::Space.object_space
+        reg = use_reg :Space , space
+        add_code Register::LoadConstant.new( statement, space , reg )
+        return reg
+      end
+      def handle_special_message(statement)
+        reg = use_reg :Message
+        add_code Register::RegisterTransfer.new( statement, Register.message_reg , reg )
+        return reg
+      end
   end #module
 end