parsecs 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d850257e0e5d9d26760ea04e158f9f08e96f1440b8495b0f1dc81973e4b68f23
-  data.tar.gz: 270303f76489572601d29a3cee954bd7d4c00908bf0bb5eb6cd05ab6f6f3fe4e
+  metadata.gz: 2e7b3b272aa00c84d85c8ed2e54564840f6cda8d34865125a7e2b47eb2313946
+  data.tar.gz: 9a0eca31231d8dbcd6d5006e0e0c3e1de8d008e4cf5d6891a50af7fd25924c01
 SHA512:
-  metadata.gz: 722c0c885e316e152350f47461bd1fae9e4c3dae0ded6f4bb0347c277ebf741cdec076d06492cb004ebf3b47d628eda31ace66dc041710fa7e2c388a6b39b115
-  data.tar.gz: be27c26f0f36f5c7567fb38170bbf9ba386d0ee7b4af7577d1d3bc16e8f96d120aeb0b265434963ec6da6a3f3142a2f524115911eb2f10f977d770a792b391ac
+  metadata.gz: 5e9a252ffde2b57982a3bd68491d144514af414ff7bc5235002b914ecae0a11eff42a95db1acc22b5acb4e81165d6cf80f5f04f1379733f221ae4955c54a5327
+  data.tar.gz: b1709ff79e5870d03c1579ec717d5ef9c932838fecbee26cb3e5c132b168e606a35c8a2cd6302ff6aef38062c3708a59abf605a13b3f305bc4ae890d962584f1

data/ext/libnativemath/libnativemath.cpp

@@ -1,5 +1,4 @@
 /* ext/libnativemath.cpp */
-#include <string>
 #include <iostream>
 #include <cmath>
 #include "mpParser.h"
@@ -34,21 +33,16 @@ Value Calc(string input) {
   return ans;
 }
 
-string native_direct_eval(string input) {
+string_type native_direct_eval(string_type input) {
   Value ans = Calc(input);
   return ans.AsString();
 }
 
-string native_eval(string input) {
+int native_eval(string input, char *value, char *value_type) {
   Value ans = Calc(input);
-  stringstream_type ss;
 
-  // Converting to json-like string
-  ss << _T("{");
-  ss << _T("\"value\": \"") << ans.AsString() << _T("\"");
-  ss << _T(", ");
-  ss << _T("\"type\": \"") << ans.GetType() << _T("\"");
-  ss << _T("}");
+  value_type[0] = ans.GetType();
 
-  return ss.str();
+  strcpy(value, ans.AsString().c_str());
+  return 0;
 }

data/ext/libnativemath/libnativemath.h

@@ -1,3 +1,3 @@
 /* ext/libnativemath.h */
 std::string native_direct_eval(std::string input);
-std::string native_eval(std::string input);
+int native_eval(std::string input, char *value, char *value_type);

data/ext/libnativemath/libnativemath.i

@@ -6,4 +6,28 @@
 %}
 
 extern std::string native_direct_eval(std::string input);
-extern std::string native_eval(std::string input);
+
+%typemap(in, numinputs=0) (char *value, char *value_type) {
+  char a[1000];
+  char b;
+  $1 = a;
+  $2 = &b;
+};
+%typemap(argout) (char *value, char *value_type) {
+  if(result == 0) {
+    $result = rb_hash_new();
+    rb_hash_aset($result, rb_str_new2("value"), rb_str_new2($1));
+    switch (*$2) {
+      case 'i': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("int")); break;
+      case 'f': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("float")); break;
+      case 's': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("string")); break;
+      case 'b': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("boolean")); break;
+      case 'c': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("complex")); break;
+      case 'm': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("matrix")); break;
+    }
+  } else {
+    $result = Qfalse;
+  }
+}
+
+extern int native_eval(std::string input, char *value, char *value_type);

data/lib/parsec.rb

@@ -1,29 +1,28 @@
 require 'string_to_boolean_refinements'
 require 'libnativemath'
-require 'json'
 
 module Parsec
   # This is the main class responsible to evaluate the equations
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.2.18'.freeze
+    VERSION = '0.2.19'.freeze
 
     # evaluates the equation
     def self.eval_equation(equation)
       remove_spaces(equation)
 
-      convert(JSON.parse(Libnativemath.native_eval(equation)))
+      convert(Libnativemath.native_eval(equation))
     end
 
     # returns true or raise an error
     def self.validate_syntax(equation)
-      validate(JSON.parse(Libnativemath.native_eval(equation)), true)
+      validate(Libnativemath.native_eval(equation), true)
     end
 
     # returns true or an error string
     def self.verify_syntax(equation)
-      validate(JSON.parse(Libnativemath.native_eval(equation)), false)
+      validate(Libnativemath.native_eval(equation), false)
     end
 
     private_class_method
@@ -41,12 +40,11 @@ module Parsec
       end
 
       case ans['type']
-      when 'i'  then return ans['value'].to_i
-      when 'f'  then return ans['value'].to_f
-      when 'b'  then return ans['value'].to_bool
-      when 's'  then return error_check(ans['value'])
-      when 'c'  then return 'complex number' # Maybe future implementation
-      when 'm'  then return 'matrix value'   # Maybe future implementation
+      when 'int'     then return ans['value'].to_i
+      when 'float'   then return ans['value'].to_f
+      when 'boolean' then return ans['value'].to_bool
+      when 'string'  then return error_check(ans['value'])
+      when 'c'       then return 'complex number'
       end
     end
 
@@ -56,7 +54,7 @@ module Parsec
     end
 
     def self.validate(ans, raise_error)
-      if (ans['type'] == 's') && ans['value'].include?('Error: ')
+      if (ans['type'] == 'string') && ans['value'].include?('Error: ')
         raise SyntaxError, ans['value'].sub('Error: ', '') if raise_error
         return ans['value'].sub('Error: ', '')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecs
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Nilton Vasques
@@ -82,7 +82,7 @@ requirements:
 - swig
 - cmake
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem to evaluate equations using muparserx C++ library