treetop 1.6.3 → 1.6.4

data/spec/compiler/grammar_compiler_spec.rb

@@ -40,7 +40,7 @@ describe Compiler::GrammarCompiler do
   end
 
   specify "compilation of a single file to an explicit file name" do
-    File.exists?(alternate_target_path).should be_falsy
+    File.exists?(alternate_target_path).should be_falsey
     compiler.compile(source_path_with_treetop_extension, alternate_target_path)
     File.exists?(alternate_target_path).should be_truthy
     require alternate_target_path

data/spec/compiler/parenthesized_expression_spec.rb

@@ -19,4 +19,16 @@ 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|
+	skip "Arbitrarily nested modules are not yet compiled"
+	result.should respond_to(:inner)
+	result.should respond_to(:outer)
+      end
+    end
+  end
+
 end

data/spec/compiler/terminal_spec.rb

@@ -169,9 +169,9 @@ module TerminalSymbolSpec
 #
 #    it "returns true upon parsing matching input prefixes at various indices" do
 #      pending "transient terminal expressions"
-#      parse("foo", :index => 0).should be_true
-#      parse("-foo", :index => 1).should be_true
-#      parse("---foo", :index => 3).should be_true
+#      parse("foo", :index => 0).should be_truthy
+#      parse("-foo", :index => 1).should be_truthy
+#      parse("---foo", :index => 3).should be_truthy
 #    end
 #  end
 end

data/spec/compiler/tt_compiler_spec.rb

@@ -72,7 +72,7 @@ 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_falsy
+      File.exists?("#{@test_base}.rb").should be_falsey
     end
 
     it 'can compile to a specified parser source file' do
@@ -216,8 +216,8 @@ describe "The 'tt' comand line compiler" do
     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_falsy
-      File.exists?(pf).should be_falsy
+      system("ruby -S tt -o #{pf} #{@test_bases.join(' ')} >/dev/null 2>&1").should be_falsey
+      File.exists?(pf).should be_falsey
     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

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.3 ruby lib
+# stub: treetop 1.6.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treetop"
-  s.version = "1.6.3"
+  s.version = "1.6.4"
 
   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 = "2015-06-30"
+  s.date = "2016-02-21"
   s.description = "A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby"
   s.email = "cliffordheath@gmail.com"
   s.executables = ["tt"]
@@ -36,8 +36,6 @@ Gem::Specification.new do |s|
     "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",
@@ -47,8 +45,6 @@ Gem::Specification.new do |s|
     "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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treetop
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Nathan Sobo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyglot
@@ -134,8 +134,6 @@ files:
 - 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
@@ -145,8 +143,6 @@ 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

data/examples/inner_outer.rb

@@ -1,51 +0,0 @@
-# Autogenerated from a Treetop grammar. Edits may be lost.
-
-
-module InnerOuter
-  include Treetop::Runtime
-
-  def root
-    @root ||= :inner_outer
-  end
-
-  module InnerOuter0
-	def inner
-	end
-  end
-
-  module InnerOuter1
-    def outer
-    end
-  end
-
-  def _nt_inner_outer
-    start_index = index
-    if node_cache[:inner_outer].has_key?(index)
-      cached = node_cache[:inner_outer][index]
-      if cached
-        node_cache[:inner_outer][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    if (match_len = has_terminal?("foo", false, index))
-      r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-      r0.extend(InnerOuter0)
-      @index += match_len
-    else
-      terminal_parse_failure('"foo"')
-      r0 = nil
-    end
-
-    node_cache[:inner_outer][start_index] = r0
-
-    r0
-  end
-
-end
-
-class InnerOuterParser < Treetop::Runtime::CompiledParser
-  include InnerOuter
-end
-

data/examples/inner_outer.tt

@@ -1,14 +0,0 @@
-grammar InnerOuter
-  rule inner_outer
-    ( "foo"
-      {
-	def inner
-	end
-      }
-    )
-    {
-      def outer
-      end
-    } 
-  end
-end

data/examples/numerals.rb

@@ -1,210 +0,0 @@
-# Autogenerated from a Treetop grammar. Edits may be lost.
-
-
-module Numerals
-  include Treetop::Runtime
-
-  def root
-    @root ||= :percentage
-  end
-
-  module Percentage0
-    def decimal
-      elements[0]
-    end
-
-  end
-
-  module Percentage1
-    def to_f
-      decimal.to_f / 100
-    end
-  end
-
-  def _nt_percentage
-    start_index = index
-    if node_cache[:percentage].has_key?(index)
-      cached = node_cache[:percentage][index]
-      if cached
-        node_cache[:percentage][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_decimal
-    s0 << r1
-    if r1
-      if (match_len = has_terminal?("%", false, index))
-        r2 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"%"')
-        r2 = nil
-      end
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Percentage0)
-      r0.extend(Percentage1)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:percentage][start_index] = r0
-
-    r0
-  end
-
-  module Decimal0
-    def sign
-      elements[0]
-    end
-
-  end
-
-  module Decimal1
-    def to_f
-      text_value.to_f
-    end
-  end
-
-  def _nt_decimal
-    start_index = index
-    if node_cache[:decimal].has_key?(index)
-      cached = node_cache[:decimal][index]
-      if cached
-        node_cache[:decimal][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_sign
-    s0 << r1
-    if r1
-      s2, i2 = [], index
-      loop do
-        if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
-          r3 = true
-          @index += 1
-        else
-          terminal_parse_failure('[0-9]')
-          r3 = nil
-        end
-        if r3
-          s2 << r3
-        else
-          break
-        end
-      end
-      if s2.empty?
-        @index = i2
-        r2 = nil
-      else
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-      end
-      s0 << r2
-      if r2
-        if (match_len = has_terminal?('.', false, index))
-          r4 = true
-          @index += match_len
-        else
-          terminal_parse_failure('\'.\'')
-          r4 = nil
-        end
-        s0 << r4
-        if r4
-          s5, i5 = [], index
-          loop do
-            if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
-              r6 = true
-              @index += 1
-            else
-              terminal_parse_failure('[0-9]')
-              r6 = nil
-            end
-            if r6
-              s5 << r6
-            else
-              break
-            end
-          end
-          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          s0 << r5
-        end
-      end
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Decimal0)
-      r0.extend(Decimal1)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:decimal][start_index] = r0
-
-    r0
-  end
-
-  def _nt_sign
-    start_index = index
-    if node_cache[:sign].has_key?(index)
-      cached = node_cache[:sign][index]
-      if cached
-        node_cache[:sign][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i1 = index
-    if (match_len = has_terminal?('+', false, index))
-      r2 = true
-      @index += match_len
-    else
-      terminal_parse_failure('\'+\'')
-      r2 = nil
-    end
-    if r2
-      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-      r1 = r2
-    else
-      if (match_len = has_terminal?('-', false, index))
-        r3 = true
-        @index += match_len
-      else
-        terminal_parse_failure('\'-\'')
-        r3 = nil
-      end
-      if r3
-        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-        r1 = r3
-      else
-        @index = i1
-        r1 = nil
-      end
-    end
-    if r1
-      r0 = r1
-    else
-      r0 = instantiate_node(SyntaxNode,input, index...index)
-    end
-
-    node_cache[:sign][start_index] = r0
-
-    r0
-  end
-
-end
-
-class NumeralsParser < Treetop::Runtime::CompiledParser
-  include Numerals
-end
-

data/examples/numerals.tt

@@ -1,21 +0,0 @@
-grammar Numerals
-  rule percentage
-    (decimal "%") {
-      def to_f
-        decimal.to_f / 100
-      end
-    }
-  end
-
-  rule decimal
-    sign [0-9]+ '.' [0-9]* {
-      def to_f
-        text_value.to_f
-      end
-    }
-  end
-
-  rule sign
-    ('+'/'-')? 
-  end
-end