kpeg 0.8.3 → 0.8.4

data/Rakefile

@@ -21,5 +21,6 @@ end
 
 desc "rebuild parser"
 task :parser do
+  sh "ruby -Ilib bin/kpeg -o lib/kpeg/string_escape.rb -f lib/kpeg/string_escape.kpeg"
   sh "ruby -Ilib bin/kpeg -o lib/kpeg/format_parser.rb -s -f lib/kpeg/format.kpeg"
 end

data/lib/kpeg/format_parser.rb

@@ -578,7 +578,7 @@ class KPeg::FormatParser
     return _tmp
   end
 
-  # dbl_escapes = ("n" { "\n" } | "s" { " " } | "r" { "\r" } | "t" { "\t" } | "v" { "\v" } | "f" { "\f" } | "b" { "\b" } | "a" { "\a" } | "e" { "\e" } | "\\" { "\\" } | "\"" { "\"" } | num_escapes)
+  # dbl_escapes = ("n" { "\n" } | "s" { " " } | "r" { "\r" } | "t" { "\t" } | "v" { "\v" } | "f" { "\f" } | "b" { "\b" } | "a" { "\a" } | "e" { "\e" } | "\\" { "\\" } | "\"" { "\"" } | num_escapes | < . > { text })
   def _dbl_escapes
 
     _save = self.pos
@@ -782,6 +782,28 @@ class KPeg::FormatParser
       break if _tmp
       self.pos = _save
       _tmp = apply(:_num_escapes)
+      break if _tmp
+      self.pos = _save
+
+      _save12 = self.pos
+      while true # sequence
+        _text_start = self.pos
+        _tmp = get_byte
+        if _tmp
+          text = get_text(_text_start)
+        end
+        unless _tmp
+          self.pos = _save12
+          break
+        end
+        @result = begin;  text ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save12
+        end
+        break
+      end # end sequence
+
       break if _tmp
       self.pos = _save
       break
@@ -791,7 +813,7 @@ class KPeg::FormatParser
     return _tmp
   end
 
-  # num_escapes = (< /[0-7]{3}/ > { [text.to_i(8)].pack("U") } | "x" < /[0-9a-fA-F]{2}/ > { [text.to_i(16)].pack("U") })
+  # num_escapes = (< /[0-7]{1,3}/ > { [text.to_i(8)].pack("U") } | "x" < /[0-9a-fA-F]{2}/ > { [text.to_i(16)].pack("U") })
   def _num_escapes
 
     _save = self.pos
@@ -800,7 +822,7 @@ class KPeg::FormatParser
       _save1 = self.pos
       while true # sequence
         _text_start = self.pos
-        _tmp = scan(/\A(?-mix:[0-7]{3})/)
+        _tmp = scan(/\A(?-mix:[0-7]{1,3})/)
         if _tmp
           text = get_text(_text_start)
         end
@@ -3075,8 +3097,8 @@ class KPeg::FormatParser
   Rules[:_kleene] = rule_info("kleene", "\"*\"")
   Rules[:_var] = rule_info("var", "< (\"-\" | /[a-zA-Z][\\-_a-zA-Z0-9]*/) > { text }")
   Rules[:_method] = rule_info("method", "< /[a-zA-Z_][a-zA-Z0-9_]*/ > { text }")
-  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)")
-  Rules[:_num_escapes] = rule_info("num_escapes", "(< /[0-7]{3}/ > { [text.to_i(8)].pack(\"U\") } | \"x\" < /[0-9a-fA-F]{2}/ > { [text.to_i(16)].pack(\"U\") })")
+  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\" < /[0-9a-fA-F]{2}/ > { [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_string] = rule_info("dbl_string", "\"\\\"\" dbl_not_quote:s \"\\\"\" { @g.str(s.join) }")

data/lib/kpeg/string_escape.rb

@@ -13,203 +13,170 @@ class KPeg::StringEscape < KPeg::CompiledParser
     _save = self.pos
     while true # choice
 
-    _save1 = self.pos
-    while true # sequence
-    _text_start = self.pos
-    _tmp = scan(/\A(?-mix:[\w ]+)/)
-    if _tmp
-      text = get_text(_text_start)
-    end
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    @result = begin;  text ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save1
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-
-    _save2 = self.pos
-    while true # sequence
-    _tmp = match_string("\\")
-    unless _tmp
-      self.pos = _save2
-      break
-    end
-    @result = begin;  "\\\\" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save2
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-
-    _save3 = self.pos
-    while true # sequence
-    _tmp = match_string("\n")
-    unless _tmp
-      self.pos = _save3
-      break
-    end
-    @result = begin;  "\\n" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save3
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-
-    _save4 = self.pos
-    while true # sequence
-    _tmp = match_string("\t")
-    unless _tmp
-      self.pos = _save4
-      break
-    end
-    @result = begin;  "\\t" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save4
-    end
-    break
-    end # end sequence
+      _save1 = self.pos
+      while true # sequence
+        _text_start = self.pos
+        _tmp = scan(/\A(?-mix:[\w ]+)/)
+        if _tmp
+          text = get_text(_text_start)
+        end
+        unless _tmp
+          self.pos = _save1
+          break
+        end
+        @result = begin;  text ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save1
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
 
