kpeg 0.10.0 → 1.3.0

data/kpeg.gemspec

@@ -1,42 +1,42 @@
 # -*- encoding: utf-8 -*-
+# stub: kpeg 1.0.0.20140103162640 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kpeg"
-  s.version = "0.8.5.20120306163408"
+  s.version = "1.0.0.20140103162640"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eric Hodel"]
-  s.cert_chain = ["/Users/drbrain/.gem/gem-public_cert.pem"]
-  s.date = "2012-03-07"
+  s.authors = ["Evan Phoenix"]
+  s.date = "2014-01-04"
   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 = ["drbrain@segment7.net"]
+  s.email = ["evan@fallingsnow.net"]
   s.executables = ["kpeg"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = [".autotest", "Gemfile", "Gemfile.lock", "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/kpeg.rb", "lib/kpeg/code_generator.rb", "lib/kpeg/compiled_parser.rb", "lib/kpeg/format.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", "lib/kpeg/version.rb", "test/inputs/comments.kpeg", "test/test_file_parser_roundtrip.rb", "test/test_gen_calc.rb", "test/test_kpeg.rb", "test/test_kpeg_code_generator.rb", "test/test_kpeg_compiled_parser.rb", "test/test_kpeg_format.rb", "test/test_kpeg_grammar_renderer.rb", "test/test_left_recursion.rb", "vim/syntax_kpeg/ftdetect/kpeg.vim", "vim/syntax_kpeg/syntax/kpeg.vim", ".gemtest"]
+  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.homepage = "https://github.com/evanphx/kpeg"
+  s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "kpeg"
-  s.rubygems_version = "1.8.12"
-  s.signing_key = "/Users/drbrain/.gem/gem-private_key.pem"
+  s.rubygems_version = "2.1.10"
   s.summary = "KPeg is a simple PEG library for Ruby"
-  s.test_files = ["test/test_file_parser_roundtrip.rb", "test/test_gen_calc.rb", "test/test_kpeg.rb", "test/test_kpeg_code_generator.rb", "test/test_kpeg_compiled_parser.rb", "test/test_kpeg_format.rb", "test/test_kpeg_grammar_renderer.rb", "test/test_left_recursion.rb"]
+  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 = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 2.11"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.15"])
+      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>, ["~> 2.11"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 2.15"])
+      s.add_dependency(%q<minitest>, ["~> 5.2"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.7"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 2.11"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 2.15"])
+    s.add_dependency(%q<minitest>, ["~> 5.2"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.7"])
   end
 end

data/lib/kpeg/code_generator.rb

@@ -83,11 +83,14 @@ module KPeg
 
       if output_node
         code << "  end\n"
+        code << "  module #{root}Construction\n"
         methods.each do |short, name, attrs|
-          code << "  def #{short}(#{attrs.join(', ')})\n"
-          code << "    #{root}::#{name}.new(#{attrs.join(', ')})\n"
-          code << "  end\n"
+          code << "    def #{short}(#{attrs.join(', ')})\n"
+          code << "      #{root}::#{name}.new(#{attrs.join(', ')})\n"
+          code << "    end\n"
         end
+        code << "  end\n"
+        code << "  include #{root}Construction\n"
       end
     end
 
@@ -109,7 +112,7 @@ module KPeg
           # Let default ruby string handling figure it out
           lang = ""
         end
-        code << indentify("_tmp = scan(/\\A#{op.regexp}/#{lang})\n", indent)
+        code << indentify("_tmp = scan(/\\G#{op.regexp}/#{lang})\n", indent)
       when CharRange
         ss = save()
         if op.start.bytesize == 1 and op.fin.bytesize == 1
@@ -124,7 +127,7 @@ module KPeg
             left  = op.start[0]
             right = op.fin[0]
           end
-          
+
           code << indentify("  unless _tmp >= #{left} and _tmp <= #{right}\n", indent)
           code << indentify("    self.pos = #{ss}\n", indent)
           code << indentify("    _tmp = nil\n", indent)
@@ -140,7 +143,7 @@ module KPeg
         code << indentify("while true # choice\n", indent)
         op.ops.each_with_index do |n,idx|
           output_op code, n, (indent+1)
-          
+
           code << indentify("  break if _tmp\n", indent)
           code << indentify("  self.pos = #{ss}\n", indent)
           if idx == op.ops.size - 1
@@ -447,7 +450,7 @@ module KPeg
         cpi = standalone_region("compiled_parser.rb", "INITIALIZE")
         pp  = standalone_region("position.rb")
 
-        cp.gsub!(/include Position/, pp)
+        cp.gsub!(/^\s*include Position/, pp)
         code << "  # :stopdoc:\n"
         code << cpi << "\n" unless @grammar.variables['custom_initialize']
         code << cp  << "\n"

data/lib/kpeg/compiled_parser.rb

@@ -27,12 +27,12 @@ module KPeg
     # Prepares for parsing +str+.  If you define a custom initialize you must
     # call this method before #parse
     def setup_parser(str, debug=false)
-      @string = str
-      @pos = 0
+      set_string str, 0
       @memoizations = Hash.new { |h,k| h[k] = {} }
       @result = nil
       @failed_rule = nil
       @failing_rule_offset = -1
+      @line_offsets = nil
 
       setup_foreign_grammar
     end
@@ -47,6 +47,13 @@ module KPeg
       @string[start..@pos-1]
     end
 
+    # Sets the string and current parsing position for the parser.
+    def set_string string, pos
+      @string = string
+      @string_size = string ? string.size : 0
+      @pos = pos
+    end
+
     def show_pos
       width = 10
       if @pos < width
@@ -144,28 +151,27 @@ module KPeg
     end
 
     def scan(reg)
-      if m = reg.match(@string[@pos..-1])
-        width = m.end(0)
-        @pos += width
+      if m = reg.match(@string, @pos)
+        @pos = m.end(0)
         return true
       end
 
       return nil
     end
 
-    if "".respond_to? :getbyte
+    if "".respond_to? :ord
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
-        s = @string.getbyte @pos
+        s = @string[@pos].ord
         @pos += 1
         s
       end
     else
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
@@ -214,8 +220,7 @@ module KPeg
       old_pos = @pos
       old_string = @string
 
-      @pos = other.pos
-      @string = other.string
+      set_string other.string, other.pos
 
       begin
         if val = __send__(rule, *args)
@@ -226,8 +231,7 @@ module KPeg
         end
         val
       ensure
-        @pos = old_pos
-        @string = old_string
+        set_string old_string, old_pos
       end
     end
 
@@ -261,8 +265,6 @@ module KPeg
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -295,8 +297,6 @@ module KPeg
         else
           return ans
         end
-
-        return ans
       end
     end
 

data/lib/kpeg/format_parser.kpeg

@@ -77,7 +77,7 @@ sgl_escape_quote = "\\'" { "'" }
                  | "[" - range_num:e - "]" { [e.to_i, e.to_i] }
 
      curly_block = curly
-           curly = "{" < (/[^{}"']+/ | string | curly)* > "}" { @g.action(text) }
+           curly = "{" < (spaces | /[^{}"']+/ | string | curly)* > "}" { @g.action(text) }
     nested_paren = "(" (/[^()"']+/ | string | nested_paren)* ")"
 
            value = value:v ":" var:n { @g.t(v,n) }

data/lib/kpeg/format_parser.rb

@@ -5,12 +5,12 @@ class KPeg::FormatParser
     # Prepares for parsing +str+.  If you define a custom initialize you must
     # call this method before #parse
     def setup_parser(str, debug=false)
-      @string = str
-      @pos = 0
+      set_string str, 0
       @memoizations = Hash.new { |h,k| h[k] = {} }
       @result = nil
       @failed_rule = nil
       @failing_rule_offset = -1
+      @line_offsets = nil
 
       setup_foreign_grammar
     end
@@ -19,7 +19,6 @@ class KPeg::FormatParser
     attr_reader :failing_rule_offset
     attr_accessor :result, :pos
 
-    
     def current_column(target=pos)
       if c = string.rindex("\n", target-1)
         return target - c - 1
@@ -28,17 +27,32 @@ class KPeg::FormatParser
       target + 1
     end
 
-    def current_line(target=pos)
-      cur_offset = 0
-      cur_line = 0
+    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
+        end
 
-      string.each_line do |line|
-        cur_line += 1
-        cur_offset += line.size
-        return cur_line if cur_offset >= target
+        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
       end
+    else
+      def current_line(target=pos)
+        cur_offset = 0
+        cur_line = 0
 
-      -1
+        string.each_line do |line|
+          cur_line += 1
+          cur_offset += line.size
+          return cur_line if cur_offset >= target
+        end
+
+        -1
+      end
     end
 
     def lines
@@ -53,6 +67,13 @@ class KPeg::FormatParser
       @string[start..@pos-1]
     end
 
+    # Sets the string and current parsing position for the parser.
+    def set_string string, pos
+      @string = string
+      @string_size = string ? string.size : 0
+      @pos = pos
+    end
+
     def show_pos
       width = 10
       if @pos < width
@@ -150,28 +171,27 @@ class KPeg::FormatParser
     end
 
     def scan(reg)
-      if m = reg.match(@string[@pos..-1])
-        width = m.end(0)
-        @pos += width
+      if m = reg.match(@string, @pos)
+        @pos = m.end(0)
         return true
       end
 
       return nil
     end
 
-    if "".respond_to? :getbyte
+    if "".respond_to? :ord
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
-        s = @string.getbyte @pos
+        s = @string[@pos].ord
         @pos += 1
         s
       end
     else
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
@@ -220,8 +240,7 @@ class KPeg::FormatParser
       old_pos = @pos
       old_string = @string
 
-      @pos = other.pos
-      @string = other.string
+      set_string other.string, other.pos
 
       begin
         if val = __send__(rule, *args)
@@ -232,8 +251,7 @@ class KPeg::FormatParser
         end
         val
       ensure
-        @pos = old_pos
-        @string = old_string
+        set_string old_string, old_pos
       end
     end
 
@@ -267,8 +285,6 @@ class KPeg::FormatParser
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -301,8 +317,6 @@ class KPeg::FormatParser
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -523,7 +537,7 @@ class KPeg::FormatParser
         _tmp = match_string("-")
         break if _tmp
         self.pos = _save1
-        _tmp = scan(/\A(?i-mx:[a-z][\w-]*)/)
+        _tmp = scan(/\G(?i-mx:[a-z][\w-]*)/)
         break if _tmp
         self.pos = _save1
         break
@@ -554,7 +568,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?i-mx:[a-z_]\w*)/)
+      _tmp = scan(/\G(?i-mx:[a-z_]\w*)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -818,7 +832,7 @@ class KPeg::FormatParser
       _save1 = self.pos
       while true # sequence
         _text_start = self.pos
-        _tmp = scan(/\A(?-mix:[0-7]{1,3})/)
+        _tmp = scan(/\G(?-mix:[0-7]{1,3})/)
         if _tmp
           text = get_text(_text_start)
         end
@@ -845,7 +859,7 @@ class KPeg::FormatParser
           break
         end
         _text_start = self.pos
-        _tmp = scan(/\A(?i-mx:[a-f\d]{2})/)
+        _tmp = scan(/\G(?i-mx:[a-f\d]{2})/)
         if _tmp
           text = get_text(_text_start)
         end
@@ -876,7 +890,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[^\\"]+)/)
+      _tmp = scan(/\G(?-mix:[^\\"]+)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -1014,7 +1028,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[^'])/)
+      _tmp = scan(/\G(?-mix:[^'])/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -1139,7 +1153,7 @@ class KPeg::FormatParser
         _tmp = match_string("\\/")
         break if _tmp
         self.pos = _save2
-        _tmp = scan(/\A(?-mix:[^\/])/)
+        _tmp = scan(/\G(?-mix:[^\/])/)
         break if _tmp
         self.pos = _save2
         break
@@ -1153,7 +1167,7 @@ class KPeg::FormatParser
             _tmp = match_string("\\/")
             break if _tmp
             self.pos = _save3
-            _tmp = scan(/\A(?-mix:[^\/])/)
+            _tmp = scan(/\G(?-mix:[^\/])/)
             break if _tmp
             self.pos = _save3
             break
@@ -1266,7 +1280,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?i-mx:[a-z\d])/)
+      _tmp = scan(/\G(?i-mx:[a-z\d])/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -1336,7 +1350,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[1-9]\d*)/)
+      _tmp = scan(/\G(?-mix:[1-9]\d*)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -1511,7 +1525,7 @@ class KPeg::FormatParser
     return _tmp
   end
 
-  # curly = "{" < (/[^{}"']+/ | string | curly)* > "}" { @g.action(text) }
+  # curly = "{" < (spaces | /[^{}"']+/ | string | curly)* > "}" { @g.action(text) }
   def _curly
 
     _save = self.pos
@@ -1526,7 +1540,10 @@ class KPeg::FormatParser
 
         _save2 = self.pos
         while true # choice
-          _tmp = scan(/\A(?-mix:[^{}"']+)/)
+          _tmp = apply(:_spaces)
+          break if _tmp
+          self.pos = _save2
+          _tmp = scan(/\G(?-mix:[^{}"']+)/)
           break if _tmp
           self.pos = _save2
           _tmp = apply(:_string)
@@ -1579,7 +1596,7 @@ class KPeg::FormatParser
 
         _save2 = self.pos
         while true # choice
-          _tmp = scan(/\A(?-mix:[^()"']+)/)
+          _tmp = scan(/\G(?-mix:[^()"']+)/)
           break if _tmp
           self.pos = _save2
           _tmp = apply(:_string)
@@ -2616,7 +2633,7 @@ class KPeg::FormatParser
           break
         end
         _text_start = self.pos
-        _tmp = scan(/\A(?-mix:[:\w]+)/)
+        _tmp = scan(/\G(?-mix:[:\w]+)/)
         if _tmp
           text = get_text(_text_start)
         end
@@ -2914,7 +2931,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[A-Z]\w*)/)
+      _tmp = scan(/\G(?-mix:[A-Z]\w*)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -2940,7 +2957,7 @@ class KPeg::FormatParser
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?i-mx:[a-z_]\w*)/)
+      _tmp = scan(/\G(?i-mx:[a-z_]\w*)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -3157,7 +3174,7 @@ class KPeg::FormatParser
   Rules[:_range_elem] = rule_info("range_elem", "< (range_num | kleene) > { text }")
   Rules[:_mult_range] = rule_info("mult_range", "(\"[\" - range_elem:l - \",\" - range_elem:r - \"]\" { [l == \"*\" ? nil : l.to_i, r == \"*\" ? nil : r.to_i] } | \"[\" - range_num:e - \"]\" { [e.to_i, e.to_i] })")
   Rules[:_curly_block] = rule_info("curly_block", "curly")
-  Rules[:_curly] = rule_info("curly", "\"{\" < (/[^{}\"']+/ | string | curly)* > \"}\" { @g.action(text) }")
+  Rules[:_curly] = rule_info("curly", "\"{\" < (spaces | /[^{}\"']+/ | string | curly)* > \"}\" { @g.action(text) }")
   Rules[:_nested_paren] = rule_info("nested_paren", "\"(\" (/[^()\"']+/ | string | nested_paren)* \")\"")
   Rules[:_value] = rule_info("value", "(value:v \":\" var:n { @g.t(v,n) } | value:v \"?\" { @g.maybe(v) } | value:v \"+\" { @g.many(v) } | value:v \"*\" { @g.kleene(v) } | value:v mult_range:r { @g.multiple(v, *r) } | \"&\" value:v { @g.andp(v) } | \"!\" value:v { @g.notp(v) } | \"(\" - expression:o - \")\" { o } | \"@<\" - expression:o - \">\" { @g.bounds(o) } | \"<\" - expression:o - \">\" { @g.collect(o) } | curly_block | \"~\" method:m < nested_paren? > { @g.action(\"\#{m}\#{text}\") } | \".\" { @g.dot } | \"@\" var:name < nested_paren? > !(- \"=\") { @g.invoke(name, text.empty? ? nil : text) } | \"^\" var:name < nested_paren? > { @g.foreign_invoke(\"parent\", name, text) } | \"%\" var:gram \".\" var:name < nested_paren? > { @g.foreign_invoke(gram, name, text) } | var:name < nested_paren? > !(- \"=\") { @g.ref(name, nil, text.empty? ? nil : text) } | char_range | regexp | string)")
   Rules[:_spaces] = rule_info("spaces", "(space | comment)+")

data/lib/kpeg/grammar.rb

@@ -834,7 +834,7 @@ module KPeg
     # Invoke a rule defined on a foreign grammar
     # == Parameters:
     # gram::
-    #   The name of the grammar that the rule will be reference from 
+    #   The name of the grammar that the rule will be reference from
     # name::
     #   The name of the rule that will be invoked
     # args::

data/lib/kpeg/position.rb

@@ -10,17 +10,32 @@ module KPeg
       target + 1
     end
 
-    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 [].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
+        end
+
+        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
+      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
+        end
+
+        -1
       end
-
-      -1
     end
 
     def lines

data/lib/kpeg/string_escape.kpeg

@@ -7,6 +7,7 @@
 segment = < /[\w ]+/ > { text } # Don't use \s because that matchs \n
         | "\\" { "\\\\" }
         | "\n" { "\\n" }
+        | "\r" { "\\r" }
         | "\t" { "\\t" }
         | "\b" { "\\b" }
         | "\"" { "\\\"" }