treetop 1.5.3 → 1.6.2

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
@@ -17,6 +17,10 @@ module Treetop
           assign_result 'nil'
         end
       end
+
+      def expected
+	'"any character"'
+      end
     end
   end
 end

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

@@ -7,18 +7,22 @@ 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
           builder << "@index += 1"  # Always one character
         end
         builder.else_ do
-          builder << "terminal_parse_failure(#{single_quote('['+characters+']')})"
+          builder << "terminal_parse_failure(#{expected})"
           assign_result 'nil'
         end
       end
 
+      def expected
+	single_quote('['+characters+']')
+      end
+
       def grounded_regexp(string)
         # Double any backslashes, then backslash any single-quotes:
         "'\\A#{string.gsub(/\\/) { '\\\\' }.gsub(/'/) { "\\'"}}'"

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,17 +17,21 @@ 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
+
+      def expected
+	'"(any alternative)"'
+      end
     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/parenthesized_expression.rb

@@ -4,6 +4,10 @@ module Treetop
       def compile(address, builder, parent_expression = nil)
         elements[2].compile(address, builder, parent_expression)
       end
+
+      def expected
+	elements[2].expected
+      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
@@ -141,6 +147,10 @@ module Treetop
       def on_one_line(expression)
         expression.text_value.tr("\n", ' ')
       end
+
+      def expected
+	nil # Overridden for terminal parse failures
+      end
     end
   end
 end

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

@@ -13,6 +13,7 @@ module Treetop
       end
       
       def assign_failure
+        reset_index
         super(start_index_var)
       end
       
@@ -35,11 +36,17 @@ module Treetop
     class NotPredicate < Predicate
       def when_success
         assign_failure
+	if (e = parent.atomic.expected)
+	  builder << "terminal_parse_failure(#{e}, true)"
+	end
       end
       
       def when_failure
+	if (e = parent.atomic.expected)
+	  builder << "terminal_failures.pop"
+	end
         assign_success
       end
     end
   end
-end
+end

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

@@ -10,6 +10,13 @@ module Treetop
         p = parent
         p = p.parent while p && !p.respond_to?(:accumulator_var)
         assign_result "lambda #{text_value}.call(#{p ? p.accumulator_var : ""})"
+        builder.if_ '!'+result_var do
+          builder << "terminal_parse_failure(#{expected})"
+        end
+      end
+
+      def expected
+	'"<semantic predicate>"'  # Should I include (some of) the text_value here?
       end
     end
   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
@@ -63,26 +63,46 @@ module Treetop
       def max
         nil
       end
+
+      def expected
+	parent_expression.atomic.expected && '"at least one "+'+parent_expression.atomic.expected
+      end
     end
 
     class OccurrenceRange < Repetition
       def compile(address, builder, parent_expression)
         super
 
-        if min.empty? || min.text_value.to_i == 0
-          assign_and_extend_result
-        else
+        if !min.empty? && min.text_value.to_i != 0
           # We got some, but fewer than we wanted. There'll be a failure reported already
           builder.if__ "#{accumulator_var}.size < #{min.text_value}" do
             reset_index
             assign_failure start_index_var
-          end
+	  end
           builder.else_ do
-            assign_and_extend_result
-          end
-        end
+	    clean_unsaturated
+	    assign_and_extend_result parent_expression
+	  end
+        else
+	  clean_unsaturated
+	  assign_and_extend_result parent_expression
+	end
+
         end_comment(parent_expression)
       end
+
+      # remove the last terminal_failure if we merely failed to reach the maximum
+      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.
+	  end
+	end
+      end
+
+      def expected
+	parent_expression.atomic.expected && "at least #{min.text_value} "+parent_expression.atomic.expected
+      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
@@ -40,6 +40,10 @@ module Treetop
       def sequence_element_accessor_module_name
         sequence_element_accessor_module.module_name
       end
+
+      def expected
+	'"<a sequence>"'
+      end
     end
     
     class SequenceElementAccessorModule

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

@@ -25,17 +25,27 @@ 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
           builder << "@index += match_len"
         end
         builder.else_ do
-          builder << "terminal_parse_failure(#{string})"
+          builder << "terminal_parse_failure(#{expected})"
           assign_result 'nil'
         end
       end
+
+      def expected
+	single_quote(string)
+      end
     end
   end
 end

data/lib/treetop/runtime/compiled_parser.rb

@@ -17,7 +17,12 @@ module Treetop
         @index = options[:index] if options[:index]
         result = send("_nt_#{options[:root] || root}")
         should_consume_all = options.include?(:consume_all_input) ? options[:consume_all_input] : consume_all_input?
-        return nil if (should_consume_all && index != input.size)
+	if (should_consume_all && index != input.size)
+	  if index > max_terminal_failure_index	# Otherwise the failure is already explained
+	    terminal_parse_failure('<END OF INPUT>', true)
+	  end
+	  return nil
+	end
         return SyntaxNode.new(input, index...(index + 1)) if result == true
         return result
       end
@@ -34,15 +39,16 @@ module Treetop
         @terminal_failures && input.column_of(failure_index)
       end
 
+      OtherThan = 'something other than '
       def failure_reason
         return nil unless (tf = terminal_failures) && tf.size > 0
         "Expected " +
           (tf.size == 1 ?
-           tf[0].expected_string :
-                 "one of #{tf.map{|f| f.expected_string}.uniq*', '}"
+           (tf[0].unexpected ? OtherThan : '')+tf[0].expected_string :
+                 "one of #{tf.map{|f| (f.unexpected ? OtherThan : '')+f.expected_string}.uniq*', '}"
           ) +
                 " at line #{failure_line}, column #{failure_column} (byte #{failure_index+1})" +
-                " after #{input[index...failure_index]}"
+                (failure_index > 0 ? " after #{input[index...failure_index]}" : '')
       end
 
       def terminal_failures
@@ -106,13 +112,13 @@ module Treetop
         end
       end
 
-      def terminal_parse_failure(expected_string)
+      def terminal_parse_failure(expected_string, unexpected = false)
         return nil if index < max_terminal_failure_index
         if index > max_terminal_failure_index
           @max_terminal_failure_index = index
           @terminal_failures = []
         end
-        @terminal_failures << [index, expected_string]
+        @terminal_failures << [index, expected_string, unexpected]
         return nil
       end
     end

data/lib/treetop/runtime/syntax_node.rb

@@ -7,7 +7,9 @@ module Treetop
       def initialize(input, interval, elements = nil)
         @input = input
         @interval = interval
-        @elements = elements
+        if (@elements = elements)
+	  @elements.each { |e| e.equal?(true) or e.parent = self }
+	end
       end
 
       def elements
@@ -18,8 +20,8 @@ module Treetop
           if element == true
             index = last_element ? last_element.interval.last : interval.first
             element = SyntaxNode.new(input, index...(index + 1))
+	    element.parent = self
           end
-          element.parent = self
           last_element = element
         end
 
@@ -58,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(",")})" : ""
@@ -70,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/runtime/terminal_parse_failure.rb

@@ -1,15 +1,16 @@
 module Treetop
   module Runtime
     class TerminalParseFailure
-      attr_reader :index, :expected_string
+      attr_reader :index, :expected_string, :unexpected
 
-      def initialize(index, expected_string)
+      def initialize(index, expected_string, unexpected = false)
         @index = index
         @expected_string = expected_string
+	@unexpected = unexpected
       end
 
       def to_s
-        "String matching #{expected_string} expected."
+	"String matching #{expected_string} #{@unexpected ? 'not ' : ''}expected."
       end
     end
   end