kpeg 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69daab2a8357318c67653138ac1279d035305af374c0840164b535d3110a9a34
-  data.tar.gz: 703023a2c28f68a26cf1b84255e4aede05880eb6356ced93ec244bad471f05f7
+  metadata.gz: d833890a30055ccb0575be00d3ef66bfcb447d3b18f518d2ed3dfb2aa273eec7
+  data.tar.gz: 3e056a615b305db820064549a9a94292aadc19a9af20293f9939ae4305897536
 SHA512:
-  metadata.gz: f98d1334465ea3728004aea43b5abe33d8deae27c4100beaa091a87292ac0197a4580207b3036da616054d5dab8f931621597fc6c2294698eb32842be37e5458
-  data.tar.gz: acbd264cfd9de363de5eac6107baa58ef43535b5a071fee6da11ff2b33cdd6c2a378664b137b9bb359504b12b0e2f2060fca8cfde53d8196309c68f3132e6e0f
+  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,18 +1,11 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+require 'rake/testtask'
 
-Hoe.plugin :gemspec
-Hoe.plugin :git
-Hoe.plugin :minitest
-Hoe.plugin :travis
-
-Hoe.spec 'kpeg' do
-  self.readme_file = "README.rdoc"
-  developer 'Evan Phoenix', 'evan@fallingsnow.net'
-
-  dependency 'minitest', '~> 5.0', :dev
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
 end
 
 task :test => :parser
@@ -39,9 +32,14 @@ PARSER_FILES.map do |parser_file|
   file parser_file => 'lib/kpeg/compiled_parser.rb'
   file parser_file => 'lib/kpeg/code_generator.rb'
   file parser_file => 'lib/kpeg/position.rb'
+  file parser_file => parser_file.sub(/\.rb$/, '.kpeg')
 end
 
 desc "build the parser"
 task :parser => PARSER_FILES
 
+task :gem do
+  sh "gem build"
+end
+
 # vim: syntax=ruby

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

@@ -1,42 +1,36 @@
 # -*- encoding: utf-8 -*-
-# stub: kpeg 1.0.0.20140103162640 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kpeg"
-  s.version = "1.0.0.20140103162640"
+  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=
+  s.require_paths = ["lib"]
   s.authors = ["Evan Phoenix"]
-  s.date = "2014-01-04"
+  s.date = "2022-11-02"
   s.description = "KPeg is a simple PEG library for Ruby. It provides an API as well as native\ngrammar to build the grammar.\n\nKPeg strives to provide a simple, powerful API without being too exotic.\n\nKPeg supports direct left recursion of rules via the\n{OMeta memoization}[http://www.vpri.org/pdf/tr2008003_experimenting.pdf] trick."
   s.email = ["evan@fallingsnow.net"]
   s.executables = ["kpeg"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "examples/phone_number/README.md", "examples/upper/README.md"]
