edn_turbo 0.6.0 → 0.6.1

data/ext/edn_turbo/main.cc

@@ -40,6 +40,7 @@ namespace edn {
    VALUE EDN_MAKE_LIST_METHOD         = Qnil;
    VALUE EDN_MAKE_SET_METHOD          = Qnil;
    VALUE EDN_MAKE_BIG_DECIMAL_METHOD  = Qnil;
+   VALUE EDN_MAKE_RATIONAL_METHOD     = Qnil;
    VALUE EDN_TAGGED_ELEM_METHOD       = Qnil;
    VALUE EDNT_EXTENDED_VALUE_METHOD   = Qnil;
 
@@ -209,7 +210,7 @@ void Init_edn_turbo(void)
    rb_define_method(rb_cParser, "read",
                     reinterpret_cast<VALUE(*)(ANYARGS)>(&edn::next), 0 );
 
-   // bind ruby methods we'll call - these should be defined in edn_turbo.rb
+   // bind edn-ruby methods we'll call
    edn::EDN_MAKE_SYMBOL_METHOD        = rb_intern("symbol");
    edn::EDN_MAKE_LIST_METHOD          = rb_intern("list");
    edn::EDN_MAKE_SET_METHOD           = rb_intern("set");
@@ -218,6 +219,7 @@ void Init_edn_turbo(void)
 
    // defined in EDNT - see edn_parser.rb
    edn::EDNT_EXTENDED_VALUE_METHOD    = rb_intern("extend_for_meta");
+   edn::EDN_MAKE_RATIONAL_METHOD      = rb_intern("rational"); // should be in edn-ruby
 
    // ruby methods
    edn::RUBY_STRING_TO_I_METHOD       = rb_intern("to_i");

data/ext/edn_turbo/parser.h

@@ -82,6 +82,7 @@ namespace edn
       const char* parse_keyword (const char *p, const char *pe, VALUE& v);
       const char* parse_decimal (const char *p, const char *pe, VALUE& v);
       const char* parse_integer (const char *p, const char *pe, VALUE& v);
+      const char* parse_ratio   (const char *p, const char *pe, VALUE& v);
       const char* parse_operator(const char *p, const char *pe, VALUE& v);
       const char* parse_esc_char(const char *p, const char *pe, VALUE& v);
       const char* parse_symbol  (const char *p, const char *pe, VALUE& v);

data/ext/edn_turbo/util.cc

@@ -152,27 +152,35 @@ namespace edn
       }
 
       //
-      // as above.. TODO: check exponential..
+      // as above, but for floats
       VALUE float_to_ruby(const char* str, std::size_t len)
       {
-         // if big decimal is needed, call into ruby side to get
-         // the correct value
-         if (str[len-1] == 'M' || len >= LD_max_chars)
+         // if big decimal is needed, call into ruby side to get the
+         // correct value
+         if (str[len-1] == 'M')
          {
-            std::string buf(str, len);
-            VALUE vs = edn_prot_rb_new_str(buf.c_str());
+            std::string f_val(str, len-1); // strip the M
+            VALUE vs = edn_prot_rb_new_str(f_val.c_str());
 
-            if (str[len-1] == 'M') {
-               return call_module_fn(rb_mEDN, EDN_MAKE_BIG_DECIMAL_METHOD, vs);
-            }
+            return call_module_fn(rb_mEDN, EDN_MAKE_BIG_DECIMAL_METHOD, vs);
+         }
 
-            prot_args args(vs, RUBY_STRING_TO_F_METHOD);
+         // really long value string or exp
+         if (len >= LD_max_chars ||
+             std::string(str, len).find("e") != std::string::npos) {
+            prot_args args(edn_prot_rb_new_str(str), RUBY_STRING_TO_F_METHOD);
             return edn_prot_rb_funcall( edn_wrap_funcall2, reinterpret_cast<VALUE>(&args) );
          }
 
          return rb_float_new(buftotype<double>(str, len));
       }
 