-    break if _tmp
-    self.pos = _save
+      _save2 = self.pos
+      while true # sequence
+        _tmp = match_string("\\")
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        @result = begin;  "\\\\" ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save2
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
 
-    _save5 = self.pos
-    while true # sequence
-    _tmp = match_string("\b")
-    unless _tmp
-      self.pos = _save5
-      break
-    end
-    @result = begin;  "\\b" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save5
-    end
-    break
-    end # end sequence
+      _save3 = self.pos
+      while true # sequence
+        _tmp = match_string("\n")
+        unless _tmp
+          self.pos = _save3
+          break
+        end
+        @result = begin;  "\\n" ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save3
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
 
-    break if _tmp
-    self.pos = _save
+      _save4 = self.pos
+      while true # sequence
+        _tmp = match_string("\t")
+        unless _tmp
+          self.pos = _save4
+          break
+        end
+        @result = begin;  "\\t" ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save4
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
 
-    _save6 = self.pos
-    while true # sequence
-    _tmp = match_string("\"")
-    unless _tmp
-      self.pos = _save6
-      break
-    end
-    @result = begin;  "\\\"" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save6
-    end
-    break
-    end # end sequence
+      _save5 = self.pos
+      while true # sequence
+        _tmp = match_string("\b")
+        unless _tmp
+          self.pos = _save5
+          break
+        end
+        @result = begin;  "\\b" ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save5
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
 
-    break if _tmp
-    self.pos = _save
+      _save6 = self.pos
+      while true # sequence
+        _tmp = match_string("\"")
+        unless _tmp
+          self.pos = _save6
+          break
+        end
+        @result = begin;  "\\\"" ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save6
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
 
-    _save7 = self.pos
-    while true # sequence
-    _text_start = self.pos
-    _tmp = get_byte
-    if _tmp
-      text = get_text(_text_start)
-    end
-    unless _tmp
-      self.pos = _save7
+      _save7 = self.pos
+      while true # sequence
+        _text_start = self.pos
+        _tmp = get_byte
+        if _tmp
+          text = get_text(_text_start)
+        end
+        unless _tmp
+          self.pos = _save7
+          break
+        end
+        @result = begin;  text ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save7
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
       break
-    end
-    @result = begin;  text ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save7
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-    break
     end # end choice
 
     set_failed_rule :_segment unless _tmp
     return _tmp
   end
 
-  # segments = (segment:s segments:r { "#{s}#{r}" } | segment)
-  def _segments
-
-    _save = self.pos
-    while true # choice
-
-    _save1 = self.pos
-    while true # sequence
-    _tmp = apply(:_segment)
-    s = @result
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    _tmp = apply(:_segments)
-    r = @result
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    @result = begin;  "#{s}#{r}" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save1
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-    _tmp = apply(:_segment)
-    break if _tmp
-    self.pos = _save
-    break
-    end # end choice
-
-    set_failed_rule :_segments unless _tmp
-    return _tmp
-  end
-
-  # root = segments:s { @text = s }
+  # root = segment*:s { @text = s.join }
   def _root
 
     _save = self.pos
     while true # sequence
-    _tmp = apply(:_segments)
-    s = @result
-    unless _tmp
-      self.pos = _save
+      _ary = []
+      while true
+        _tmp = apply(:_segment)
+        _ary << @result if _tmp
+        break unless _tmp
+      end
+      _tmp = true
+      @result = _ary
+      s = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  @text = s.join ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
       break
-    end
-    @result = begin;  @text = s ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save
-    end
-    break
     end # end sequence
 
     set_failed_rule :_root unless _tmp
@@ -222,90 +189,57 @@ class KPeg::StringEscape < KPeg::CompiledParser
     _save = self.pos
     while true # choice
 
-    _save1 = self.pos
-    while true # sequence
-    _tmp = match_string("#")
-    unless _tmp
-      self.pos = _save1
+      _save1 = self.pos
+      while true # sequence
+        _tmp = match_string("#")
+        unless _tmp
+          self.pos = _save1
+          break
+        end
+        @result = begin;  "\\#" ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save1
+        end
+        break
+      end # end sequence
+
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_segment)
+      break if _tmp
+      self.pos = _save
       break
