kpeg 0.8.1 → 0.8.2

data/lib/kpeg/grammar.rb

@@ -604,6 +604,28 @@ module KPeg
     end
   end
 
+  class Bounds < Operator
+    def initialize(op)
+      super()
+      @op = op
+    end
+
+    attr_reader :op
+
+    def ==(obj)
+      case obj
+      when Bounds
+        @op == obj.op
+      else
+        super
+      end
+    end
+
+    def inspect
+      inspect_type "bounds", @op.inspect
+    end
+  end
+
   class Grammar
     def initialize
       @rules = {}
@@ -818,6 +840,10 @@ module KPeg
     def collect(op)
       Collect.new Grammar.resolve(op)
     end
+
+    def bounds(op)
+      Bounds.new Grammar.resolve(op)
+    end
   end
 
 

data/lib/kpeg/grammar_renderer.rb

@@ -163,6 +163,10 @@ module KPeg
         io.print "< "
         render_op io, op.op
         io.print " >"
+      when Bounds
+        io.print "@< "
+        render_op io, op.op
+        io.print " >"
       else
         raise "Unknown op type - #{op.class}"
       end

data/lib/kpeg/version.rb

@@ -1,3 +1,3 @@
 module KPeg
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/test/test_kpeg_code_generator.rb

@@ -1301,6 +1301,56 @@ end
     assert_equal "hello", code.result
   end
 
+  def test_bounds
+    gram = KPeg.grammar do |g|
+      g.root = g.seq(g.bounds("hello"), g.action(" bounds "))
+    end
+
+    str = <<-STR
+require 'kpeg/compiled_parser'
+
+class Test < KPeg::CompiledParser
+
+  # root = @< "hello" > { bounds }
+  def _root
+
+    _save = self.pos
+    while true # sequence
+      _bounds_start = self.pos
+      _tmp = match_string("hello")
+      if _tmp
+        bounds = [_bounds_start, self.pos]
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  bounds ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_root unless _tmp
+    return _tmp
+  end
+
+  Rules = {}
+  Rules[:_root] = rule_info("root", "@< \\\"hello\\\" > { bounds }")
+end
+    STR
+
+    cg = KPeg::CodeGenerator.new "Test", gram
+
+    assert_equal str, cg.output
+
+    code = cg.make("hello")
+    assert code.parse
+    assert_equal [0,5], code.result
+  end
+
   def test_parse_error
     gram = KPeg.grammar do |g|
       g.world = "world"

data/test/test_kpeg_format.rb

@@ -95,6 +95,17 @@ b(p) = x
     assert_equal "(1)", rule.op.arguments
   end
 
+  def test_invoke_with_double_quoted_strings
+    m = match "a=b(\")\")"
+    assert_equal "(\")\")", m.find("a").op.arguments
+  end
+
+  def test_invoke_with_single_quoted_strings
+    m = match "a=b(')')"
+    assert_equal "(')')", m.find("a").op.arguments
+  end
+
+
   def test_invoke_with_multiple_args
     assert_rule G.invoke("b", "(1,2)"), match("a=b(1,2)"), "a"
   end
@@ -348,6 +359,11 @@ Value   = NUMBER:i                      { i }
     assert_rule G.collect(G.seq(:b, :c)), m
   end
 
+  def test_bounds
+    m = match 'a = @< b c >'
+    assert_rule G.bounds(G.seq(:b, :c)), m
+  end
+
   def test_comment
     m = match "a=b # this is a comment\n"
     assert_rule G.ref('b'), m

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kpeg
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -07:00
+date: 2011-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency