kpeg 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abed16806bd433f58dd9911eb8c68f2d50e4a56af15b4e2a7f4eba333727a969
-  data.tar.gz: 28e547321489a71fa5fc8058d9b236123d1e4da143fe6e7d4f437a8f8bd2c27f
+  metadata.gz: d833890a30055ccb0575be00d3ef66bfcb447d3b18f518d2ed3dfb2aa273eec7
+  data.tar.gz: 3e056a615b305db820064549a9a94292aadc19a9af20293f9939ae4305897536
 SHA512:
-  metadata.gz: 96523e0c2694a0f5e5af682e22ecbebf268d40add7dd97e25db90725c686982d220fb77c22962bf21025cbddfe570763c01b3720304a8b57d99508e9eab0d00a
-  data.tar.gz: 94716fa06ffb6e5a9322753ae60de879ad4aab8bdeb854590e9b5a201cb73b35aeec7378a5907b38e8571433586f28c323251a66c274368ce687f4994614b041
+  metadata.gz: 3becd99c88978dd486ecb9db5074ed453f8b953bd29d5a22fb8e112e66b5deb5d2d199b791077e16a10734b6d1de61f3d381ec5461c8e531399df2e2eda75150
+  data.tar.gz: 44a83605de6a673d5cc1ac98017680581d374595a6eb028c08ed09098f433e7d297775b9474dcef8737c1483e0a19b6dac34574423c0a600fc0308cf70e2dab4

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.3.3 / 2023-03-06
+
+* Remove 3rd argument to Regexp.new
+
+=== 1.3.2 / 2022-11-02
+
+* Fix column calculation
+* General improvement in line/column calculation
+
 === 1.3.1 / 2022-01-10
 
 * File.exists? => File.exist?

data/Rakefile

@@ -1,6 +1,12 @@
 # -*- ruby -*-
 
 require 'rubygems'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+end
 
 task :test => :parser
 

data/examples/calculator/calculator.kpeg

@@ -9,7 +9,7 @@ space = " "
 num = < /[1-9][0-9]*/ > { text.to_i }
 
 term = term:t1 - "+" - term:t2 { t1 + t2 }
-     | term:t1 - "-" - termLt2 { t1 - t2 }
+     | term:t1 - "-" - term:t2 { t1 - t2 }
      | fact
 fact = fact:f1 - "*" - fact:f2 { f1 * f2 }
      | fact:f1 - "/" - fact:f2 { f1 / f2 }

data/kpeg.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kpeg"
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.metadata = { "bug_tracker_uri" => "https://github.com/evanphx/kpeg/issues", "homepage_uri" => "https://github.com/evanphx/kpeg" } if s.respond_to? :metadata=

data/lib/kpeg/compiled_parser.rb

@@ -227,6 +227,7 @@ module KPeg
     end
 
     def apply_with_args(rule, *args)
+      @result = nil
       memo_key = [rule, args]
       if m = @memoizations[memo_key][@pos]
         @pos = m.pos
@@ -260,6 +261,7 @@ module KPeg
     end
 
     def apply(rule)
+      @result = nil
       if m = @memoizations[rule][@pos]
         @pos = m.pos
         if !m.set

data/lib/kpeg/format_parser.rb

@@ -277,6 +277,7 @@ class KPeg::FormatParser
     end
 
     def apply_with_args(rule, *args)
+      @result = nil
       memo_key = [rule, args]
       if m = @memoizations[memo_key][@pos]
         @pos = m.pos
@@ -310,6 +311,7 @@ class KPeg::FormatParser
     end
 
     def apply(rule)
+      @result = nil
       if m = @memoizations[rule][@pos]
         @pos = m.pos
         if !m.set

data/lib/kpeg/grammar.rb

@@ -106,20 +106,10 @@ module KPeg
 
       if reg.kind_of? String
         flags = 0
-        lang = nil
 
         if opts
           opts.split("").each do |o|
             case o
-            when "n", "N", "e", "E", "s", "S"
-              lang = o.downcase
-            when "u", "U"
-              if RUBY_VERSION > "1.8.7"
-                # Ruby 1.9 defaults to UTF-8 for string matching
-                lang = ""
-              else
-                lang = "u"
-              end
             when "m"
               flags |= Regexp::MULTILINE
             when "x"
@@ -130,7 +120,7 @@ module KPeg
           end
         end
 
-        @regexp = Regexp.new(reg, flags, lang)
+        @regexp = Regexp.new(reg, flags)
       else
         @regexp = reg
       end

data/lib/kpeg/string_escape.rb

@@ -285,6 +285,7 @@ class KPeg::StringEscape
     end
 
     def apply_with_args(rule, *args)
+      @result = nil
       memo_key = [rule, args]
       if m = @memoizations[memo_key][@pos]
         @pos = m.pos
@@ -318,6 +319,7 @@ class KPeg::StringEscape
     end
 
     def apply(rule)
+      @result = nil
       if m = @memoizations[rule][@pos]
         @pos = m.pos
         if !m.set

data/test/test_kpeg_compiled_parser.rb

@@ -20,6 +20,15 @@ class TestKPegCompiledParser < Minitest::Test
 
   KPeg.compile gram, "CompTestParser", self
 
+  gram = <<-GRAM
+  letter = < [a-z] > { text }
+  number = [0-9]
+  n_or_l = letter | number
+  root = letter:l n_or_l*:n { [l, n] }
+  GRAM
+
+  KPeg.compile gram, "ProdTestParser", self
+
   def test_current_column
     r = TestParser.new "hello\nsir\nand goodbye"
     assert_equal 1, r.current_column(0)
@@ -116,4 +125,52 @@ class TestKPegCompiledParser < Minitest::Test
     assert_equal expected, r.failure_oneline
   end
 
+  def test_producing_parser_one_product
+    r = ProdTestParser.new "a"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", []], r.result
+  end
+
+  def test_producing_parser_two_products
+    r = ProdTestParser.new "ab"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", ["b"]], r.result
+  end
+
+  def test_producing_parser_three_products
+    r = ProdTestParser.new "abc"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", ["b", "c"]], r.result
+  end
+
+  def test_producing_parser_product_and_nil
+    r = ProdTestParser.new "a1"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", [nil]], r.result
+  end
+
+  def test_producing_parser_product_and_nil2
+    r = ProdTestParser.new "a1b"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", [nil, "b"]], r.result
+  end
+
+  def test_producing_parser_product_and_nil3
+    r = ProdTestParser.new "ab1"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", ["b", nil]], r.result
+  end
+
+  def test_producing_parser_product_and_nil4
+    r = ProdTestParser.new "a12"
+    assert r.parse, "should parse"
+
+    assert_equal ["a", [nil, nil]], r.result
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kpeg
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Evan Phoenix