-    end
-    @result = begin;  "\\#" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save1
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-    _tmp = apply(:_segment)
-    break if _tmp
-    self.pos = _save
-    break
     end # end choice
 
     set_failed_rule :_embed_seg unless _tmp
     return _tmp
   end
 
-  # embed_segs = (embed_seg:s embed_segs:r { "#{s}#{r}" } | embed_seg)
-  def _embed_segs
-
-    _save = self.pos
-    while true # choice
-
-    _save1 = self.pos
-    while true # sequence
-    _tmp = apply(:_embed_seg)
-    s = @result
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    _tmp = apply(:_embed_segs)
-    r = @result
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    @result = begin;  "#{s}#{r}" ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save1
-    end
-    break
-    end # end sequence
-
-    break if _tmp
-    self.pos = _save
-    _tmp = apply(:_embed_seg)
-    break if _tmp
-    self.pos = _save
-    break
-    end # end choice
-
-    set_failed_rule :_embed_segs unless _tmp
-    return _tmp
-  end
-
-  # embed = embed_segs:s { @text = s }
+  # embed = embed_seg*:s { @text = s.join }
   def _embed
 
     _save = self.pos
     while true # sequence
-    _tmp = apply(:_embed_segs)
-    s = @result
-    unless _tmp
-      self.pos = _save
+      _ary = []
+      while true
+        _tmp = apply(:_embed_seg)
+        _ary << @result if _tmp
+        break unless _tmp
+      end
+      _tmp = true
+      @result = _ary
+      s = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  @text = s.join ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
       break
-    end
-    @result = begin;  @text = s ; end
-    _tmp = true
-    unless _tmp
-      self.pos = _save
-    end
-    break
     end # end sequence
 
     set_failed_rule :_embed unless _tmp
@@ -314,9 +248,7 @@ class KPeg::StringEscape < KPeg::CompiledParser
 
   Rules = {}
   Rules[:_segment] = rule_info("segment", "(< /[\\w ]+/ > { text } | \"\\\\\" { \"\\\\\\\\\" } | \"\\n\" { \"\\\\n\" } | \"\\t\" { \"\\\\t\" } | \"\\b\" { \"\\\\b\" } | \"\\\"\" { \"\\\\\\\"\" } | < . > { text })")
-  Rules[:_segments] = rule_info("segments", "(segment:s segments:r { \"\#{s}\#{r}\" } | segment)")
-  Rules[:_root] = rule_info("root", "segments:s { @text = s }")
+  Rules[:_root] = rule_info("root", "segment*:s { @text = s.join }")
   Rules[:_embed_seg] = rule_info("embed_seg", "(\"\#\" { \"\\\\\#\" } | segment)")
-  Rules[:_embed_segs] = rule_info("embed_segs", "(embed_seg:s embed_segs:r { \"\#{s}\#{r}\" } | embed_seg)")
-  Rules[:_embed] = rule_info("embed", "embed_segs:s { @text = s }")
+  Rules[:_embed] = rule_info("embed", "embed_seg*:s { @text = s.join }")
 end

data/lib/kpeg/version.rb

@@ -1,3 +1,3 @@
 module KPeg
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/test/test_kpeg_format.rb

@@ -147,8 +147,12 @@ b(p) = x
     assert_rule G.str(""), match('a=""')
     assert_rule G.str("hello"), match('a="hello"')
     assert_rule G.str("hello\ngoodbye"), match('a="hello\ngoodbye"')
-    assert_rule G.str("\n\s\r\t\v\f\b\a\r\\\"\012\x1b"),
-                match('a="\n\s\r\t\v\f\b\a\r\\\\\\"\012\x1b"')
+    assert_rule G.str("hello\n\0goodbye"), match('a="hello\n\0goodbye"')
+    assert_rule G.str("hello\n\017goodbye"), match('a="hello\n\017goodbye"')
+    assert_rule G.str("hello\n\017goodbye"), match('a="hello\n\017goodbye"')
+    assert_rule G.str("hello\n\9goodbye"), match('a="hello\n\9goodbye"')
+    assert_rule G.str("\n\s\r\t\v\f\b\a\r\\\"\0172\x1b"),
+                match('a="\n\s\r\t\v\f\b\a\r\\\\\\"\0172\x1b"')
     assert_rule G.str("h\"ello"), match('a="h\"ello"')
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kpeg
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
-default_executable: 
+date: 2011-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -67,7 +66,6 @@ files:
 - test/test_kpeg_compiled_parser.rb
 - test/test_kpeg_format.rb
 - test/test_kpeg_grammar_renderer.rb
-has_rdoc: true
 homepage: https://github.com/evanphx/kpeg
 licenses: []
 
@@ -97,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Peg-based Code Generator