treetop 1.5.3 → 1.6.12

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,22 +39,23 @@ 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
-        if @terminal_failures.empty? || @terminal_failures[0].is_a?(TerminalParseFailure)
+        if @terminal_failures.empty? || @terminal_failures[-1].is_a?(TerminalParseFailure)
           @terminal_failures
         else
-          @terminal_failures.map! {|tf_ary| TerminalParseFailure.new(*tf_ary) }
+          @terminal_failures.map! {|tf_ary| tf_ary.is_a?(TerminalParseFailure) ? tf_ary : TerminalParseFailure.new(*tf_ary) }
         end
       end
 
@@ -69,6 +75,11 @@ module Treetop
         @max_terminal_failure_index = 0
       end
 
+      def forget_failures_to_here
+        @terminal_failures = []
+        @max_terminal_failure_index = -1
+      end
+
       def reset_index
         @index = 0
       end
@@ -93,26 +104,34 @@ module Treetop
       end
 
       def has_terminal?(terminal, mode, index)
-	case mode
-	when :regexp	# A Regexp has been passed in, either a character class or a literel regex 'foo'r
-	  (terminal =~ input[index..-1]) == 0 && $&.length
-	when false	# The terminal is a string which must match exactly
+        case mode
+        when :regexp    # A Regexp has been passed in, either a character class or a literel regex 'foo'r
+          (terminal =~ input[index..-1]) == 0 && $&.length
+        when false      # The terminal is a string which must match exactly
           input[index, terminal.size] == terminal && terminal.size
-	when :insens	# The terminal is a downcased string which must match input downcased
+        when :insens    # The terminal is a downcased string which must match input downcased
           input[index, terminal.size].downcase == terminal && terminal.size
-	when true	# Only occurs with old compiled grammars, for character classes
+        when true       # Only occurs with old compiled grammars, for character classes
           rx = @regexps[terminal] ||= Regexp.new(terminal)
           input.index(rx, index) == index && $&.length
         end
       end
 
-      def terminal_parse_failure(expected_string)
+      def terminal_parse_failure(expected_string, unexpected = false)
+        if @max_terminal_failure_index == -1
+          @max_terminal_failure_index = 0
+          return nil
+        end
         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]
+        # It's very slow, but this shows the last 5 nested rules:
+        # caller.reject{|l| l =~ /`loop'|`block in /}[0..5].reverse.map{|l| l.sub(/[^`]*`_nt_/,'').sub(/'/,'')}
+
+        terminal_failures
         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

data/lib/treetop/runtime/terminal_syntax_node.rb

@@ -7,10 +7,10 @@ module Treetop
       end
 
       def inspect(indent="")
-	indent+
-	  self.class.to_s.sub(/.*:/,'') +
-	  " offset=#{interval.first}" +
-	  " #{text_value.inspect}"
+        indent+
+          self.class.to_s.sub(/.*:/,'') +
+          " offset=#{interval.first}" +
+          " #{text_value.inspect}"
       end
     end
   end

data/lib/treetop/version.rb

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

data/treetop.gemspec

@@ -1,174 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: treetop 1.5.3 ruby lib
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'date'
+require 'treetop/version'
 
-Gem::Specification.new do |s|
-  s.name = "treetop"
-  s.version = "1.5.3"
+Gem::Specification.new do |spec|
+  spec.name = "treetop"
+  spec.version = Treetop::VERSION::STRING
+  spec.authors = ["Nathan Sobo", "Clifford Heath"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Nathan Sobo", "Clifford Heath"]
-  s.autorequire = "treetop"
-  s.date = "2014-03-21"
-  s.email = "cliffordheath@gmail.com"
-  s.executables = ["tt"]
-  s.extra_rdoc_files = [
+  spec.email = "cliffordheath@gmail.com"
+  spec.date = Date.today.strftime("%F")
+  spec.summary = "A Ruby-based text parsing and interpretation DSL"
+  spec.description = "A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby"
+  spec.homepage = "https://github.com/cjheath/treetop"
+  spec.licenses = ["MIT"]
+
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|website|script|\.|benchmark)}) }
+  spec.executables = ["tt"]
+  spec.require_paths = ["lib"]
+  spec.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
-  s.files = [
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "bin/tt",
-    "doc/contributing_and_planned_features.markdown",
-    "doc/grammar_composition.markdown",
-    "doc/index.markdown",
-    "doc/pitfalls_and_advanced_techniques.markdown",
-    "doc/semantic_interpretation.markdown",
-    "doc/site.rb",
-    "doc/sitegen.rb",
-    "doc/syntactic_recognition.markdown",
-    "doc/tt.1",
-    "doc/using_in_ruby.markdown",
-    "examples/lambda_calculus/arithmetic.rb",
-    "examples/lambda_calculus/arithmetic.treetop",
-    "examples/lambda_calculus/arithmetic_node_classes.rb",
-    "examples/lambda_calculus/arithmetic_test.rb",
-    "examples/lambda_calculus/lambda_calculus",
-    "examples/lambda_calculus/lambda_calculus.rb",
-    "examples/lambda_calculus/lambda_calculus.treetop",
-    "examples/lambda_calculus/lambda_calculus_node_classes.rb",
-    "examples/lambda_calculus/lambda_calculus_test.rb",
-    "examples/lambda_calculus/test_helper.rb",
-    "lib/treetop.rb",
-    "lib/treetop/bootstrap_gen_1_metagrammar.rb",
-    "lib/treetop/compiler.rb",
-    "lib/treetop/compiler/grammar_compiler.rb",
-    "lib/treetop/compiler/lexical_address_space.rb",
-    "lib/treetop/compiler/metagrammar.rb",
-    "lib/treetop/compiler/metagrammar.treetop",
-    "lib/treetop/compiler/node_classes.rb",
-    "lib/treetop/compiler/node_classes/anything_symbol.rb",
-    "lib/treetop/compiler/node_classes/atomic_expression.rb",
-    "lib/treetop/compiler/node_classes/character_class.rb",
-    "lib/treetop/compiler/node_classes/choice.rb",
-    "lib/treetop/compiler/node_classes/declaration_sequence.rb",
-    "lib/treetop/compiler/node_classes/grammar.rb",
-    "lib/treetop/compiler/node_classes/inline_module.rb",
-    "lib/treetop/compiler/node_classes/nonterminal.rb",
-    "lib/treetop/compiler/node_classes/optional.rb",
-    "lib/treetop/compiler/node_classes/parenthesized_expression.rb",
-    "lib/treetop/compiler/node_classes/parsing_expression.rb",
-    "lib/treetop/compiler/node_classes/parsing_rule.rb",
-    "lib/treetop/compiler/node_classes/predicate.rb",
-    "lib/treetop/compiler/node_classes/predicate_block.rb",
-    "lib/treetop/compiler/node_classes/repetition.rb",
-    "lib/treetop/compiler/node_classes/sequence.rb",
-    "lib/treetop/compiler/node_classes/terminal.rb",
-    "lib/treetop/compiler/node_classes/transient_prefix.rb",
-    "lib/treetop/compiler/node_classes/treetop_file.rb",
-    "lib/treetop/compiler/ruby_builder.rb",
-    "lib/treetop/polyglot.rb",
-    "lib/treetop/ruby_extensions.rb",
-    "lib/treetop/ruby_extensions/string.rb",
-    "lib/treetop/runtime.rb",
-    "lib/treetop/runtime/compiled_parser.rb",
-    "lib/treetop/runtime/interval_skip_list.rb",
-    "lib/treetop/runtime/interval_skip_list/head_node.rb",
-    "lib/treetop/runtime/interval_skip_list/interval_skip_list.rb",
-    "lib/treetop/runtime/interval_skip_list/node.rb",
-    "lib/treetop/runtime/syntax_node.rb",
-    "lib/treetop/runtime/terminal_parse_failure.rb",
-    "lib/treetop/runtime/terminal_syntax_node.rb",
-    "lib/treetop/version.rb",
-    "spec/compiler/and_predicate_spec.rb",
-    "spec/compiler/anything_symbol_spec.rb",
-    "spec/compiler/character_class_spec.rb",
-    "spec/compiler/choice_spec.rb",
-    "spec/compiler/circular_compilation_spec.rb",
-    "spec/compiler/failure_propagation_functional_spec.rb",
-    "spec/compiler/grammar_compiler_spec.rb",
-    "spec/compiler/grammar_spec.rb",
-    "spec/compiler/multibyte_chars_spec.rb",
-    "spec/compiler/namespace_spec.rb",
-    "spec/compiler/nonterminal_symbol_spec.rb",
-    "spec/compiler/not_predicate_spec.rb",
-    "spec/compiler/occurrence_range_spec.rb",
-    "spec/compiler/one_or_more_spec.rb",
-    "spec/compiler/optional_spec.rb",
-    "spec/compiler/parenthesized_expression_spec.rb",
-    "spec/compiler/parsing_rule_spec.rb",
-    "spec/compiler/repeated_subrule_spec.rb",
-    "spec/compiler/semantic_predicate_spec.rb",
-    "spec/compiler/sequence_spec.rb",
-    "spec/compiler/terminal_spec.rb",
-    "spec/compiler/terminal_symbol_spec.rb",
-    "spec/compiler/test_grammar.treetop",
-    "spec/compiler/test_grammar.tt",
-    "spec/compiler/test_grammar_do.treetop",
-    "spec/compiler/test_grammar_magic_coding.treetop",
-    "spec/compiler/test_grammar_magic_encoding.treetop",
-    "spec/compiler/tt_compiler_spec.rb",
-    "spec/compiler/zero_or_more_spec.rb",
-    "spec/composition/a.treetop",
-    "spec/composition/b.treetop",
-    "spec/composition/c.treetop",
-    "spec/composition/d.treetop",
-    "spec/composition/f.treetop",
-    "spec/composition/grammar_composition_spec.rb",
-    "spec/composition/subfolder/e_includes_c.treetop",
-    "spec/ruby_extensions/string_spec.rb",
-    "spec/runtime/compiled_parser_spec.rb",
-    "spec/runtime/interval_skip_list/delete_spec.rb",
-    "spec/runtime/interval_skip_list/expire_range_spec.rb",
-    "spec/runtime/interval_skip_list/insert_and_delete_node_spec.rb",
-    "spec/runtime/interval_skip_list/insert_spec.rb",
-    "spec/runtime/interval_skip_list/interval_skip_list_spec.graffle",
-    "spec/runtime/interval_skip_list/interval_skip_list_spec.rb",
-    "spec/runtime/interval_skip_list/palindromic_fixture.rb",
-    "spec/runtime/interval_skip_list/palindromic_fixture_spec.rb",
-    "spec/runtime/interval_skip_list/spec_helper.rb",
-    "spec/runtime/syntax_node_spec.rb",
-    "spec/spec_helper.rb",
-    "treetop.gemspec"
-  ]
-  s.homepage = "https://github.com/cjheath/treetop"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "A Ruby-based text parsing and interpretation DSL"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<polyglot>, ["~> 0.3"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<activesupport>, ["~> 4.0"])
-      s.add_development_dependency(%q<i18n>, ["~> 0.6"])
-      s.add_development_dependency(%q<rr>, ["~> 1.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2"])
-      s.add_development_dependency(%q<rake>, ["~> 10"])
-    else
-      s.add_dependency(%q<polyglot>, ["~> 0.3"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<activesupport>, ["~> 4.0"])
-      s.add_dependency(%q<i18n>, ["~> 0.6"])
-      s.add_dependency(%q<rr>, ["~> 1.0"])
-      s.add_dependency(%q<rspec>, ["~> 2"])
-      s.add_dependency(%q<rake>, ["~> 10"])
-    end
-  else
-    s.add_dependency(%q<polyglot>, ["~> 0.3"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<activesupport>, ["~> 4.0"])
-    s.add_dependency(%q<i18n>, ["~> 0.6"])
-    s.add_dependency(%q<rr>, ["~> 1.0"])
-    s.add_dependency(%q<rspec>, ["~> 2"])
-    s.add_dependency(%q<rake>, ["~> 10"])
-  end
+  spec.add_runtime_dependency(%q<polyglot>, ["~> 0.3"])
+  spec.add_development_dependency(%q<activesupport>, [">= 4"])
+  spec.add_development_dependency(%q<i18n>, ["~> 1.0"])
+  spec.add_development_dependency(%q<rr>, ["~> 3.0"])
+  spec.add_development_dependency(%q<rspec>, ["~> 3"])
+  spec.add_development_dependency(%q<rake>, [">= 11"])
 end