treetop 1.6.2 → 1.6.3

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 parent_expression
+          extend_result_with_inline_module
         end
         builder.else_ do
           reset_index

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

@@ -25,13 +25,7 @@ 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))"
-	    # 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
+	    extend_result_with_inline_module
           else
             assign_lazily_instantiated_node
 	  end

data/lib/treetop/runtime/syntax_node.rb

@@ -60,7 +60,7 @@ module Treetop
         end
       end
 
-      def inspect_self(indent="")
+      def inspect(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,25 +72,18 @@ module Treetop
           em.map{|m| "+"+m.to_s.sub(/.*:/,'')}*"" +
           " offset=#{interval.first}" +
           ", #{tv.inspect}" +
-          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)
+          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("") :
+            ""
+          )
       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  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/compiler/choice_spec.rb

@@ -2,31 +2,22 @@ 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 }) {def bat_method; end}'
+    testing_expression '"foo" { def foo_method; end } / "bar" { def bar_method; end } / "baz" { def baz_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
@@ -35,18 +26,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
@@ -62,7 +53,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
@@ -77,7 +68,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

data/spec/compiler/grammar_compiler_spec.rb

@@ -32,17 +32,17 @@ describe Compiler::GrammarCompiler do
   specify "compilation of a single file to a default file name" do
     src_copy = "#{@tmpdir}/test_grammar.treetop"
     File.open(source_path_with_treetop_extension) { |f| File.open(src_copy,'w'){|o|o.write(f.read)} }
-    File.exists?(target_path).should be_false
+    File.exists?(target_path).should be_falsey
     compiler.compile(src_copy)
-    File.exists?(target_path).should be_true
+    File.exists?(target_path).should be_truthy
     require target_path
     Test::GrammarParser.new.parse('foo').should_not be_nil
   end
 
   specify "compilation of a single file to an explicit file name" do
-    File.exists?(alternate_target_path).should be_false
+    File.exists?(alternate_target_path).should be_falsy
     compiler.compile(source_path_with_treetop_extension, alternate_target_path)
-    File.exists?(alternate_target_path).should be_true
+    File.exists?(alternate_target_path).should be_truthy
     require alternate_target_path
     Test::GrammarParser.new.parse('foo').should_not be_nil
   end

data/spec/compiler/parenthesized_expression_spec.rb

@@ -19,15 +19,4 @@ module ParenthesizedExpressionSpec
       end
     end
   end
-
-  describe "An expression with code both inside and outside parentheses" do
-    testing_expression '("foo" { def inner; end } ) { def outer; end} '
-    it "should extend both code modules " do
-      parse('foo') do |result|
-	result.should respond_to(:inner)
-	result.should respond_to(:outer)
-      end
-    end
-  end
-
 end

data/spec/compiler/tt_compiler_spec.rb

@@ -34,36 +34,36 @@ describe "The 'tt' comand line compiler" do
 
     it 'can compile a grammar file' do
       # puts %q{emulate 'tt dumb.tt'}
-      system("ruby -S tt #{@test_grammar}").should be_true
+      system("ruby -S tt #{@test_grammar}").should be_truthy
 
-      File.exists?(@test_ruby).should be_true
-      File.zero?(@test_ruby).should_not be_true
+      File.exists?(@test_ruby).should be_truthy
+      File.zero?(@test_ruby).should_not be_truthy
     end
 
     it 'can compile a relative pathed grammar file' do
       dir = File.basename(File.expand_path(File.dirname(@test_grammar)))
 
       # puts %q{emulate 'tt "../<current_dir>/dumb.tt"'}
-      system("cd #{@tmpdir}/..; ruby -S tt \"./#{dir}/#{@test_base}.tt\"").should be_true
+      system("cd #{@tmpdir}/..; ruby -S tt \"./#{dir}/#{@test_base}.tt\"").should be_truthy
 
-      File.exists?(@test_ruby).should be_true
-      File.zero?(@test_ruby).should_not be_true
+      File.exists?(@test_ruby).should be_truthy
+      File.zero?(@test_ruby).should_not be_truthy
     end
 
     it 'can compile an absolute pathed grammar file' do
       # puts %q{emulate 'tt "/path/to/dumb.tt"'}
-      system("ruby -S tt \"#{File.expand_path(@test_grammar)}\"").should be_true
+      system("ruby -S tt \"#{File.expand_path(@test_grammar)}\"").should be_truthy
 
-      File.exists?(@test_ruby).should be_true
-      File.zero?(@test_ruby).should_not be_true
+      File.exists?(@test_ruby).should be_truthy
+      File.zero?(@test_ruby).should_not be_truthy
     end
 
     it 'can compile without explicit file extensions' do
       # puts %q{emulate 'tt dumb'}
-      system("ruby -S tt #{@test_path}").should be_true
+      system("ruby -S tt #{@test_path}").should be_truthy
 
-      File.exists?(@test_ruby).should be_true
-      File.zero?(@test_ruby).should_not be_true
+      File.exists?(@test_ruby).should be_truthy
+      File.zero?(@test_ruby).should_not be_truthy
     end
 
     it 'skips nonexistent grammar file without failing or creating bogus output' do
@@ -72,17 +72,17 @@ describe "The 'tt' comand line compiler" do
         (io.read =~ /ERROR.*?not exist.*?continuing/).should_not be_nil
       end
 
-      File.exists?("#{@test_base}.rb").should be_false
+      File.exists?("#{@test_base}.rb").should be_falsy
     end
 
     it 'can compile to a specified parser source file' do
       # puts %q{emulate 'tt -o my_dumb_test_parser.rb dumb'}
       pf = "#{@tmpdir}/my_dumb_test_parser.rb"
       begin
-        system("ruby -S tt -o #{pf} #{@test_path}").should be_true
+        system("ruby -S tt -o #{pf} #{@test_path}").should be_truthy
 
-        File.exists?(pf).should be_true
-        File.zero?(pf).should_not be_true
+        File.exists?(pf).should be_truthy
+        File.zero?(pf).should_not be_truthy
       ensure
         File.delete(pf) if File.exists?(pf)
       end
@@ -92,10 +92,10 @@ describe "The 'tt' comand line compiler" do
       # puts %q{emulate 'tt -o must_save_parser.rb dumb'}
       pf = "#{@tmpdir}/must_save_parser.rb"
       begin
-        system("ruby -S tt -o #{pf} #{@test_path}").should be_true
+        system("ruby -S tt -o #{pf} #{@test_path}").should be_truthy
 
-        File.exists?(pf).should be_true
-        File.zero?(pf).should_not be_true
+        File.exists?(pf).should be_truthy
+        File.zero?(pf).should_not be_truthy
 
         # Check that the magic comment is preserved:
         written = File.open(pf, "r") { |f| s = f.read }
@@ -121,16 +121,16 @@ describe "The 'tt' comand line compiler" do
       # puts %q{emulate 'tt -o must_save_parser.rb dumb'}
       pf = "#{@tmpdir}/must_save_parser.rb"
       begin
-        system("ruby -S tt -o #{pf} #{@test_path}").should be_true
+        system("ruby -S tt -o #{pf} #{@test_path}").should be_truthy
 
-        File.exists?(pf).should be_true
-        File.zero?(pf).should_not be_true
+        File.exists?(pf).should be_truthy
+        File.zero?(pf).should_not be_truthy
         orig_file_hash = Digest::SHA1.hexdigest(File.read(pf))
 
         # Modify the file and make sure it gets reverted:
         File.open(pf, "r+") { |f| f.gets; f.write("#") }
 
-        system("ruby -S tt -o #{pf} #{@test_path}").should be_true
+        system("ruby -S tt -o #{pf} #{@test_path}").should be_truthy
         Digest::SHA1.hexdigest(File.read(pf)).should == orig_file_hash
       ensure
         File.delete(pf) if File.exists?(pf)
@@ -139,13 +139,13 @@ describe "The 'tt' comand line compiler" do
 
     it 'can be forced to overwrite existing file #{@test_path}' do
       pf = "#{@test_path}.rb"
-      system("echo some junk >#{pf}").should be_true
+      system("echo some junk >#{pf}").should be_truthy
 
-      File.exists?(pf).should be_true
-      File.zero?(pf).should_not be_true
+      File.exists?(pf).should be_truthy
+      File.zero?(pf).should_not be_truthy
       orig_file_hash = Digest::SHA1.hexdigest(File.read(pf))
 
-      system("ruby -S tt -f #{@test_path}").should be_true
+      system("ruby -S tt -f #{@test_path}").should be_truthy
       Digest::SHA1.hexdigest(File.read(pf)).should_not == orig_file_hash
     end
 
@@ -179,45 +179,45 @@ describe "The 'tt' comand line compiler" do
  
     it 'can compile them in one invocation' do
       # puts %q{emulate 'tt dumb1.tt dumb2.tt'}
-      system("ruby -S tt #{@test_grammars.join(' ')}").should be_true
+      system("ruby -S tt #{@test_grammars.join(' ')}").should be_truthy
 
       @test_bases.each do |f|
         pf = "#{f}.rb"
-        File.exists?(pf).should be_true
-        File.zero?(pf).should_not be_true
+        File.exists?(pf).should be_truthy
+        File.zero?(pf).should_not be_truthy
       end
     end
 
     it 'can compile them without explicit file extenstions' do
       # puts %q{emulate 'tt dumb1 dumb2'}