-  s.files = [".autotest", ".travis.yml", "History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "bin/kpeg", "examples/calculator/calculator.kpeg", "examples/calculator/calculator.rb", "examples/foreign_reference/literals.kpeg", "examples/foreign_reference/matcher.kpeg", "examples/foreign_reference/matcher.rb", "examples/lua_string/driver.rb", "examples/lua_string/lua_string.kpeg", "examples/lua_string/lua_string.kpeg.rb", "examples/phone_number/README.md", "examples/phone_number/phone_number.kpeg", "examples/phone_number/phone_number.rb", "examples/upper/README.md", "examples/upper/upper.kpeg", "examples/upper/upper.rb", "kpeg.gemspec", "lib/hoe/kpeg.rb", "lib/kpeg.rb", "lib/kpeg/code_generator.rb", "lib/kpeg/compiled_parser.rb", "lib/kpeg/format_parser.kpeg", "lib/kpeg/format_parser.rb", "lib/kpeg/grammar.rb", "lib/kpeg/grammar_renderer.rb", "lib/kpeg/match.rb", "lib/kpeg/parser.rb", "lib/kpeg/position.rb", "lib/kpeg/string_escape.kpeg", "lib/kpeg/string_escape.rb", "test/inputs/comments.kpeg", "test/test_kpeg.rb", "test/test_kpeg_code_generator.rb", "test/test_kpeg_compiled_parser.rb", "test/test_kpeg_format.rb", "test/test_kpeg_format_parser_round_trip.rb", "test/test_kpeg_grammar.rb", "test/test_kpeg_grammar_renderer.rb", "vim/syntax_kpeg/ftdetect/kpeg.vim", "vim/syntax_kpeg/syntax/kpeg.vim", "test/test_kpeg_string_escape.rb", ".gemtest"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "examples/phone_number/README.md", "examples/tiny_markdown/sample.md", "examples/upper/README.md"]
+  s.files = [".autotest", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "bin/kpeg", "examples/calculator/calculator.kpeg", "examples/calculator/calculator.rb", "examples/foreign_reference/literals.kpeg", "examples/foreign_reference/matcher.kpeg", "examples/foreign_reference/matcher.rb", "examples/lua_string/driver.rb", "examples/lua_string/lua_string.kpeg", "examples/lua_string/lua_string.kpeg.rb", "examples/phone_number/README.md", "examples/phone_number/phone_number.kpeg", "examples/phone_number/phone_number.rb", "examples/tiny_markdown/Rakefile", "examples/tiny_markdown/driver.rb", "examples/tiny_markdown/node.rb", "examples/tiny_markdown/sample.md", "examples/tiny_markdown/tiny_markdown.kpeg", "examples/tiny_markdown/tiny_markdown.kpeg.rb", "examples/upper/README.md", "examples/upper/upper.kpeg", "examples/upper/upper.rb", "kpeg.gemspec", "lib/hoe/kpeg.rb", "lib/kpeg.rb", "lib/kpeg/code_generator.rb", "lib/kpeg/compiled_parser.rb", "lib/kpeg/format_parser.kpeg", "lib/kpeg/format_parser.rb", "lib/kpeg/grammar.rb", "lib/kpeg/grammar_renderer.rb", "lib/kpeg/match.rb", "lib/kpeg/parser.rb", "lib/kpeg/position.rb", "lib/kpeg/string_escape.kpeg", "lib/kpeg/string_escape.rb", "test/inputs/comments.kpeg", "test/test_kpeg.rb", "test/test_kpeg_code_generator.rb", "test/test_kpeg_compiled_parser.rb", "test/test_kpeg_format.rb", "test/test_kpeg_format_parser_round_trip.rb", "test/test_kpeg_grammar.rb", "test/test_kpeg_grammar_renderer.rb", "test/test_kpeg_string_escape.rb", "vim/syntax_kpeg/ftdetect/kpeg.vim", "vim/syntax_kpeg/syntax/kpeg.vim"]
   s.homepage = "https://github.com/evanphx/kpeg"
-  s.licenses = ["MIT"]
+  s.licenses = ["BSD-3-Clause"]
   s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "kpeg"
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "3.3.7"
   s.summary = "KPeg is a simple PEG library for Ruby"
-  s.test_files = ["test/test_kpeg.rb", "test/test_kpeg_code_generator.rb", "test/test_kpeg_compiled_parser.rb", "test/test_kpeg_format.rb", "test/test_kpeg_format_parser_round_trip.rb", "test/test_kpeg_grammar.rb", "test/test_kpeg_grammar_renderer.rb", "test/test_kpeg_string_escape.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.2"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.7"])
-    else
-      s.add_dependency(%q<minitest>, ["~> 5.2"])
-      s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.7"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<minitest>, ["~> 5.16"])
+    s.add_development_dependency(%q<rdoc>, [">= 4.0", "< 7"])
+    s.add_development_dependency(%q<rake>, [">= 0.8", "< 15.0"])
   else
-    s.add_dependency(%q<minitest>, ["~> 5.2"])
-    s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.7"])
+    s.add_dependency(%q<minitest>, ["~> 5.16"])
+    s.add_dependency(%q<rdoc>, [">= 4.0", "< 7"])
+    s.add_dependency(%q<rake>, [">= 0.8", "< 15.0"])
   end
 end

data/lib/kpeg/compiled_parser.rb

@@ -52,6 +52,7 @@ module KPeg
       @string = string
       @string_size = string ? string.size : 0
       @pos = pos
+      @position_line_offsets = nil
     end
 
     def show_pos
@@ -76,30 +77,22 @@ module KPeg
     end
 
     def failure_caret
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      line = lines[l-1]
-      "#{line}\n#{' ' * (c - 1)}^"
+      p = current_pos_info @failing_rule_offset
+      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
     end
 
     def failure_character
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-      lines[l-1][c-1, 1]
+      current_character @failing_rule_offset
     end
 
     def failure_oneline
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      char = lines[l-1][c-1, 1]
+      p = current_pos_info @failing_rule_offset
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
-        "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
       else
-        "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
       end
     end
 
@@ -112,10 +105,9 @@ module KPeg
 
     def show_error(io=STDOUT)
       error_pos = @failing_rule_offset
-      line_no = current_line(error_pos)
-      col_no = current_column(error_pos)
+      p = current_pos_info(error_pos)
 
-      io.puts "On line #{line_no}, column #{col_no}:"
+      io.puts "On line #{p.lno}, column #{p.col}:"
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
@@ -124,10 +116,9 @@ module KPeg
         io.puts "Failed to match rule '#{@failed_rule}'"
       end
 
-      io.puts "Got: #{string[error_pos,1].inspect}"
-      line = lines[line_no-1]
-      io.puts "=> #{line}"
-      io.print(" " * (col_no + 3))
+      io.puts "Got: #{p.char.inspect}"
+      io.puts "=> #{p.line}"
+      io.print(" " * (p.col + 2))
       io.puts "^"
     end
 
@@ -236,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
@@ -269,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.kpeg

@@ -53,7 +53,7 @@ require 'kpeg/grammar'
                  | "x" < /[a-f\d]{2}/i > { [text.to_i(16)].pack("U") }
                  # TODO use /\h{2}/ after 1.8 support is dropped
          dbl_seq = < /[^\\"]+/ > { text }
-   dbl_not_quote = ("\\" dbl_escapes:s | dbl_seq:s)*:ary { Array(ary) }
+   dbl_not_quote = ("\\" dbl_escapes | dbl_seq)*:ary { Array(ary) }
       dbl_string = "\"" dbl_not_quote:s "\"" { @g.str(s.join) }
 sgl_escape_quote = "\\'" { "'" }
          sgl_seq = < /[^']/ > { text }

data/lib/kpeg/format_parser.rb

@@ -20,45 +20,75 @@ class KPeg::FormatParser
     attr_accessor :result, :pos
 
     def current_column(target=pos)
-      if c = string.rindex("\n", target-1)
-        return target - c - 1
+      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
+        return target - c
+      elsif c = string.rindex("\n", target)
+        return target - c
       end
 
       target + 1
     end
 
+    def position_line_offsets
+      unless @position_line_offsets
+        @position_line_offsets = []
+        total = 0
+        string.each_line do |line|
+          total += line.size
+          @position_line_offsets << total
+        end
+      end
+      @position_line_offsets
+    end
+
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
-        unless @line_offsets
-          @line_offsets = []
-          total = 0
-          string.each_line do |line|
-            total += line.size
-            @line_offsets << total
-          end
+        if line = position_line_offsets.bsearch_index {|x| x > target }
+          return line + 1
         end
-
-        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
+        raise "Target position #{target} is outside of string"
       end
     else
       def current_line(target=pos)
-        cur_offset = 0
-        cur_line = 0
-
-        string.each_line do |line|
-          cur_line += 1
-          cur_offset += line.size
-          return cur_line if cur_offset >= target
+        if line = position_line_offsets.index {|x| x > target }
+          return line + 1
         end
 
-        -1
+        raise "Target position #{target} is outside of string"
       end
     end
 
+    def current_character(target=pos)
+      if target < 0 || target >= string.size
+        raise "Target position #{target} is outside of string"
+      end
+      string[target, 1]
+    end
+
+    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
+
+    def current_pos_info(target=pos)
+      l = current_line target
+      c = current_column target
+      ln = get_line(l-1)
+      chr = string[target,1]
+      KpegPosInfo.new(target, l, c, ln, chr)
+    end
+
     def lines
-      lines = []
-      string.each_line { |l| lines << l }
-      lines
+      string.lines
+    end
+
+    def get_line(no)
+      loff = position_line_offsets
+      if no < 0
+        raise "Line No is out of range: #{no} < 0"
+      elsif no >= loff.size
+        raise "Line No is out of range: #{no} >= #{loff.size}"
+      end
+      lend = loff[no]-1
+      lstart = no > 0 ? loff[no-1] : 0
+      string[lstart..lend]
     end
 
 
@@ -72,6 +102,7 @@ class KPeg::FormatParser
       @string = string
       @string_size = string ? string.size : 0
       @pos = pos
+      @position_line_offsets = nil
     end
 
     def show_pos
@@ -96,30 +127,22 @@ class KPeg::FormatParser
     end
 
     def failure_caret
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      line = lines[l-1]
-      "#{line}\n#{' ' * (c - 1)}^"
+      p = current_pos_info @failing_rule_offset
+      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
     end
 
     def failure_character
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-      lines[l-1][c-1, 1]
+      current_character @failing_rule_offset
     end
 
     def failure_oneline
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      char = lines[l-1][c-1, 1]
+      p = current_pos_info @failing_rule_offset
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
-        "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
       else
-        "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
       end
     end
 
@@ -132,10 +155,9 @@ class KPeg::FormatParser
 
     def show_error(io=STDOUT)
       error_pos = @failing_rule_offset
-      line_no = current_line(error_pos)
-      col_no = current_column(error_pos)
+      p = current_pos_info(error_pos)
 
-      io.puts "On line #{line_no}, column #{col_no}:"
+      io.puts "On line #{p.lno}, column #{p.col}:"
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
@@ -144,10 +166,9 @@ class KPeg::FormatParser
         io.puts "Failed to match rule '#{@failed_rule}'"
       end
 
-      io.puts "Got: #{string[error_pos,1].inspect}"
-      line = lines[line_no-1]
-      io.puts "=> #{line}"
-      io.print(" " * (col_no + 3))
+      io.puts "Got: #{p.char.inspect}"
+      io.puts "=> #{p.line}"
+      io.print(" " * (p.col + 2))
       io.puts "^"
     end
 
@@ -256,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
@@ -289,6 +311,7 @@ class KPeg::FormatParser
     end
 
     def apply(rule)
+      @result = nil
       if m = @memoizations[rule][@pos]
         @pos = m.pos
         if !m.set
@@ -910,7 +933,7 @@ class KPeg::FormatParser
     return _tmp
   end
 
-  # dbl_not_quote = ("\\" dbl_escapes:s | dbl_seq:s)*:ary { Array(ary) }
+  # dbl_not_quote = ("\\" dbl_escapes | dbl_seq)*:ary { Array(ary) }
   def _dbl_not_quote
 
     _save = self.pos
@@ -929,7 +952,6 @@ class KPeg::FormatParser
               break
             end
             _tmp = apply(:_dbl_escapes)
-            s = @result
             unless _tmp
               self.pos = _save3
             end
@@ -939,7 +961,6 @@ class KPeg::FormatParser
           break if _tmp
           self.pos = _save2
           _tmp = apply(:_dbl_seq)
-          s = @result
           break if _tmp
           self.pos = _save2
           break
@@ -3158,7 +3179,7 @@ class KPeg::FormatParser
   Rules[:_dbl_escapes] = rule_info("dbl_escapes", "(\"n\" { \"\\n\" } | \"s\" { \" \" } | \"r\" { \"\\r\" } | \"t\" { \"\\t\" } | \"v\" { \"\\v\" } | \"f\" { \"\\f\" } | \"b\" { \"\\b\" } | \"a\" { \"\\a\" } | \"e\" { \"\\e\" } | \"\\\\\" { \"\\\\\" } | \"\\\"\" { \"\\\"\" } | num_escapes | < . > { text })")
   Rules[:_num_escapes] = rule_info("num_escapes", "(< /[0-7]{1,3}/ > { [text.to_i(8)].pack(\"U\") } | \"x\" < /[a-f\\d]{2}/i > { [text.to_i(16)].pack(\"U\") })")
   Rules[:_dbl_seq] = rule_info("dbl_seq", "< /[^\\\\\"]+/ > { text }")
-  Rules[:_dbl_not_quote] = rule_info("dbl_not_quote", "(\"\\\\\" dbl_escapes:s | dbl_seq:s)*:ary { Array(ary) }")
+  Rules[:_dbl_not_quote] = rule_info("dbl_not_quote", "(\"\\\\\" dbl_escapes | dbl_seq)*:ary { Array(ary) }")
   Rules[:_dbl_string] = rule_info("dbl_string", "\"\\\"\" dbl_not_quote:s \"\\\"\" { @g.str(s.join) }")
   Rules[:_sgl_escape_quote] = rule_info("sgl_escape_quote", "\"\\\\'\" { \"'\" }")
   Rules[:_sgl_seq] = rule_info("sgl_seq", "< /[^']/ > { text }")

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/position.rb

@@ -3,45 +3,75 @@ module KPeg
     # STANDALONE START
 
     def current_column(target=pos)
-      if c = string.rindex("\n", target-1)
-        return target - c - 1
+      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
+        return target - c
+      elsif c = string.rindex("\n", target)
+        return target - c
       end
 
       target + 1
     end
 
+    def position_line_offsets
+      unless @position_line_offsets
+        @position_line_offsets = []
+        total = 0
+        string.each_line do |line|
+          total += line.size
+          @position_line_offsets << total
+        end
+      end
+      @position_line_offsets
+    end
+
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
-        unless @line_offsets
-          @line_offsets = []
-          total = 0
-          string.each_line do |line|
-            total += line.size
-            @line_offsets << total
-          end
+        if line = position_line_offsets.bsearch_index {|x| x > target }
+          return line + 1
         end
-
-        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
+        raise "Target position #{target} is outside of string"
       end
     else
       def current_line(target=pos)
-        cur_offset = 0
-        cur_line = 0
-
-        string.each_line do |line|
-          cur_line += 1
-          cur_offset += line.size
-          return cur_line if cur_offset >= target
+        if line = position_line_offsets.index {|x| x > target }
+          return line + 1
         end
 
-        -1
+        raise "Target position #{target} is outside of string"
       end
     end
 
+    def current_character(target=pos)
+      if target < 0 || target >= string.size
+        raise "Target position #{target} is outside of string"
+      end
+      string[target, 1]
+    end
+
+    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
+
+    def current_pos_info(target=pos)
+      l = current_line target
+      c = current_column target
+      ln = get_line(l-1)
+      chr = string[target,1]
+      KpegPosInfo.new(target, l, c, ln, chr)
+    end
+
     def lines
-      lines = []
-      string.each_line { |l| lines << l }
-      lines
+      string.lines
+    end
+
+    def get_line(no)
+      loff = position_line_offsets
+      if no < 0
+        raise "Line No is out of range: #{no} < 0"
+      elsif no >= loff.size
+        raise "Line No is out of range: #{no} >= #{loff.size}"
+      end
+      lend = loff[no]-1
+      lstart = no > 0 ? loff[no-1] : 0
+      string[lstart..lend]
     end
 
     # STANDALONE END

data/lib/kpeg/string_escape.rb

@@ -28,45 +28,75 @@ class KPeg::StringEscape
     attr_accessor :result, :pos
 
     def current_column(target=pos)
-      if c = string.rindex("\n", target-1)
-        return target - c - 1
+      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
+        return target - c
+      elsif c = string.rindex("\n", target)
+        return target - c
       end
 
       target + 1
     end
 
+    def position_line_offsets
+      unless @position_line_offsets
+        @position_line_offsets = []
+        total = 0
+        string.each_line do |line|
+          total += line.size
+          @position_line_offsets << total
+        end
+      end
+      @position_line_offsets
+    end
+
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
-        unless @line_offsets
-          @line_offsets = []
-          total = 0
-          string.each_line do |line|
-            total += line.size
-            @line_offsets << total
-          end
+        if line = position_line_offsets.bsearch_index {|x| x > target }
+          return line + 1
         end
-
-        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
+        raise "Target position #{target} is outside of string"
       end
     else
       def current_line(target=pos)
-        cur_offset = 0
-        cur_line = 0
-
-        string.each_line do |line|
-          cur_line += 1
-          cur_offset += line.size
-          return cur_line if cur_offset >= target
+        if line = position_line_offsets.index {|x| x > target }
+          return line + 1
         end
 
-        -1
+        raise "Target position #{target} is outside of string"
+      end
+    end
+
+    def current_character(target=pos)
+      if target < 0 || target >= string.size
+        raise "Target position #{target} is outside of string"
       end
+      string[target, 1]
+    end
+
+    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
+
+    def current_pos_info(target=pos)
+      l = current_line target
+      c = current_column target
+      ln = get_line(l-1)
+      chr = string[target,1]
+      KpegPosInfo.new(target, l, c, ln, chr)
     end
 
     def lines
-      lines = []
-      string.each_line { |l| lines << l }
-      lines
+      string.lines
+    end
+
+    def get_line(no)
+      loff = position_line_offsets
+      if no < 0
+        raise "Line No is out of range: #{no} < 0"
+      elsif no >= loff.size
+        raise "Line No is out of range: #{no} >= #{loff.size}"
+      end
+      lend = loff[no]-1
+      lstart = no > 0 ? loff[no-1] : 0
+      string[lstart..lend]
     end
 
 
@@ -80,6 +110,7 @@ class KPeg::StringEscape
       @string = string
       @string_size = string ? string.size : 0
       @pos = pos
+      @position_line_offsets = nil
     end
 
     def show_pos
@@ -104,30 +135,22 @@ class KPeg::StringEscape
     end
 
     def failure_caret
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      line = lines[l-1]
-      "#{line}\n#{' ' * (c - 1)}^"
+      p = current_pos_info @failing_rule_offset
+      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
     end
 
     def failure_character
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-      lines[l-1][c-1, 1]
+      current_character @failing_rule_offset
     end
 
     def failure_oneline
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      char = lines[l-1][c-1, 1]
+      p = current_pos_info @failing_rule_offset
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
-        "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
       else
-        "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
       end
     end
 
@@ -140,10 +163,9 @@ class KPeg::StringEscape
 
     def show_error(io=STDOUT)
       error_pos = @failing_rule_offset
-      line_no = current_line(error_pos)
-      col_no = current_column(error_pos)
+      p = current_pos_info(error_pos)
 
-      io.puts "On line #{line_no}, column #{col_no}:"
+      io.puts "On line #{p.lno}, column #{p.col}:"
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
@@ -152,10 +174,9 @@ class KPeg::StringEscape
         io.puts "Failed to match rule '#{@failed_rule}'"
       end
 
-      io.puts "Got: #{string[error_pos,1].inspect}"
-      line = lines[line_no-1]
-      io.puts "=> #{line}"
-      io.print(" " * (col_no + 3))
+      io.puts "Got: #{p.char.inspect}"
+      io.puts "=> #{p.line}"
+      io.print(" " * (p.col + 2))
       io.puts "^"
     end
 
@@ -264,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
@@ -297,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.rb

@@ -22,7 +22,7 @@ class TestKPeg < Minitest::Test
     end
 
     assert_match KPeg.match("hello", gram), "hello"
-    assert_equal nil, KPeg.match("vador", gram)
+    assert_nil KPeg.match("vador", gram)
   end
 
   def test_reg
@@ -48,7 +48,7 @@ class TestKPeg < Minitest::Test
 
     assert_match KPeg.match("hello", gram), "hello"
     assert_match KPeg.match("chicken", gram), "chicken"
-    assert_equal nil, KPeg.match("vador", gram)
+    assert_nil KPeg.match("vador", gram)
   end
 
   def test_maybe
@@ -78,7 +78,7 @@ class TestKPeg < Minitest::Test
       assert_match sm, "run"
     end
 
-    assert_equal nil, KPeg.match("vador", gram)
+    assert_nil KPeg.match("vador", gram)
   end
 
   def test_kleene
@@ -124,9 +124,9 @@ class TestKPeg < Minitest::Test
       assert_match sm, "run"
     end
 
-    assert_equal nil, KPeg.match("run", gram) 
-    assert_equal nil, KPeg.match("runrunrunrunrun", gram) 
-    assert_equal nil, KPeg.match("vador", gram) 
+    assert_nil KPeg.match("run", gram) 
+    assert_nil KPeg.match("runrunrunrunrun", gram) 
+    assert_nil KPeg.match("vador", gram) 
   end
 
   def test_seq
@@ -141,8 +141,8 @@ class TestKPeg < Minitest::Test
 
     assert_equal m.value, ["hello", ", world"]
 
-    assert_equal nil, KPeg.match("vador", gram)
-    assert_equal nil, KPeg.match("hello, vador", gram)
+    assert_nil KPeg.match("vador", gram)
+    assert_nil KPeg.match("hello, vador", gram)
   end
 
   def test_andp
@@ -346,7 +346,7 @@ class TestKPeg < Minitest::Test
     parser = KPeg::Parser.new "hello", gram
     m = parser.parse
 
-    assert_equal nil, m
+    assert_nil m
   end
 
   def test_math_grammar

data/test/test_kpeg_code_generator.rb

@@ -1079,7 +1079,7 @@ end
 
     code = cg.make("")
     assert code.parse
-    assert_equal nil, code.result
+    assert_nil code.result
   end
 
 

data/test/test_kpeg_compiled_parser.rb

@@ -20,12 +20,50 @@ 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"
+    r = TestParser.new "hello\nsir\nand goodbye"
+    assert_equal 1, r.current_column(0)
     assert_equal 2, r.current_column(1)
     assert_equal 6, r.current_column(5)
-    assert_equal 1, r.current_column(7)
-    assert_equal 4, r.current_column(10)
+    assert_equal 2, r.current_column(7)
+    assert_equal 4, r.current_column(9)
+    assert_equal 1, r.current_column(10)
+    assert_equal 11, r.current_column(20)
+    assert_equal 13, r.current_column(22)
+  end
+
+  def test_current_line
+    r = TestParser.new "hello\nsir\nand goodbye"
+    assert_equal 1, r.current_line(0)
+    assert_equal 1, r.current_line(1)
+    assert_equal 1, r.current_line(5)
+    assert_equal 2, r.current_line(7)
+    assert_equal 2, r.current_line(9)
+    assert_equal 3, r.current_line(10)
+    assert_equal 3, r.current_line(20)
+    assert_raises { r.current_line(22) }
+  end
+
+
+  def test_current_character
+    r = TestParser.new "hello\nsir\nand goodbye"
+    assert_equal ?h, r.current_character(0)
+    assert_equal ?e, r.current_character(1)
+    assert_equal ?\n, r.current_character(5)
+    assert_equal ?i, r.current_character(7)
+    assert_equal ?\n, r.current_character(9)
+    assert_equal ?a, r.current_character(10)
+    assert_equal ?e, r.current_character(20)
+    assert_raises { r.current_character(22) }
   end
 
   def test_failed_rule
@@ -36,7 +74,7 @@ class TestKPegCompiledParser < Minitest::Test
   end
 
   def test_failure_info
-    r = TestParser.new "9"
+    r = TestParser.new "9\n1"
     assert !r.parse, "shouldn't parse"
 
     expected = "line 1, column 1: failed rule 'letter' = '[a-z]'"
@@ -45,21 +83,21 @@ class TestKPegCompiledParser < Minitest::Test
   end
 
   def test_failure_caret
-    r = TestParser.new "9"
+    r = TestParser.new "9\n1"
     assert !r.parse, "shouldn't parse"
 
     assert_equal "9\n^", r.failure_caret
   end
 
   def test_failure_character
-    r = TestParser.new "9"
+    r = TestParser.new "9\n1"
     assert !r.parse, "shouldn't parse"
 
     assert_equal "9", r.failure_character
   end
 
   def test_failure_oneline
-    r = TestParser.new "9"
+    r = TestParser.new "9\n1"
     assert !r.parse, "shouldn't parse"
 
     expected = "@1:1 failed rule 'letter', got '9'"
@@ -87,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpeg
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -45,19 +45,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '15.0'
 description: |-
   KPeg is a simple PEG library for Ruby. It provides an API as well as native
   grammar to build the grammar.
@@ -80,7 +86,6 @@ extra_rdoc_files:
 - examples/upper/README.md
 files:
 - ".autotest"
-- ".hoeignore"
 - Gemfile
 - History.txt
 - LICENSE
@@ -135,10 +140,10 @@ files:
 - vim/syntax_kpeg/syntax/kpeg.vim
 homepage: https://github.com/evanphx/kpeg
 licenses:
-- MIT
+- BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/evanphx/kpeg
   bug_tracker_uri: https://github.com/evanphx/kpeg/issues
+  homepage_uri: https://github.com/evanphx/kpeg
 post_install_message:
 rdoc_options:
 - "--main"
@@ -156,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: KPeg is a simple PEG library for Ruby

data/.hoeignore

@@ -1,12 +0,0 @@
-.hoeignore
-.gitignore
-.travis.yml
-.git/
-t/
-tmp/
-scratch/
-test/
-examples/
-Gemfile.lock
-*.jar
-*.bundle