@@ -57,7 +57,6 @@ module Duby @file = BiteScript::FileBuilder.new(@filename) AST.type_factory.define_types(@file) @type = AST::type(classname) - @class = @type.define(@file) end def compile(ast, expression = false) @@ -65,19 +64,29 @@ module Duby log "Compilation successful!" end + def toplevel_class + @class = @type.define(@file) + end + def define_main(body) - with :method => @class.main do - log "Starting main method" + if body.class != AST::ClassDefinition + @class = @type.define(@file) + with :method => @class.main do + log "Starting main method" - @method.start + @method.start - # declare argv variable - @method.local('argv', AST.type('string', true)) + # declare argv variable + @method.local('argv', AST.type('string', true)) - body.compile(self, false) + body.compile(self, false) - @method.returnvoid - @method.stop + @method.returnvoid + @method.stop + end + @class.stop + else + body.compile(self, false) end log "Main method complete!" @@ -561,7 +570,6 @@ module Duby end def generate - @class.stop log "Generating classes..." @file.generate do |filename, builder| log " #{builder.class_name}" lib/duby/jvm/compiler.rb c625ae98dee7c8da5d92cdf02414b76e268d64a0 Charles Oliver Nutter headius@headius.com http://github.com/headius/duby/commit/39a665517398bc960a80ee52dc5a9a3285f82277 39a665517398bc960a80ee52dc5a9a3285f82277 2009-11-07T08:40:20-08:00 2009-11-07T08:40:20-08:00 If the root node of a script is a ClassDefinition, don't output a .class for the containing script. 38de323586304bfb6092175ec6a5c6cb5eba52aa Charles Oliver Nutter headius@headius.com