edn_turbo 0.2.1 → 0.2.2

data/ext/edn_turbo/edn_parser_unicode.cc

@@ -15,7 +15,7 @@ namespace edn
     //
     // unescapes any values that need to be replaced, saves it to utf8
     //
-    bool Parser::unicode_to_utf8(const char *s, std::size_t len, std::string& rslt)
+    bool Parser::to_utf8(const char *s, std::size_t len, std::string& rslt)
     {
         icu::UnicodeString ustr(s, len);
 

data/ext/edn_turbo/{edn_parser_def.cc → edn_parser_util.cc}

@@ -13,6 +13,8 @@
 
 namespace edn
 {
+    //
+    // used to determine max number of chars in string value of a type
     template <typename T>
     static std::size_t get_max_chars(T)
     {
@@ -57,19 +59,25 @@ namespace edn
     //
     // copies the string data, unescaping any present values that need to be replaced
     //
-    bool Parser::parse_byte_stream(const char *p_start, const char *p_end, Rice::String& s)
+    bool Parser::parse_byte_stream(const char *p_start, const char *p_end, Rice::String& s,
+                                   bool encode)
     {
         if (p_end > p_start) {
             std::string buf;
 
-            if (unicode_to_utf8(p_start, p_end - p_start, buf))
-            {
-                // utf-8 encode
-                VALUE vs = Rice::protect( rb_str_new2, buf.c_str() );
-                VALUE s_utf8 = Rice::protect( rb_enc_associate, vs, rb_utf8_encoding() );
-                s = Rice::String(s_utf8);
-                return true;
+            if (encode) {
+                if (!to_utf8(p_start, p_end - p_start, buf))
+                    return false;
+            }
+            else {
+                buf.append(p_start, p_end - p_start);
             }
+
+            // utf-8 encode
+            VALUE vs = Rice::protect( rb_str_new2, buf.c_str() );
+            VALUE s_utf8 = Rice::protect( rb_enc_associate, vs, rb_utf8_encoding() );
+            s = Rice::String(s_utf8);
+            return true;
         }
 
         return false;
@@ -85,14 +93,14 @@ namespace edn
         buf.append(p, len);
 
         if (len > 1) {
-            if      (buf == "newline") buf = "\\n";
-            else if (buf == "tab") buf = "\\t";
-            else if (buf == "return") buf = "\\r";
-            else if (buf == "space") buf = " ";
-            else if (buf == "formfeed") buf = "\\f";
-            else if (buf == "backspace") buf = "\\b";
+            if      (buf == "newline") buf = '\n';
+            else if (buf == "tab") buf = '\t';
+            else if (buf == "return") buf = '\r';
+            else if (buf == "space") buf = ' ';
+            else if (buf == "formfeed") buf = '\f';
+            else if (buf == "backspace") buf = '\b';
             // TODO: is this supported?
-            else if (buf == "verticaltab") buf = "\\v";
+            else if (buf == "verticaltab") buf = '\v';
             else return false;
         }
 

data/lib/edn_turbo/version.rb

@@ -1,4 +1,4 @@
 module EDNT
-  VERSION = '0.2.1'
-  RELEASE_DATE = %q{2015-06-01}
+  VERSION = '0.2.2'
+  RELEASE_DATE = %q{2015-06-03}
 end

data/test/test_output_diff.rb

@@ -47,7 +47,7 @@ class EDNT_Test < Minitest::Test
 
     check_file('test/values.edn',
                [false, true, nil, "this is a test", "this\tis\\only\ta\ttest\rof\"various\nescaped\\values",
-                "c", "\\n", "\\t",
+                "c", "\n", "\t",
                 "123➪456®789"]
               )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ed Porras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -83,8 +83,8 @@ files:
 - ext/edn_turbo/edn_parser.cc
 - ext/edn_turbo/edn_parser.h
 - ext/edn_turbo/edn_parser.rl
-- ext/edn_turbo/edn_parser_def.cc
 - ext/edn_turbo/edn_parser_unicode.cc
+- ext/edn_turbo/edn_parser_util.cc
 - ext/edn_turbo/extconf.rb
 - ext/edn_turbo/main.cc
 - lib/edn_turbo.rb