kpeg 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8addf56b471f186a44651884101f4159a94927b8c27d5c5eaed867388797fb49
-  data.tar.gz: cb1c89881fc980f4fd1bedd485a6f4cc0ac2e8aa9df8ffeb9690b9839be6b8be
+  metadata.gz: 80dd9b2ed08c2a2ccc37ad658fe0f14864dc5ad8ef4e36d108a243a68a4baa5f
+  data.tar.gz: 5dec03b1e86a4ff5d0d10ed7818d561b12c6c71022eed7de16786d0a90160de9
 SHA512:
-  metadata.gz: 7207c6d8774c8eec993b962306df6fd529ae7910b279e98dda4f4d2000c4c2dd5183ca5d1ee28ba377fa4664d4b5c417c283fd539cf1b8c80db3ff9f6d66be1b
-  data.tar.gz: c6980f3355fb4a64cb49ae29ab050e09039074aea8720fab12000e6ce7716749276f4d4cf3a5831982e263de7b3c25c22f5850d4edc4fb06e5468be75943e41c
+  metadata.gz: bb96b6bcd8c7f92a6c11355d4022c95a285cf75872b5608fbb6fdc47233c342b42d3a91da524f6fb1678ae78d54109300e1607d7940ae5462c9282757d1bdc25
+  data.tar.gz: 9f7e844e84c119ce755e95a4034fcd67c251f90e2f4623a34bdba6f94e568f34adbb92011f96b1efe55b02be4a3191be6414c12aed93e083d705d82d27b95c4f

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.3.0 / 2021-10-20
+
+* Fix current_line calculation
+
+=== 1.2.0 / 2021-10-20
+
+* Speed up current_line
 === 1.2.0 / 2021-10-20
 
 * Speed up current_line

data/lib/kpeg/format_parser.rb

@@ -30,16 +30,15 @@ class KPeg::FormatParser
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
         unless @line_offsets
-          @line_offsets = [-1]
+          @line_offsets = []
           total = 0
           string.each_line do |line|
-            @line_offsets << total
             total += line.size
+            @line_offsets << total
           end
-          @line_offsets << total
         end
 
-        @line_offsets.bsearch_index {|x| x >= target } || -1
+        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
       end
     else
       def current_line(target=pos)

data/lib/kpeg/position.rb

@@ -13,16 +13,15 @@ module KPeg
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
         unless @line_offsets
-          @line_offsets = [-1]
+          @line_offsets = []
           total = 0
           string.each_line do |line|
-            @line_offsets << total
             total += line.size
+            @line_offsets << total
           end
-          @line_offsets << total
         end
 
-        @line_offsets.bsearch_index {|x| x >= target } || -1
+        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
       end
     else
       def current_line(target=pos)

data/lib/kpeg/string_escape.rb

@@ -38,16 +38,15 @@ class KPeg::StringEscape
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
         unless @line_offsets
-          @line_offsets = [-1]
+          @line_offsets = []
           total = 0
           string.each_line do |line|
-            @line_offsets << total
             total += line.size
+            @line_offsets << total
           end
-          @line_offsets << total
         end
 
-        @line_offsets.bsearch_index {|x| x >= target } || -1
+        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
       end
     else
       def current_line(target=pos)

data/lib/kpeg.rb

@@ -1,6 +1,6 @@
 module KPeg
 
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 
   def self.grammar
     g = Grammar.new

data/test/test_kpeg_compiled_parser.rb

@@ -7,6 +7,7 @@ class TestKPegCompiledParser < Minitest::Test
 
   gram = <<-GRAM
   letter = [a-z]
+  number = [0-9]
   root = letter
   GRAM
 
@@ -14,7 +15,7 @@ class TestKPegCompiledParser < Minitest::Test
 
   gram = <<-GRAM
   %test = TestKPegCompiledParser::TestParser
-  root = %test.letter "!"
+  root = %test.letter %test.number? "!"
   GRAM
 
   KPeg.compile gram, "CompTestParser", self
@@ -78,4 +79,12 @@ class TestKPegCompiledParser < Minitest::Test
     assert_equal expected, r.failure_oneline
   end
 
+  def test_composite_two_char_error
+    r = CompTestParser.new "aa"
+    assert_nil r.parse, "should not parse"
+
+    expected = "@1:2 failed rule 'TestKPegCompiledParser::TestParser#_number', got 'a'"
+    assert_equal expected, r.failure_oneline
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpeg
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest