Merge pull request evanphx#24 from dudleyf/ast-helpers-module

Output the generated AST helpers in a module so they can be reused.
dudleyf · Apr 19, 2012 · 2fbf077 · 2fbf077
2 parents 39046ef + f776af7
commit 2fbf077
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/lib/kpeg/code_generator.rb b/lib/kpeg/code_generator.rb
@@ -83,11 +83,14 @@ def handle_ast(code)
 
       if output_node
         code << "  end\n"
+        code << "  module #{root}Construction\n"
         methods.each do |short, name, attrs|
-          code << "  def #{short}(#{attrs.join(', ')})\n"
+          code << "    def #{short}(#{attrs.join(', ')})\n"
-          code << "    #{root}::#{name}.new(#{attrs.join(', ')})\n"
+          code << "      #{root}::#{name}.new(#{attrs.join(', ')})\n"
-          code << "  end\n"
+          code << "    end\n"
         end
+        code << "  end\n"
+        code << "  include #{root}Construction\n"
       end
     end
 

diff --git a/test/test_kpeg_code_generator.rb b/test/test_kpeg_code_generator.rb
@@ -1661,15 +1661,18 @@ def initialize()
       end
     end
   end
-  def bracket(receiver, argument)
+  module ASTConstruction
-    AST::BracketOperator.new(receiver, argument)
+    def bracket(receiver, argument)
-  end
+      AST::BracketOperator.new(receiver, argument)
-  def simple()
+    end
-    AST::Simple.new()
+    def simple()
-  end
+      AST::Simple.new()
-  def simple2()
+    end
-    AST::Simple2.new()
+    def simple2()
+      AST::Simple2.new()
+    end
   end
+  include ASTConstruction
 
   # root = .
   def _root
@@ -1715,9 +1718,12 @@ def initialize(receiver, argument)
       attr_reader :argument
     end
   end
-  def bracket(receiver, argument)
+  module MegaASTConstruction
-    MegaAST::BracketOperator.new(receiver, argument)
+    def bracket(receiver, argument)
+      MegaAST::BracketOperator.new(receiver, argument)
+    end
   end
+  include MegaASTConstruction
 
   # root = .
   def _root