-      system("ruby -S tt #{@test_bases.join(' ')}").should be_true
+      system("ruby -S tt #{@test_bases.join(' ')}").should be_truthy
 
       @test_bases.each do |f|
         pf = "#{f}.rb"
-        File.exists?(pf).should be_true
-        File.zero?(pf).should_not be_true
+        File.exists?(pf).should be_truthy
+        File.zero?(pf).should_not be_truthy
       end
     end
 
     it 'can skip nonexistent and invalid extension named grammar files' do
       # puts %q{emulate 'tt not_here bad_ext.ttg dumb1 dumb2'}
-      system("ruby -S tt not_here bad_ext.ttg #{@test_bases.join(' ')} >/dev/null 2>&1").should be_true
+      system("ruby -S tt not_here bad_ext.ttg #{@test_bases.join(' ')} >/dev/null 2>&1").should be_truthy
 
-      File.exists?('not_here.rb').should_not be_true
-      File.exists?('bad_ext.rb').should_not be_true
+      File.exists?('not_here.rb').should_not be_truthy
+      File.exists?('bad_ext.rb').should_not be_truthy
 
       @test_bases.each do |f|
         pf = "#{f}.rb"
-        File.exists?(pf).should be_true
-        File.zero?(pf).should_not be_true
+        File.exists?(pf).should be_truthy
+        File.zero?(pf).should_not be_truthy
       end
     end
 
     it 'can not specify an output file' do
       # puts %q{emulate 'tt -o my_bogus_test_parser.rb dumb1 dumb2'}
       pf = 'my_bogus_test_parser.rb'
-      system("ruby -S tt -o #{pf} #{@test_bases.join(' ')} >/dev/null 2>&1").should be_false
-      File.exists?(pf).should be_false
+      system("ruby -S tt -o #{pf} #{@test_bases.join(' ')} >/dev/null 2>&1").should be_falsy
+      File.exists?(pf).should be_falsy
     end
   end
 

data/spec/compiler/zero_or_more_spec.rb

@@ -5,8 +5,6 @@ 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

data/spec/spec_helper.rb

@@ -63,7 +63,7 @@ module Treetop
     def parse_multibyte(input, options = {})
       require 'active_support/all'
 
-      if RUBY_VERSION !~ /^(1\.9|2\.0)/ && 'NONE' == $KCODE then $KCODE = 'UTF8' end
+      if RUBY_VERSION !~ /^(1\.9|2\.)/ && 'NONE' == $KCODE then $KCODE = 'UTF8' end
       # rspec 1.3 used to do something similar (set it to 'u') that we need
       # for activerecord multibyte wrapper to kick in (1.8 only? @todo)
 

data/treetop.gemspec

@@ -2,17 +2,17 @@
 # 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
+# stub: treetop 1.6.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treetop"
-  s.version = "1.5.3"
+  s.version = "1.6.3"
 
   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.date = "2015-06-30"
+  s.description = "A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby"
   s.email = "cliffordheath@gmail.com"
   s.executables = ["tt"]
   s.extra_rdoc_files = [
@@ -34,16 +34,21 @@ Gem::Specification.new do |s|
     "doc/syntactic_recognition.markdown",
     "doc/tt.1",
     "doc/using_in_ruby.markdown",
+    "examples/indented_blocks/indented_blocks.tt",
+    "examples/indented_blocks/indented_blocks_test.rb",
+    "examples/inner_outer.rb",
+    "examples/inner_outer.tt",
     "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",
+    "examples/numerals.rb",
+    "examples/numerals.tt",
     "lib/treetop.rb",
     "lib/treetop/bootstrap_gen_1_metagrammar.rb",
     "lib/treetop/compiler.rb",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: treetop
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Nathan Sobo
 - Clifford Heath
-autorequire: treetop
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyglot
@@ -99,17 +99,17 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '10'
+description: A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby
 email: cliffordheath@gmail.com
 executables:
 - tt
@@ -132,6 +132,10 @@ files:
 - doc/syntactic_recognition.markdown
 - doc/tt.1
 - doc/using_in_ruby.markdown
+- examples/indented_blocks/indented_blocks.tt
+- examples/indented_blocks/indented_blocks_test.rb
+- examples/inner_outer.rb
+- examples/inner_outer.tt
 - examples/lambda_calculus/arithmetic.rb
 - examples/lambda_calculus/arithmetic.treetop
 - examples/lambda_calculus/arithmetic_node_classes.rb
@@ -141,6 +145,8 @@ files:
 - examples/lambda_calculus/lambda_calculus_node_classes.rb
 - examples/lambda_calculus/lambda_calculus_test.rb
 - examples/lambda_calculus/test_helper.rb
+- examples/numerals.rb
+- examples/numerals.tt
 - lib/treetop.rb
 - lib/treetop/bootstrap_gen_1_metagrammar.rb
 - lib/treetop/compiler.rb