elparser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a27c6c3195066355adfc98524851868fcab2b2a
-  data.tar.gz: 645656f7a8f8b8ea7f193ad33d3357653ad9423b
+  metadata.gz: 30bbdd9381123f9b97cd34fb183649564cff8c8e
+  data.tar.gz: cf641c72ac99855080bbee44a894408837264206
 SHA512:
-  metadata.gz: 7216e4a8c2d55ba0aee646c15f1abddcaf2c1fbebab2f6b849d385348e2b9db7ce9834d4830bb15f8431aa8e3b41e6a0aeafef3f8a82acc2d717622852182a65
-  data.tar.gz: 8f57745a353200ae3394bc5f0b2db924fdb660593b0a3f4164d2056751f9c3454da10ee5b8103dbd66eb87d253c908d04a754282dabe35e029eef8c05d8a039a
+  metadata.gz: d758c5348e3ce6678a3478a864db0a824aee0cbef2399b312ff0a8b8ac8578439bc8b27e1c22123add876653b2fe561310b44ca4df11e910a11971a383fe5c72
+  data.tar.gz: 67babf2246de9b98c0d9f9649e000a459d436f0c66d5ed520e08a7b54821c99459f00f99609921bced884677ed1e9ab4071461ec74048d22e7635dd305f6e9de

data/lib/elparser/version.rb

@@ -1,3 +1,3 @@
 module Elparser
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/elparser.rb

@@ -248,7 +248,7 @@ module Elparser
           s.scan(/\A[-+]?(0|[1-9]\d*)/)      ? (@tokens << [:INTEGER, s.matched]) :
           s.scan(/\A\.(?=\s)/)               ? (@tokens << ['.', '.']) :
           s.scan(/\A[a-z\-.\/_:*<>+=$#][a-z\-.\/_:$*<>+=0-9]*/i) ? (@tokens << [:SYMBOL, s.matched]) :
-          s.scan(/\A"(([^\\"]|\\.)*)"/)        ? (@tokens << [:STRING, s.matched.slice(1...-1)])  :
+          s.scan(/\A"(([^\\"]|\\.)*)"/)        ? (@tokens << [:STRING, _unescape_string(s.matched.slice(1...-1))])  :
           s.scan(/\A./)                      ? (a = s.matched; @tokens << [a, a]) :
           (raise ParserError.new("Scanner error",s.pos,s.peek(5)))
       end
@@ -259,6 +259,28 @@ module Elparser
       end
     end
 
+    UNESCAPES = {
+      'a' => "\x07", 'b' => "\x08", 't' => "\x09",
+      'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
+      'r' => "\x0d", 'e' => "\x1b", "\\\\" => "\x5c",
+      "\"" => "\x22", "'" => "\x27"
+    }
+    UNESCAPES_REGEX = /\\(?:([#{UNESCAPES.keys.join}])|u([\da-fA-F]{4})|u\{([\da-fA-F]{1,6})\})|\\0?x([\da-fA-F]{2})/
+
+    def _unescape_string(str)
+      return str.gsub(UNESCAPES_REGEX) do
+        if $1
+          if $1 == '\\' then '\\' else UNESCAPES[$1] end
+        elsif $2 # escape \u0000 unicode
+          ["#$2".hex].pack('U*')
+        elsif $3 # escape \u{0000} unicode
+          ["#$3".hex].pack('U*')
+        elsif $4 # escape \0xff or \xff
+          [$4].pack('H2')
+        end
+      end
+    end
+
     def next_token
       @tokens.shift
     end

data/test/test-elparser.rb

@@ -63,12 +63,17 @@ class TestElparser < Test::Unit::TestCase
          'symbol2'      => ['$sf-/p.post', _symbol('$sf-/p.post')],
          'symbol3'      => ['#<buffer*GNUEmacs*>', _symbol('#<buffer*GNUEmacs*>')],
          'string'       => ['"qwert"', _string("qwert")],
-         'string2'      => ['"abc\"dds\"dfff\'123\' \\n\nok?"', _string('abc\"dds\"dfff\'123\' \\n\nok?')],
+         'string-quote' => ["\"\\\"\"", _string("\"")],
+         'string-quote2'=> ["\"abc\\\"dds\\\"dfff\'123\' \\\\n\\nok?\"", _string("abc\"dds\"dfff\'123\' \\n\nok?")],
+         'string-unicode1' => ["\"\\u{2026}\"", _string("\u{2026}")],
+         'string-unicode2' => ["\"\\\\u{2026}\"", _string("\\u{2026}")],
+         'string-unicode3' => ["\"\\u2026\"", _string("\u2026")],
          'quote'        => ['\'symbol', _q(_symbol('symbol'))],
          'nil'          => ['nil', _nil],
            })
       def test_primitive(data)
         src, expected = data
+        #puts src,expected
         assert_equal expected, @parser.parse1(src)
       end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elparser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - SAKURAI Masashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A parser for S-expression of emacs lisp