treetop 1.6.5 → 1.6.6

data/lib/treetop/runtime/compiled_parser.rb

@@ -17,12 +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?
-	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
+        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
@@ -99,14 +99,14 @@ 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

data/lib/treetop/runtime/syntax_node.rb

@@ -8,8 +8,8 @@ module Treetop
         @input = input
         @interval = interval
         if (@elements = elements)
-	  @elements.each { |e| e.equal?(true) or e.parent = self }
-	end
+          @elements.each { |e| e.equal?(true) or e.parent = self }
+        end
       end
 
       def elements
@@ -20,7 +20,7 @@ module Treetop
           if element == true
             index = last_element ? last_element.interval.last : interval.first
             element = SyntaxNode.new(input, index...(index + 1))
-	    element.parent = self
+            element.parent = self
           end
           last_element = element
         end
@@ -76,21 +76,21 @@ module Treetop
       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("")
+        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)
+        inspect_self(indent) +
+        inspect_children(indent)
       end
 
       @@dot_id_counter = 0

data/lib/treetop/runtime/terminal_parse_failure.rb

@@ -6,11 +6,11 @@ module Treetop
       def initialize(index, expected_string, unexpected = false)
         @index = index
         @expected_string = expected_string
-	@unexpected = unexpected
+        @unexpected = unexpected
       end
 
       def to_s
-	"String matching #{expected_string} #{@unexpected ? 'not ' : ''}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

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

data/spec/compiler/anything_symbol_spec.rb

@@ -20,8 +20,8 @@ module AnythingSymbolSpec
   
     it "fails to parse epsilon" do
       parse('') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end

data/spec/compiler/character_class_spec.rb

@@ -22,8 +22,8 @@ module CharacterClassSpec
 
     it "does not match single characters outside of that range" do
       parse('8') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
       parse('a').should be_nil
     end
@@ -212,7 +212,7 @@ module CharacterClassSpec
     it "doesn't evaluate the insertion" do
       x = true
       lambda{
-	x = parse("y")
+        x = parse("y")
       }.should_not raise_error
       x.should be_nil
       parse('#').should_not be_nil

data/spec/compiler/grammar_spec.rb

@@ -32,8 +32,8 @@ module GrammarSpec
 
     it "fails if it does not parse all input" do
       parse('barbarbazbaz') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
 

data/spec/compiler/not_predicate_spec.rb

@@ -6,8 +6,8 @@ module NotPredicateSpec
 
     it "fails to parse input matching the terminal symbol" do
       parse('foo') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end
@@ -17,8 +17,8 @@ module NotPredicateSpec
 
     it "fails to parse input matching the terminal symbol" do
       parse('e') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end
@@ -44,8 +44,8 @@ module NotPredicateSpec
 
     it "fails to parse matching input" do
       parse('abcc') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end

data/spec/compiler/occurrence_range_spec.rb

@@ -55,7 +55,7 @@ module OccurrenceRangeSpec
       parse("foofoofoo") do |result|
         result.should be_nil
 
-	parser.terminal_failures.size.should == 1
+        parser.terminal_failures.size.should == 1
       end
     end
 
@@ -64,7 +64,7 @@ module OccurrenceRangeSpec
         result.should_not be_nil
         result.elements.size.should == 2
 
-	parser.terminal_failures.size.should == 0
+        parser.terminal_failures.size.should == 0
       end
     end
 
@@ -114,7 +114,7 @@ module OccurrenceRangeSpec
         result.should respond_to(:a_method)
 
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 0
+        terminal_failures.size.should == 0
       end
     end
 
@@ -123,7 +123,7 @@ module OccurrenceRangeSpec
         result.should be_nil
 
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
   end

data/spec/compiler/parenthesized_expression_spec.rb

@@ -14,8 +14,8 @@ module ParenthesizedExpressionSpec
   
     it "should behave as normal" do
       parse('foo') do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end
@@ -24,9 +24,9 @@ module ParenthesizedExpressionSpec
     testing_expression '("foo" { def inner; end } ) { def outer; end} '
     it "should extend both code modules " do
       parse('foo') do |result|
-	skip "Arbitrarily nested modules are not yet compiled"
-	result.should respond_to(:inner)
-	result.should respond_to(:outer)
+        skip "Arbitrarily nested modules are not yet compiled"
+        result.should respond_to(:inner)
+        result.should respond_to(:outer)
       end
     end
   end

data/spec/compiler/semantic_predicate_spec.rb

@@ -17,7 +17,7 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
 
@@ -44,7 +44,7 @@ module SemanticPredicateSpec
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
 
@@ -69,7 +69,7 @@ module SemanticPredicateSpec
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
 
@@ -78,7 +78,7 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-	# We should get "prior " failed, and also the predicate block
+        # We should get "prior " failed, and also the predicate block
         terminal_failures.size.should == 2
         terminal_failures[0].index.should == 0
         terminal_failures[0].expected_string.should == '"prior "'
