Handle class <<expr; end eigenclass opening.

Author: vidarh

compile_class.rb

@@ -87,6 +87,10 @@ def compile_class(scope, name,superclass, *exps)
     superc = name == :Class ? nil : @classes[superclass]
     cscope = scope.find_constant(name)
 
+    if name.is_a?(Array)
+      return compile_eigenclass(scope, name[-1], *exps)
+    end
+
     @e.comment("=== class #{cscope.name} ===")
 
 

parser.rb

@@ -272,7 +272,7 @@ def parse_defexp
 
   def parse_opt_defexp
     exps = E[position]
-    while ret = parse_defexp
+    while ret = parse_exp
       exps << ret
     end
     exps
@@ -364,6 +364,10 @@ def parse_class
     type = keyword(:class) or return
     ws
     name = expect(Atom) || literal("\<\<") or expected("class name")
+    if name == "<<"
+      ob = parse_exp
+      name = [:eigen, ob]
+    end
     ws
     # FIXME: Workaround for initialization error
     superclass = nil

transform.rb

@@ -565,11 +565,15 @@ def build_class_scopes(exps, scope)
         elsif e[0] == :class
           superclass = e[2]
           superc = @classes[superclass.to_sym]
-          cscope = @classes[e[1].to_sym]
-          cscope = ClassScope.new(scope, e[1], @vtableoffsets, superc) if !cscope
+          name = e[1]
+          if name.is_a?(Array) && name[0] == :eigen
+            name = clean_method_name(name.to_s)
+          end
+          cscope = @classes[name.to_sym]
+          cscope = ClassScope.new(scope, name, @vtableoffsets, superc) if !cscope
           @classes[cscope.name.to_sym] =  cscope
           @global_scope.add_constant(cscope.name.to_sym,cscope)
-          scope.add_constant(e[1].to_sym,cscope)
+          scope.add_constant(name.to_sym,cscope)
           build_class_scopes(e[3], cscope)
         elsif e[0] == :module
           cscope   = @classes[e[1].to_sym]