edn_turbo 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22aa24b410b3f96a61348d2337a09a149c8b9cb2
-  data.tar.gz: a2acc757c6860c20554eb8193cff4c85f75d7c22
+  metadata.gz: 87badf5b6b0c38f6f22fd662b0add51be662a6a2
+  data.tar.gz: d9a0b304de6ea51480a9747df4a8d35ad826c246
 SHA512:
-  metadata.gz: 6414fa962e6d8b5558d615c5fa54a121edc6ee17f2e6080d81b183806224e6937096c1d43e6f3be58e30b2a383010f43e3c76200cfa774887e406317ba57f0b6
-  data.tar.gz: 8be7e90de1ad7383a11e5b1613b59be193bdb0e06e9483584bd1459b9b274a45aee486f301b367995eb12da336f41671618eb5aa729a052ef25d8a365c64f6d9
+  metadata.gz: 0d717030106eeca177d00eeb26dc58330a0a873c932346d0463bb00e926288b08b5bf4070c5b4240505b8f63eeec675da83c91c163880842c1c9379d409a0429
+  data.tar.gz: 0b9e043cfafe56031026861f221302657a07acb6353b8274083affb14d02d9a081ec820b046cac14979ced57d0d6e110db5178d5b54bd13db6319c3c44d926b4

data/ext/edn_turbo/edn_parser.cc

@@ -611,7 +611,7 @@ case 5:
 
     if (cs >= EDN_keyword_first_final) {
         std::string buf;
-        uint32_t len = p - p_save;
+        uintmax_t len = p - p_save;
         // don't include leading ':' because the ruby symbol will handle it
         buf.append(p_save + 1, len - 1);
         v = ID2SYM(rb_intern(buf.c_str()));

data/ext/edn_turbo/edn_parser.h

@@ -60,7 +60,7 @@ namespace edn
         FILE* core_io;  // for IO streams
         VALUE read_io;  // for non-core IO that responds to read()
         char* io_buffer;
-        uintmax_t io_buffer_len;
+        uint32_t io_buffer_len;
         std::size_t line_number;
         std::vector<VALUE> discard;
         std::stack<std::vector<VALUE>* > metadata;

data/ext/edn_turbo/edn_parser.rl

@@ -280,7 +280,7 @@ const char* edn::Parser::parse_keyword(const char *p, const char *pe, VALUE& v)
 
     if (cs >= EDN_keyword_first_final) {
         std::string buf;
-        uint32_t len = p - p_save;
+        uintmax_t len = p - p_save;
         // don't include leading ':' because the ruby symbol will handle it
         buf.append(p_save + 1, len - 1);
         v = ID2SYM(rb_intern(buf.c_str()));

data/ext/edn_turbo/edn_parser_util.cc

@@ -148,7 +148,11 @@ namespace edn
         // set the buffer to read from
         if (str_buf.length() > 0) {
             // first time when io_buffer is NULL, pe & p = 0
-            uintmax_t new_length = ((uintmax_t) (pe - p)) + str_buf.length();
+            uintmax_t new_length = (pe - p) + str_buf.length();
+            if (new_length > (((uintmax_t) 1 << 32) - 1)) {
+                // icu -> 32-bit. TODO: handle
+                rb_raise(rb_eRuntimeError, "Unsupported string buffer length");
+            }
             char* start = NULL;
 
             // allocate or extend storage needed
@@ -169,7 +173,7 @@ namespace edn
             
             // and copy
             memcpy(start, str_buf.c_str(), str_buf.length()); 
-            io_buffer_len = new_length;
+            io_buffer_len = (uint32_t) new_length;
 
             // set ragel state
             p = io_buffer;
@@ -209,7 +213,7 @@ namespace edn
     private:
         VALUE receiver;
         ID method;
-        VALUE count;
+        int count;
         VALUE args[2];
     };
 
@@ -302,7 +306,7 @@ namespace edn
             std::string buf;
 
             if (encode) {
-                if (!util::to_utf8(p_start, p_end - p_start, buf))
+                if (!util::to_utf8(p_start, (uint32_t) (p_end - p_start), buf))
                     return false;
             }
             else {

data/ext/edn_turbo/edn_parser_util.h

@@ -6,6 +6,6 @@ namespace edn
 {
     namespace util
     {
-        bool to_utf8(const char *s, std::size_t len, std::string& rslt);
+        bool to_utf8(const char *s, uint32_t len, std::string& rslt);
     }
 }

data/ext/edn_turbo/edn_parser_util_unicode.cc

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

data/ext/edn_turbo/main.cc

@@ -8,8 +8,6 @@
 
 #include "edn_parser.h"
 
-
-
 namespace edn {
 
     VALUE rb_mEDNT;
@@ -33,12 +31,19 @@ namespace edn {
 
     //
     // Wrappers to hook the class w/ the C-api.
-    static void delete_parser(edn::Parser *ptr) {
-        delete ptr;
+    static void delete_parser(void* p_ptr) {
+        delete reinterpret_cast<edn::Parser*>(p_ptr);
     }
 
+    static const rb_data_type_t parser_data_type = {
+        "edn_turbo::Parser",
+        {0, delete_parser, 0, {0}},
+        0, 0,
+        RUBY_TYPED_FREE_IMMEDIATELY,
+    };
+
     static VALUE wrap_parser_ptr(VALUE klass, edn::Parser* ptr) {
-        return Data_Wrap_Struct(klass, 0, delete_parser, ptr);
+        return TypedData_Wrap_Struct(klass, &parser_data_type, ptr);
     }
 
     static VALUE alloc_obj(VALUE self){
@@ -48,7 +53,7 @@ namespace edn {
     static inline Parser* get_parser(VALUE self)
     {
         Parser *p;
-        Data_Get_Struct( self, edn::Parser, p );
+        TypedData_Get_Struct( self, edn::Parser, &parser_data_type, p );
         return p;
     }
     static VALUE set_source(VALUE self, VALUE data);
@@ -57,8 +62,6 @@ namespace edn {
     // Called by the constructor - sets the source if passed.
     static VALUE initialize(int argc, VALUE* argv, VALUE self)
     {
-        Parser* p = get_parser(self);
-
         if (argc > 0) {
             set_source( self, argv[0] );
         }
@@ -164,7 +167,7 @@ void Init_edn_turbo(void)
     a.sa_handler = edn::die;
     sigemptyset(&a.sa_mask);
     a.sa_flags = 0;
-    sigaction(SIGINT, &a, 0);
+    sigaction(SIGINT, &a, NULL);
 
     // pass things back as utf-8
     if (!setlocale( LC_ALL, "" )) {

data/lib/edn_turbo/version.rb

@@ -1,4 +1,4 @@
 module EDNT
-  VERSION = '0.5.1'
-  RELEASE_DATE = '2017-05-31'
+  VERSION = '0.5.2'
+  RELEASE_DATE = '2017-06-29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ed Porras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 3
 summary: Read EDN files