@@ -35,14 +35,8 @@ class CompilerScript @options.on("-T", "--transforms", "NAME", "Enable NAME category of AST transforms") do |c| - if c == "all" - Rubinius::AST::Transforms.category_map.each do |c, ts| - @transforms.concat ts - end - else - transforms = Rubinius::AST::Transforms.category c.to_sym - @transforms.concat transforms if transforms - end + transforms = Rubinius::AST::Transforms.category c.to_sym + @transforms.concat transforms if transforms end @options.on "--no-transform", "Do not transform the AST" do lib/bin/compile-ng.rb @@ -19,7 +19,11 @@ module Rubinius end def self.category(name) - category_map[name] + if name == :all + category_map.values.flatten + else + category_map[name] + end end end lib/compiler-ng/ast/transforms.rb @@ -15,11 +15,12 @@ module Rubinius end end - def self.compile(file, line=1, output=nil) + def self.compile(file, line=1, output=nil, transforms=:default) compiler = new :file, :compiled_file parser = compiler.parser parser.root AST::Script + parser.enable_category transforms parser.input file, line writer = compiler.writer lib/compiler-ng/compiler.rb @@ -167,6 +167,11 @@ module Rubinius @printer end + def enable_category(name) + transforms = AST::Transforms.category name + @transforms.concat transforms if transforms + end + def enable_transform(name) transform = AST::Transforms[name] @transforms << transform if transform lib/compiler-ng/stages.rb b282495fef277624622d633a4ef18e3bd695d611 Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/fe7e70c800e3b7df8c9053a20111b761c30186d0 fe7e70c800e3b7df8c9053a20111b761c30186d0 2009-11-06T10:42:28-08:00 2009-11-05T21:53:47-08:00 Easier method of loading AST transforms by category. 5c8562548b86c2b534cb007c4dc086bacf7f008f Brian Ford bford@engineyard.com