treetop 1.6.2 → 1.6.3

data/lib/treetop/compiler/metagrammar.rb

@@ -1071,10 +1071,6 @@ module Treetop
           super.elements.map {|elt| elt.alternative}
         end
 
-	  def parent_modules
-	    []
-	  end
-
         def inline_modules
           (alternatives.map {|alt| alt.inline_modules }).flatten
         end
@@ -1182,14 +1178,10 @@ module Treetop
           sequence_body.tail
         end
 
-	  def parent_modules
-	    node_class_declarations.inline_modules
-	  end
-
         def inline_modules
           (sequence_elements.map {|elt| elt.inline_modules}).flatten +
           [sequence_element_accessor_module] +
-          parent_modules
+          node_class_declarations.inline_modules
         end
 
         def inline_module_name
@@ -1426,10 +1418,6 @@ module Treetop
           atomic
         end
 
-	  def parent_modules
-	    []
-	  end
-
         def inline_modules
           atomic.inline_modules
         end
@@ -1456,9 +1444,6 @@ module Treetop
         def prefixed_expression
           atomic
         end
-	  def parent_modules
-	    []
-	  end
         def inline_modules
           []
         end
@@ -1480,7 +1465,6 @@ module Treetop
 
       module Primary5
         def compile(address, builder, parent_expression=nil)
-	    # debugger if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
           suffix.compile(address, builder, self)
         end
 
@@ -1492,12 +1476,8 @@ module Treetop
           node_class_declarations.node_class_name
         end
 
-	  def parent_modules
-	    node_class_declarations.inline_modules
-	  end
-
         def inline_modules
-          atomic.inline_modules + parent_modules
+          atomic.inline_modules + node_class_declarations.inline_modules
         end
 
         def inline_module_name
@@ -1517,7 +1497,6 @@ module Treetop
 
       module Primary7
         def compile(address, builder, parent_expression=nil)
-	    # debugger if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
           atomic.compile(address, builder, self)
         end
 
@@ -1525,12 +1504,8 @@ module Treetop
           node_class_declarations.node_class_name
         end
 
-	  def parent_modules
-	    node_class_declarations.inline_modules
-	  end
-
         def inline_modules
-          atomic.inline_modules + parent_modules
+          atomic.inline_modules + node_class_declarations.inline_modules
         end
 
         def inline_module_name
@@ -1698,10 +1673,6 @@ module Treetop
           sequence_primary.compile(lexical_address, builder)
         end
 
-	  def parent_modules
-	    []
-	  end
-
         def inline_modules
           sequence_primary.inline_modules
         end
@@ -1758,10 +1729,6 @@ module Treetop
           sequence_primary.compile(lexical_address, builder)
         end
 
-	  def parent_modules
-	    []
-	  end
-
         def inline_modules
           sequence_primary.inline_modules
         end
@@ -1965,10 +1932,6 @@ module Treetop
           elements[1]
         end
 
-	  def parent_modules
-	    []
-	  end
-
         def inline_modules
           atomic.inline_modules
         end
@@ -1995,9 +1958,6 @@ module Treetop
         def prefixed_expression
           atomic
         end
-	  def parent_modules
-	    []
-	  end
         def inline_modules
           []
         end
@@ -2022,10 +1982,6 @@ module Treetop
           nil
         end
 
-	  def parent_modules
-	    []
-	  end
-
         def inline_modules
           atomic.inline_modules
         end
@@ -2201,7 +2157,6 @@ module Treetop
           node_class_expression.node_class_name
         end
 
-# !!!! cjh !!!!!
         def inline_modules
           trailing_inline_module.inline_modules
         end
@@ -2489,9 +2444,6 @@ module Treetop
       end
 
       module ParenthesizedExpression1
-	  def parent_modules
-	    []
-	  end
         def inline_modules
           parsing_expression.inline_modules
         end
@@ -3594,9 +3546,6 @@ module Treetop
       end
 
       module TrailingInlineModule1
-	  def parent_modules
-	    []
-	  end
         def inline_modules
           [inline_module]
         end
@@ -3607,9 +3556,6 @@ module Treetop
       end
 
       module TrailingInlineModule2
-	  def parent_modules
-	    []
-	  end
         def inline_modules
           []
         end

data/lib/treetop/compiler/metagrammar.treetop

