treetop 1.5.3 → 1.6.2

data/spec/compiler/sequence_spec.rb

@@ -34,7 +34,7 @@ module SequenceSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 6
-        failure.expected_string.should == 'bar'
+        failure.expected_string.should == '"bar"'
       end
     end
   end

data/spec/compiler/terminal_spec.rb

@@ -18,12 +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
       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
       end
     end
   end
@@ -75,7 +77,10 @@ module TerminalSymbolSpec
     end
 
     it "fails to parse nonmatching input at the index even if a match occurs later" do
-      parse(" foo", :index =>  0).should be_nil
+      parse(" foo", :index =>  0) do |result|
+	result.should be_nil
+	parser.terminal_failures.size.should == 1
+      end
     end
   end
 
@@ -126,12 +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
       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
       end
     end
   end

data/spec/compiler/terminal_symbol_spec.rb

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

data/spec/compiler/zero_or_more_spec.rb

@@ -5,6 +5,8 @@ module ZeroOrMoreSpec
   end
 
   describe "zero or more of a terminal symbol followed by a node class declaration and a block" do
+    # testing_expression '("foo" { def b_method; end } )* <ZeroOrMoreSpec::Foo> { def a_method; end }'
+    # testing_expression '("foo" { def a_method; end } )* <ZeroOrMoreSpec::Foo>'
     testing_expression '"foo"* <ZeroOrMoreSpec::Foo> { def a_method; end }'
 
     it "successfully parses epsilon, returning an instance declared node class and recording a terminal failure" do
@@ -17,7 +19,7 @@ module ZeroOrMoreSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 0
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
 
@@ -30,7 +32,7 @@ module ZeroOrMoreSpec
         terminal_failures.size.should == 1
         failure = terminal_failures.first
         failure.index.should == 6
-        failure.expected_string.should == 'foo'
+        failure.expected_string.should == '"foo"'
       end
     end
   end

data/spec/runtime/compiled_parser_spec.rb

@@ -83,7 +83,7 @@ module CompiledParserSpec
 
     it "provides #failure_reason, #failure_column, and #failure_line when there is a parse failure" do
       parser.parse('z').should be_nil
-      parser.failure_reason.should == "Expected one of a, b, c at line 1, column 1 (byte 1) after "
+      parser.failure_reason.should == "Expected one of 'a', 'b', 'c' at line 1, column 1 (byte 1)"
       parser.failure_line.should == 1
       parser.failure_column.should == 1
     end
@@ -110,14 +110,44 @@ module CompiledParserSpec
       terminal_failures.size.should == 1
       failure = terminal_failures.first
       failure.index.should == 1
-      failure.expected_string.should == 'b'
+      failure.expected_string.should == "'b'"
 
       parser.parse('b')
       terminal_failures = parser.terminal_failures
       terminal_failures.size.should == 1
       failure = terminal_failures.first
       failure.index.should == 0
-      failure.expected_string.should == 'a'
+      failure.expected_string.should == "'a'"
     end
   end
+
+  describe "a SyntaxNode" do
+    attr_reader :parser
+
+    testing_grammar %{
+      grammar Alternates
+        rule main
+          aa &{|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 ab
+	  'a' 'b'
+	end
+      end
+    }
+
+    before do
+      @parser = parser_class_under_test.new
+    end
+
+    it "should have its parent set and reset" do
+      parser.parse('ab')
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treetop
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.2
 platform: ruby
 authors:
 - Nathan Sobo
@@ -9,106 +9,106 @@ authors:
 autorequire: treetop
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 description: 
 email: cliffordheath@gmail.com
 executables:
@@ -136,7 +136,6 @@ files:
 - 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
@@ -243,12 +242,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []