kpeg 0.8.4 → 0.8.5

data/lib/kpeg/compiled_parser.rb

@@ -170,12 +170,16 @@ module KPeg
     end
 
     def parse(rule=nil)
+      # We invoke the rules indirectly via apply
+      # instead of by just calling them as methods because
+      # if the rules use left recursion, apply needs to
+      # manage that.
+
       if !rule
-        _root ? true : false
+        apply(:_root)
       else
-        # This is not shared with code_generator.rb so this can be standalone
         method = rule.gsub("-","_hyphen_")
-        __send__("_#{method}") ? true : false
+        apply :"_#{method}"
       end
     end
 

data/lib/kpeg/version.rb

@@ -1,3 +1,3 @@
 module KPeg
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/test/test_left_recursion.rb

@@ -0,0 +1,50 @@
+require 'test/unit'
+require 'kpeg'
+require 'kpeg/format_parser'
+require 'kpeg/code_generator'
+require 'stringio'
+
+class TestKPegLeftRecursion < Test::Unit::TestCase
+  GRAMMAR = <<-'STR'
+
+  name = name:n "[]" { [:array, n] }
+       | < /\w+/ > { [:word, text] }
+
+  root = name
+
+  STR
+
+  def test_invoke_rule_directly
+    parc = KPeg::FormatParser.new(GRAMMAR)
+    assert parc.parse, "Unable to parse"
+
+    gram = parc.grammar
+
+    # gr = KPeg::GrammarRenderer.new(gram)
+    # puts
+    # gr.render(STDOUT)
+
+    cg = KPeg::CodeGenerator.new "TestCalc", gram
+
+    code = cg.make("blah[]")
+    assert_equal true, code.parse("name")
+    assert_equal [:array, [:word, "blah"]], code.result
+  end
+
+  def test_invoke_rule_via_another
+    parc = KPeg::FormatParser.new(GRAMMAR)
+    assert parc.parse, "Unable to parse"
+
+    gram = parc.grammar
+
+    # gr = KPeg::GrammarRenderer.new(gram)
+    # puts
+    # gr.render(STDOUT)
+
+    cg = KPeg::CodeGenerator.new "TestCalc", gram
+
+    code = cg.make("blah[]")
+    assert_equal true, code.parse("root")
+    assert_equal [:array, [:word, "blah"]], code.result
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kpeg
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 Z
+date: 2012-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -66,6 +66,7 @@ files:
 - test/test_kpeg_compiled_parser.rb
 - test/test_kpeg_format.rb
 - test/test_kpeg_grammar_renderer.rb
+- test/test_left_recursion.rb
 homepage: https://github.com/evanphx/kpeg
 licenses: []
 
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Peg-based Code Generator
@@ -107,3 +108,4 @@ test_files:
 - test/test_kpeg_compiled_parser.rb
 - test/test_kpeg_format.rb
 - test/test_kpeg_grammar_renderer.rb
+- test/test_left_recursion.rb