@@ -84,10 +84,6 @@ module Treetop
             super.elements.map {|elt| elt.alternative}
           end
 
-	  def parent_modules
-	    []
-	  end
-
           def inline_modules
             (alternatives.map {|alt| alt.inline_modules }).flatten
           end
@@ -104,14 +100,10 @@ module Treetop
             sequence_body.tail
           end
 
-	  def parent_modules
-	    node_class_declarations.inline_modules
-	  end
-
           def inline_modules
             (sequence_elements.map {|elt| elt.inline_modules}).flatten +
             [sequence_element_accessor_module] +
-            parent_modules
+            node_class_declarations.inline_modules
           end
 
           def inline_module_name
@@ -158,10 +150,6 @@ module Treetop
             atomic
           end
 
-	  def parent_modules
-	    []
-	  end
-
           def inline_modules
             atomic.inline_modules
           end
@@ -178,9 +166,6 @@ module Treetop
           def prefixed_expression
             atomic
           end
-	  def parent_modules
-	    []
-	  end
           def inline_modules
             []
           end
@@ -188,7 +173,6 @@ module Treetop
         /
         atomic suffix node_class_declarations {
           def compile(address, builder, parent_expression=nil)
-	    raise "Extraneous module ignored after suffix: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
             suffix.compile(address, builder, self)
           end
 
@@ -200,12 +184,8 @@ module Treetop
             node_class_declarations.node_class_name
           end
 
-	  def parent_modules
-	    node_class_declarations.inline_modules
-	  end
-
           def inline_modules
-            atomic.inline_modules + parent_modules
+            atomic.inline_modules + node_class_declarations.inline_modules
           end
 
           def inline_module_name
@@ -215,7 +195,6 @@ module Treetop
         /
         atomic node_class_declarations {
           def compile(address, builder, parent_expression=nil)
-	    raise "Extraneous module ignored with nested atomic: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
             atomic.compile(address, builder, self)
           end
 
@@ -223,12 +202,8 @@ module Treetop
             node_class_declarations.node_class_name
           end
 
-	  def parent_modules
-	    node_class_declarations.inline_modules
-	  end
-
           def inline_modules
-            atomic.inline_modules + parent_modules
+            atomic.inline_modules + node_class_declarations.inline_modules
           end
 
           def inline_module_name
@@ -247,10 +222,6 @@ module Treetop
             sequence_primary.compile(lexical_address, builder)
           end
 
-	  def parent_modules
-	    []
-	  end
-
           def inline_modules
             sequence_primary.inline_modules
           end
@@ -267,10 +238,6 @@ module Treetop
             sequence_primary.compile(lexical_address, builder)
           end
 
-	  def parent_modules
-	    []
-	  end
-
           def inline_modules
             sequence_primary.inline_modules
           end
@@ -315,10 +282,6 @@ module Treetop
             elements[1]
           end
 
-	  def parent_modules
-	    []
-	  end
-
           def inline_modules
             atomic.inline_modules
           end
@@ -335,9 +298,6 @@ module Treetop
           def prefixed_expression
             atomic
           end
-	  def parent_modules
-	    []
-	  end
           def inline_modules
             []
           end
@@ -352,10 +312,6 @@ module Treetop
             nil
           end
 
-	  def parent_modules
-	    []
-	  end
-
           def inline_modules
             atomic.inline_modules
           end
@@ -382,7 +338,6 @@ module Treetop
             node_class_expression.node_class_name
           end
 
-# !!!! cjh !!!!!
           def inline_modules
             trailing_inline_module.inline_modules
           end
@@ -419,9 +374,6 @@ module Treetop
 
       rule parenthesized_expression
         '(' space? parsing_expression space? ')' <ParenthesizedExpression> {
-	  def parent_modules
-	    []
-	  end
           def inline_modules
             parsing_expression.inline_modules
           end
@@ -487,9 +439,6 @@ module Treetop
 
       rule trailing_inline_module
         space inline_module {
-	  def parent_modules
-	    []
-	  end
           def inline_modules
             [inline_module]
           end
@@ -500,9 +449,6 @@ module Treetop
         }
         /
         '' {
-	  def parent_modules
-	    []
-	  end
           def inline_modules
             []
           end

data/lib/treetop/compiler/node_classes/anything_symbol.rb

@@ -6,7 +6,7 @@ module Treetop
         builder.if__ "index < input_length" do
           if address == 0 || decorated?
 	    assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
-	    extend_result_with_inline_module parent_expression
+	    extend_result_with_inline_module
           else
             assign_lazily_instantiated_node
           end

data/lib/treetop/compiler/node_classes/character_class.rb

@@ -7,7 +7,7 @@ module Treetop
         builder.if__ "has_terminal?(@regexps[gr = #{grounded_regexp(text_value)}] ||= Regexp.new(gr), :regexp, index)" do
           if address == 0 || decorated?
             assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
-            extend_result_with_inline_module parent_expression
+            extend_result_with_inline_module
           else
             assign_lazily_instantiated_node
           end

data/lib/treetop/compiler/node_classes/choice.rb

@@ -5,11 +5,11 @@ module Treetop
         super
         begin_comment(self)
         use_vars :result, :start_index
-        compile_alternatives(alternatives, parent_expression)
+        compile_alternatives(alternatives)
         end_comment(self)
       end
-
-      def compile_alternatives(alternatives, parent_expression)
+      
+      def compile_alternatives(alternatives)
         obtain_new_subexpression_address
         alternatives.first.compile(subexpression_address, builder)
         builder.if__ subexpression_success? do
@@ -17,14 +17,14 @@ module Treetop
 	  builder << "#{subexpression_result_var} = SyntaxNode.new(input, (index-1)...index) if #{subexpression_result_var} == true"
           assign_result subexpression_result_var
           extend_result_with_declared_module
-          extend_result_with_inline_module parent_expression
+          extend_result_with_inline_module
         end
         builder.else_ do
           if alternatives.size == 1
             reset_index
             assign_failure start_index_var
           else
-            compile_alternatives(alternatives[1..-1], parent_expression)
+            compile_alternatives(alternatives[1..-1])
           end
         end
       end

data/lib/treetop/compiler/node_classes/nonterminal.rb

@@ -6,8 +6,8 @@ module Treetop
         use_vars :result
         assign_result text_value == 'super' ? 'super' : "_nt_#{text_value}"
         extend_result_with_declared_module
-        extend_result_with_inline_module parent_expression
+        extend_result_with_inline_module
       end
     end
   end
-end
+end

data/lib/treetop/compiler/node_classes/parsing_expression.rb

@@ -78,14 +78,8 @@ module Treetop
         extend_result declared_module_name if declared_module_name
       end
       
-      def extend_result_with_inline_module parent_expression = nil
-	# debugger if parent_expression && !parent_expression.respond_to?(:parent_modules)
-	if parent_expression && parent_expression.parent_modules.size > 0
-	  parent_expression.parent_modules.each do |inline|
-	    extend_result inline.module_name
-	  end
-	end
-	extend_result inline_module_name if inline_module_name
+      def extend_result_with_inline_module
+        extend_result inline_module_name if inline_module_name
       end
     
       def reset_index

data/lib/treetop/compiler/node_classes/repetition.rb

@@ -28,9 +28,9 @@ module Treetop
         parent_expression.inline_module_name
       end
 
-      def assign_and_extend_result parent_expression
+      def assign_and_extend_result
         assign_result "instantiate_node(#{node_class_name},input, #{start_index_var}...index, #{accumulator_var})"
-        extend_result_with_inline_module parent_expression
+        extend_result_with_inline_module
       end
     end
 
@@ -38,7 +38,7 @@ module Treetop
     class ZeroOrMore < Repetition
       def compile(address, builder, parent_expression)
         super
-        assign_and_extend_result parent_expression
+        assign_and_extend_result
         end_comment(parent_expression)
       end
 
@@ -55,7 +55,7 @@ module Treetop
           assign_failure start_index_var
         end
         builder.else_ do
-          assign_and_extend_result parent_expression
+          assign_and_extend_result
         end
         end_comment(parent_expression)
       end
@@ -81,11 +81,11 @@ module Treetop
 	  end
           builder.else_ do
 	    clean_unsaturated
-	    assign_and_extend_result parent_expression
+	    assign_and_extend_result
 	  end
         else
 	  clean_unsaturated
-	  assign_and_extend_result parent_expression
+	  assign_and_extend_result
 	end
 
         end_comment(parent_expression)