@@ -477,11 +477,12 @@ class Compiler # Compiles a class definition. # Takes the current scope, the name of the class as well as a list of expressions # that belong to the class. - def compile_class(scope, name, *exps) + def compile_class(scope, name,superclass, *exps) @e.comment("=== class #{name} ===") cscope = ClassScope.new(scope, name, @vtableoffsets) + # FIXME: Need to be able to handle re-opening of classes # FIXME: (If this class has a superclass, copy the vtable from the superclass as a starting point) # FIXME: Fill in all unused vtable slots with __method_missing # FIXME: Need to generate "thunks" for __method_missing that knows the name of the slot they are in, and compiler.rb @@ -80,7 +80,7 @@ Feature: Parser Examples: | expr | tree | notes | - | "class Foo; end" | [:do, [:class, :Foo, []]] | | + | "class Foo; end" | [:do, [:class, :Foo, :Object, []]] | | | "class Foo < Bar; end" | [:do, [:class, :Foo, :Bar, []]] | | @control features/parser.feature @@ -257,11 +257,10 @@ class Parser < ParserBase if expect("<") ws superclass = expect(Atom) or expected("superclass") - # FIXME: Include superclass in tree end exps = zero_or_more(:exp) expect(:end) or expected("expression or 'end'") - return E[pos, type.to_sym, name, exps] + return E[pos, type.to_sym, name, superclass || :Object, exps] end parser.rb e125f0057cc203ee37d328e49b7c179a503dbc1e Vidar Hokstad vidar@hokstad.com http://github.com/vidarh/writing-a-compiler-in-ruby/commit/83d2d1e3b31990a7d6696629be914c928f84fee9 83d2d1e3b31990a7d6696629be914c928f84fee9 2009-07-28T04:26:44-07:00 2009-07-28T04:26:44-07:00 Added superclass name to parse tree (defaulting to Object) 81fca7c6afd52fb6d97fe684ca800ed55ccd5626 Vidar Hokstad vidar@hokstad.com