@@ -105,7 +105,7 @@ module SemanticPredicateSpec
       parse('foo', :consume_all_input => false) do |result|
         result.should be_nil
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
 
@@ -132,7 +132,7 @@ module SemanticPredicateSpec
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
 
@@ -157,7 +157,7 @@ module SemanticPredicateSpec
         result.should be_nil
         $value.should == 'prior '
         terminal_failures = parser.terminal_failures
-	terminal_failures.size.should == 1
+        terminal_failures.size.should == 1
       end
     end
 

data/spec/compiler/terminal_spec.rb

@@ -18,14 +18,14 @@ module TerminalSymbolSpec
     it "fails to match the input string other than at the start" do
       parse " Foo", :index => 0 do |result|
         result.should be_nil
-	parser.terminal_failures.size.should == 1
+        parser.terminal_failures.size.should == 1
       end
     end
 
     it "fails to match the input string in the wrong case" do
       parse "foo", :index => 0 do |result|
         result.should be_nil
-	parser.terminal_failures.size.should == 1
+        parser.terminal_failures.size.should == 1
       end
     end
   end
@@ -78,8 +78,8 @@ module TerminalSymbolSpec
 
     it "fails to parse nonmatching input at the index even if a match occurs later" do
       parse(" foo", :index =>  0) do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end
@@ -131,14 +131,14 @@ module TerminalSymbolSpec
     it "fails to match the input string other than at the start" do
       parse " Foo", :index => 0 do |result|
         result.should be_nil
-	parser.terminal_failures.size.should == 1
+        parser.terminal_failures.size.should == 1
       end
     end
 
     it "fails to match the input string in the wrong case" do
       parse "foo", :index => 0 do |result|
         result.should be_nil
-	parser.terminal_failures.size.should == 1
+        parser.terminal_failures.size.should == 1
       end
     end
   end

data/spec/compiler/terminal_symbol_spec.rb

@@ -32,8 +32,8 @@ module TerminalSymbolSpec
 
     it "fails to parse nonmatching input at the index even if a match occurs later" do
       parse(" foo", :index =>  0) do |result|
-	result.should be_nil
-	parser.terminal_failures.size.should == 1
+        result.should be_nil
+        parser.terminal_failures.size.should == 1
       end
     end
   end

data/spec/runtime/compiled_parser_spec.rb

@@ -128,16 +128,16 @@ module CompiledParserSpec
       grammar Alternates
         rule main
           aa &{|s| s[0].elements[0].parent.should == s[0] }
-	  / ab &{|s| s[0].elements[0].parent.should == s[0] }
+          / ab &{|s| s[0].elements[0].parent.should == s[0] }
         end
 
-	rule aa
-	  'a' 'a'
-	end
+        rule aa
+          'a' 'a'
+        end
 
-	rule ab
-	  'a' 'b'
-	end
+        rule ab
+          'a' 'b'
+        end
       end
     }
 

data/spec/spec_helper.rb

@@ -8,6 +8,11 @@ $LOAD_PATH.unshift File.expand_path('../../lib')
 require 'treetop'
 include Treetop
 
+# We're still using the old expect syntax:
+RSpec.configure do |c|
+  c.expect_with(:rspec) { |c| c.syntax = :should }
+end
+
 module Treetop
   module ExampleGroupInstanceMethods
     module ClassMethods
@@ -26,7 +31,7 @@ module Treetop
       end
 
       def testing_grammar(grammar_under_test)
-	self.parser_text = grammar_under_test
+        self.parser_text = grammar_under_test
         grammar_node = parse_with_metagrammar(grammar_under_test.strip, :module_or_grammar)
         self.parser_code = grammar_node.compile
         class_eval(self.parser_code)

data/treetop.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: treetop 1.6.5 ruby lib
+# stub: treetop 1.6.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treetop"
-  s.version = "1.6.5"
+  s.version = "1.6.6"
 
   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.date = "2016-02-25"
+  s.date = "2016-07-20"
   s.description = "A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby"
   s.email = "cliffordheath@gmail.com"
   s.executables = ["tt"]
@@ -124,15 +124,6 @@ Gem::Specification.new do |s|
     "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"
@@ -148,28 +139,28 @@ Gem::Specification.new do |s|
     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<activesupport>, ["~> 5"])
       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"])
+      s.add_development_dependency(%q<rspec>, ["~> 3"])
+      s.add_development_dependency(%q<rake>, ["~> 11"])
     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<activesupport>, ["~> 5"])
       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"])
+      s.add_dependency(%q<rspec>, ["~> 3"])
+      s.add_dependency(%q<rake>, ["~> 11"])
     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<activesupport>, ["~> 5"])
     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"])
+    s.add_dependency(%q<rspec>, ["~> 3"])
+    s.add_dependency(%q<rake>, ["~> 11"])
   end
 end