+      //
+      // returns a ruby Rational
+      VALUE ratio_to_ruby(const char* str, std::size_t len)
+      {
+         return call_module_fn(rb_mEDN, EDN_MAKE_RATIONAL_METHOD, edn_prot_rb_new_str(str));
+      }
 
       //
       // read from a StringIO - handled from ruby side

data/ext/edn_turbo/util.h

@@ -31,6 +31,7 @@ namespace edn
    extern VALUE EDN_MAKE_LIST_METHOD;
    extern VALUE EDN_MAKE_SET_METHOD;
    extern VALUE EDN_MAKE_BIG_DECIMAL_METHOD;
+   extern VALUE EDN_MAKE_RATIONAL_METHOD;
    extern VALUE EDN_TAGGED_ELEM_METHOD;
    extern VALUE EDN_EOF_CONST;
 
@@ -45,6 +46,7 @@ namespace edn
       // defined in edn_parser_util.cc
       VALUE integer_to_ruby(const char* str, std::size_t len);
       VALUE float_to_ruby  (const char* str, std::size_t len);
+      VALUE ratio_to_ruby  (const char* str, std::size_t len);
 
       VALUE ruby_io_read(VALUE io);
 

data/lib/edn_turbo.rb

@@ -30,4 +30,10 @@ require 'edn_turbo/edn_turbo'
 # Replace the parser in the EDN module with the C based one.
 module EDN
   self.parser = EDNT::Parser
+
+  # makes a rational type for converting a clojure ratio
+  # - this should be in edn-ruby
+  def self.rational(value)
+    Rational(value)
+  end
 end

data/lib/edn_turbo/version.rb

@@ -21,6 +21,6 @@
 # THE SOFTWARE.
 
 module EDNT
-  VERSION = '0.6.0'.freeze
-  RELEASE_DATE = '2019-05-13'.freeze
+  VERSION = '0.6.1'.freeze
+  RELEASE_DATE = '2019-05-20'.freeze
 end

data/spec/edn_turbo/edn_parser_spec.rb

@@ -126,7 +126,7 @@ module EDNT
       end
     end
 
-    context 'numbers' do
+    context 'numeric' do
       it 'zero' do
         expect(subject.parse(' 0 ')).to eq(0)
       end
@@ -176,17 +176,43 @@ module EDNT
         expect(val).to eq(432)
         expect(val.class).to eq(Integer)
       end
-      it 'exact precision decimal' do
+      it 'exact precision integer' do
         val = subject.parse(' 12M ')
         expect(val).to eq(12)
         expect(val.class).to eq(Integer)
       end
-      # TODO: fix?
-      # it 'exact precision scientific notation' do
-      #   val = subject.parse('45.4e+43M')
-      #   expect(val).to eq(4.54e+44)
-      #   expect(val.class).to eq(Float)
-      # end
+      it 'exact precision decimal' do
+        val = subject.parse('3.0M')
+        expect(val).to eq(3.0)
+        expect(val.class).to eq(BigDecimal)
+      end
+      it 'exact precision positive decimal with exp' do
+        val = subject.parse('+3.0e44M')
+        expect(val).to eq(3e44)
+        expect(val.class).to eq(BigDecimal)
+      end
+      it 'exact precision negative decimal with exp' do
+        val = subject.parse('-3.0e44M')
+        expect(val).to eq(-3e44)
+        expect(val.class).to eq(BigDecimal)
+      end
+      it 'exact precision decimal with negative exp' do
+        val = subject.parse('3.0e-44M')
+        expect(val).to eq(3e-44)
+        expect(val.class).to eq(BigDecimal)
+      end
+      it 'ratio' do
+        val = subject.parse(' 2/3 ')
+        expect(val).to eq(Rational(2, 3))
+      end
+      it 'positive ratio' do
+        val = subject.parse(' +2/3 ')
+        expect(val).to eq(Rational(2, 3))
+      end
+      it 'negative ratio' do
+        val = subject.parse(' -2/3 ')
+        expect(val).to eq(Rational(-2, 3))
+      end
     end
 
     context 'operators' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ed Porras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn