Refactored local variable store.

lib/compiler-ng/ast/definitions.rb

@@ -86,6 +86,8 @@ def bytecode(g)
     end
 
     class ClosedScope < Node
+      include CompilerNG::LocalVariables
+
       attr_accessor :body
 
       def new_description(g)
@@ -98,24 +100,6 @@ def children
         [@body]
       end
 
-      def local_count
-        variables.size
-      end
-
-      def local_names
-        names = Array.new local_count
-        variables.each_pair { |name, var| names[var.slot] = name }
-        names
-      end
-
-      def variables
-        @variables ||= {}
-      end
-
-      def allocate_slot
-        variables.size
-      end
-
       # A nested scope is looking up a local variable. If the variable exists
       # in our local variables hash, return a nested reference to it.
       def search_local(name)

lib/compiler-ng/ast/sends.rb

@@ -281,6 +281,8 @@ def bytecode(g)
     end
 
     class Iter < Node
+      include CompilerNG::LocalVariables
+
       attr_accessor :parent, :arguments, :body
 
       def initialize(line, arguments, body)
@@ -293,24 +295,6 @@ def module?
         false
       end
 
-      def local_count
-        variables.size
-      end
-
-      def local_names
-        names = Array.new local_count
-        variables.each_pair { |name, var| names[var.slot] = name }
-        names
-      end
-
-      def variables
-        @variables ||= {}
-      end
-
-      def allocate_slot
-        variables.size
-      end
-
       def nest_scope(scope)
         scope.parent = self
       end
@@ -502,12 +486,6 @@ def bytecode(g)
     end
 
     class For < Iter
-      def initialize(line, arguments, body)
-        @line = line
-        @arguments = IterArguments.new line, arguments
-        @body = body || Nil.new(line)
-      end
-
       def variables
         @parent.variables
       end

lib/compiler-ng/locals.rb

@@ -1,5 +1,25 @@
 module Rubinius
   class CompilerNG
+    module LocalVariables
+      def variables
+        @variables ||= {}
+      end
+
+      def local_count
+        variables.size
+      end
+
+      def local_names
+        names = Array.new local_count
+        variables.each_pair { |name, var| names[var.slot] = name }
+        names
+      end
+
+      def allocate_slot
+        variables.size
+      end
+    end
+
     class LocalVariable
       attr_reader :slot