treetop 1.6.3 → 1.6.4

data/lib/treetop/compiler/metagrammar.treetop

@@ -84,6 +84,10 @@ module Treetop
             super.elements.map {|elt| elt.alternative}
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             (alternatives.map {|alt| alt.inline_modules }).flatten
           end
@@ -100,10 +104,14 @@ 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] +
-            node_class_declarations.inline_modules
+            parent_modules
           end
 
           def inline_module_name
@@ -150,6 +158,10 @@ module Treetop
             atomic
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             atomic.inline_modules
           end
@@ -166,6 +178,9 @@ module Treetop
           def prefixed_expression
             atomic
           end
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             []
           end
@@ -173,6 +188,7 @@ module Treetop
         /
         atomic suffix node_class_declarations {
           def compile(address, builder, parent_expression=nil)
+	    STDERR.puts "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
 
@@ -184,8 +200,12 @@ module Treetop
             node_class_declarations.node_class_name
           end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
           def inline_modules
-            atomic.inline_modules + node_class_declarations.inline_modules
+            atomic.inline_modules + parent_modules
           end
 
           def inline_module_name
@@ -195,6 +215,7 @@ module Treetop
         /
         atomic node_class_declarations {
           def compile(address, builder, parent_expression=nil)
+	    STDERR.puts "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
 
@@ -202,8 +223,12 @@ module Treetop
             node_class_declarations.node_class_name
           end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
           def inline_modules
-            atomic.inline_modules + node_class_declarations.inline_modules
+            atomic.inline_modules + parent_modules
           end
 
           def inline_module_name
@@ -222,6 +247,10 @@ module Treetop
             sequence_primary.compile(lexical_address, builder)
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             sequence_primary.inline_modules
           end
@@ -238,6 +267,10 @@ module Treetop
             sequence_primary.compile(lexical_address, builder)
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             sequence_primary.inline_modules
           end
@@ -282,6 +315,10 @@ module Treetop
             elements[1]
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             atomic.inline_modules
           end
@@ -298,6 +335,9 @@ module Treetop
           def prefixed_expression
             atomic
           end
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             []
           end
@@ -312,6 +352,10 @@ module Treetop
             nil
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             atomic.inline_modules
           end
@@ -338,6 +382,7 @@ module Treetop
             node_class_expression.node_class_name
           end
 
+# !!!! cjh !!!!!
           def inline_modules
             trailing_inline_module.inline_modules
           end
@@ -374,6 +419,9 @@ module Treetop
 
       rule parenthesized_expression
         '(' space? parsing_expression space? ')' <ParenthesizedExpression> {
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             parsing_expression.inline_modules
           end
@@ -439,6 +487,9 @@ module Treetop
 
       rule trailing_inline_module
         space inline_module {
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             [inline_module]
           end
@@ -449,6 +500,9 @@ 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
+	    extend_result_with_inline_module parent_expression
           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
+            extend_result_with_inline_module parent_expression
           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)
+        compile_alternatives(alternatives, parent_expression)
         end_comment(self)
       end
-      
-      def compile_alternatives(alternatives)
+
+      def compile_alternatives(alternatives, parent_expression)
         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
+          extend_result_with_inline_module parent_expression
         end
         builder.else_ do
           if alternatives.size == 1
             reset_index
             assign_failure start_index_var
           else
-            compile_alternatives(alternatives[1..-1])
+            compile_alternatives(alternatives[1..-1], parent_expression)
           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
+        extend_result_with_inline_module parent_expression
       end
     end
   end
-end
+end

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

@@ -78,8 +78,14 @@ module Treetop
         extend_result declared_module_name if declared_module_name
       end
       
-      def extend_result_with_inline_module
-        extend_result inline_module_name if inline_module_name
+      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
       end
     
       def reset_index

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

@@ -43,7 +43,7 @@ module Treetop
       
       def when_failure
 	if (e = parent.atomic.expected)
-	  builder << "terminal_failures.pop"
+	  builder << "@terminal_failures.pop"
 	end
         assign_success
       end

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
+      def assign_and_extend_result parent_expression
         assign_result "instantiate_node(#{node_class_name},input, #{start_index_var}...index, #{accumulator_var})"
-        extend_result_with_inline_module
+        extend_result_with_inline_module parent_expression
       end
     end
 
@@ -38,7 +38,7 @@ module Treetop
     class ZeroOrMore < Repetition
       def compile(address, builder, parent_expression)
         super
-        assign_and_extend_result
+        assign_and_extend_result parent_expression
         end_comment(parent_expression)
       end
 
@@ -55,7 +55,7 @@ module Treetop
           assign_failure start_index_var
         end
         builder.else_ do
-          assign_and_extend_result
+          assign_and_extend_result parent_expression
         end
         end_comment(parent_expression)
       end
@@ -81,11 +81,11 @@ module Treetop
 	  end
           builder.else_ do
 	    clean_unsaturated
-	    assign_and_extend_result
+	    assign_and_extend_result parent_expression
 	  end
         else
 	  clean_unsaturated
-	  assign_and_extend_result
+	  assign_and_extend_result parent_expression
 	end
 
         end_comment(parent_expression)
@@ -95,7 +95,7 @@ module Treetop
       def clean_unsaturated
 	if !max.empty? && max.text_value.to_i > 0
 	  builder.if_ "#{accumulator_var}.size < #{max.text_value}" do
-	    builder << 'terminal_failures.pop'  # Ignore the last failure.
+	    builder << '@terminal_failures.pop'  # Ignore the last failure.
 	  end
 	end
       end

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

@@ -9,7 +9,7 @@ module Treetop
         builder.if__ "#{accumulator_var}.last" do
           assign_result "instantiate_node(#{node_class_name},input, #{start_index_var}...index, #{accumulator_var})"
           extend_result sequence_element_accessor_module_name if sequence_element_accessor_module_name
-          extend_result_with_inline_module
+          extend_result_with_inline_module parent_expression
         end
         builder.else_ do
           reset_index

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

@@ -25,7 +25,13 @@ module Treetop
         builder.if__ "(match_len = has_terminal?(#{str}, #{mode}, index))" do
           if address == 0 || decorated? || mode != 'false' || string_length > 1
 	    assign_result "instantiate_node(#{node_class_name},input, index...(index + match_len))"
-	    extend_result_with_inline_module
+	    # debugger if parent_expression and parent_expression.inline_modules.size > 0
+	    # extend_result_with_inline_module parent_expression
+	    if parent_expression
+	      parent_expression.inline_modules.each do |inline|
+		extend_result inline.module_name
+	      end
+	    end
           else
             assign_lazily_instantiated_node
 	  end

data/lib/treetop/runtime/syntax_node.rb

@@ -60,7 +60,7 @@ module Treetop
         end
       end
 
-      def inspect(indent="")
+      def inspect_self(indent="")
         em = extension_modules
         interesting_methods = methods-[em.last ? em.last.methods : nil]-self.class.instance_methods
         im = interesting_methods.size > 0 ? " (#{interesting_methods.join(",")})" : ""
@@ -72,18 +72,25 @@ module Treetop
           em.map{|m| "+"+m.to_s.sub(/.*:/,'')}*"" +
           " offset=#{interval.first}" +
           ", #{tv.inspect}" +
-          im +
-          (elements && elements.size > 0 ?
-            ":" +
-              (elements||[]).map{|e|
-          begin
-            "\n"+e.inspect(indent+"  ")
-          rescue  # Defend against inspect not taking a parameter
-            "\n"+indent+" "+e.inspect
-          end
-              }.join("") :
-            ""
-          )
+          im
+      end
+
+      def inspect_children(indent="")
+	return '' unless elements && elements.size > 0
+	":" +
+	  elements.map do |e|
+	    begin
+	      "\n"+e.inspect(indent+"  ")
+	    rescue  # Defend against inspect not taking a parameter
+	      "\n"+indent+" "+e.inspect
+	    end
+	  end.
+	  join("")
+      end
+
+      def inspect(indent="")
+	inspect_self(indent) +
+	inspect_children(indent)
       end
 
       @@dot_id_counter = 0

data/lib/treetop/version.rb

@@ -2,7 +2,7 @@ module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 6
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/compiler/choice_spec.rb

@@ -2,22 +2,31 @@ require 'spec_helper'
 
 module ChoiceSpec
   describe "A choice between terminal symbols" do
-    testing_expression '"foo" { def foo_method; end } / "bar" { def bar_method; end } / "baz" { def baz_method; end }'
+    testing_expression '("foo" { def foo_method; end } / "bar" { def bar_method; end } / "baz" { def baz_method; end }) {def bat_method; end}'
 
     it "successfully parses input matching any of the alternatives, returning a node that responds to methods defined in its respective inline module" do
       result = parse('foo')
       result.should_not be_nil
       result.should respond_to(:foo_method)
-    
+      result.should_not respond_to(:bar_method)
+      result.should_not respond_to(:baz_method)
+      result.should respond_to(:bat_method)
+
       result = parse('bar')
       result.should_not be_nil
+      result.should_not respond_to(:foo_method)
       result.should respond_to(:bar_method)
-    
+      result.should_not respond_to(:baz_method)
+      result.should respond_to(:bat_method)
+
       result = parse('baz')
       result.should_not be_nil
+      result.should_not respond_to(:foo_method)
+      result.should_not respond_to(:bar_method)
       result.should respond_to(:baz_method)
+      result.should respond_to(:bat_method)
     end
-  
+
     it "upon parsing a string matching the second alternative, records the failure of the first terminal" do
       result = parse('bar')
       terminal_failures = parser.terminal_failures
@@ -26,18 +35,18 @@ module ChoiceSpec
       failure.expected_string.should == '"foo"'
       failure.index.should == 0
     end
-  
+
     it "upon parsing a string matching the third alternative, records the failure of the first two terminals" do
       result = parse('baz')
-      
+
       terminal_failures = parser.terminal_failures
-      
+
       terminal_failures.size.should == 2
 
       failure_1 = terminal_failures[0]
       failure_1.expected_string == 'foo'
       failure_1.index.should == 0
-    
+
       failure_2 = terminal_failures[1]
       failure_2.expected_string == 'bar'
       failure_2.index.should == 0
@@ -53,7 +62,7 @@ module ChoiceSpec
     end
   end
 
-  describe "A choice between terminals followed by a block" do  
+  describe "A choice between terminals followed by a block" do
     testing_expression "('a'/ 'bb' / [c]) { def a_method; end }"
 
     it "extends a match of any of its subexpressions with a module created from the block" do
@@ -68,7 +77,7 @@ module ChoiceSpec
     end
   end
 
-  describe "a choice followed by a declared module" do  
+  describe "a choice followed by a declared module" do
     testing_expression "('a'/ 'bb' / [c]) <ChoiceSpec::TestModule>"
 
     it "extends a match of any of its subexpressions with a module created from the block" do