parsecs 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4695aaa62f4e133872d9221c795666205cc147d91d1c05dcc60b40a938ed540
-  data.tar.gz: c86c2a15be806e8f5a3d6952b94426293214fc325b92a37e556181f48169fdaf
+  metadata.gz: d850257e0e5d9d26760ea04e158f9f08e96f1440b8495b0f1dc81973e4b68f23
+  data.tar.gz: 270303f76489572601d29a3cee954bd7d4c00908bf0bb5eb6cd05ab6f6f3fe4e
 SHA512:
-  metadata.gz: b9a0cb09771ea71a24f2d5397935025bc88bbae6757bc6b6c24aeb18646ebea600afacace90a10b32d1dee4dae371ed49b6fd0499456f9fc4009483bfce19f65
-  data.tar.gz: 70b6e172a0e102e4a7678a2e9f3a1860e80cbe06018e66060213b1d47df222527a2daa0bb1d6aab3c22318daf6a2ff42196650513b7b1e267decb53575b32233
+  metadata.gz: 722c0c885e316e152350f47461bd1fae9e4c3dae0ded6f4bb0347c277ebf741cdec076d06492cb004ebf3b47d628eda31ace66dc041710fa7e2c388a6b39b115
+  data.tar.gz: be27c26f0f36f5c7567fb38170bbf9ba386d0ee7b4af7577d1d3bc16e8f96d120aeb0b265434963ec6da6a3f3142a2f524115911eb2f10f977d770a792b391ac

data/ext/libnativemath/extconf.rb

@@ -37,9 +37,11 @@ libs.each do |lib|
   $LOCAL_LIBS << "#{lib} "
 end
 
+GIT_REPOSITORY = 'https://github.com/niltonvasques/equations-parser.git'.freeze
+
 Dir.chdir(BASEDIR) do
   system('git init')
-  system('git submodule add https://github.com/niltonvasques/equations-parser.git ext/equations-parser')
+  system("git submodule add #{GIT_REPOSITORY} ext/equations-parser")
   system('git submodule update --init --recursive')
 
   Dir.chdir('ext/equations-parser/') do

data/ext/libnativemath/libnativemath.cpp

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

data/ext/libnativemath/libnativemath.h

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

data/ext/libnativemath/libnativemath.i

@@ -6,29 +6,4 @@
 %}
 
 extern std::string native_direct_eval(std::string input);
-
-%typemap(in, numinputs=0) (char *value, char *value_type) {
-  $1 = (char *)malloc(100 * sizeof(char));
-  $2 = (char *)malloc(2 * sizeof(char));
-};
-%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 'm': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("matrix")); 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;
-    }
-  } else {
-    $result = Qfalse;
-  }
-}
-
-%typemap(freearg) (char *value, char *value_type) {
-  free($1);
-  free($2);
-}
-extern int native_eval(std::string input, char *value, char *value_type);
+extern std::string native_eval(std::string input);

data/lib/parsec.rb

@@ -1,28 +1,29 @@
 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.17'.freeze
+    VERSION = '0.2.18'.freeze
 
     # evaluates the equation
     def self.eval_equation(equation)
       remove_spaces(equation)
 
-      convert(Libnativemath.native_eval(equation))
+      convert(JSON.parse(Libnativemath.native_eval(equation)))
     end
 
     # returns true or raise an error
     def self.validate_syntax(equation)
-      validate(Libnativemath.native_eval(equation), true)
+      validate(JSON.parse(Libnativemath.native_eval(equation)), true)
     end
 
     # returns true or an error string
     def self.verify_syntax(equation)
-      validate(Libnativemath.native_eval(equation), false)
+      validate(JSON.parse(Libnativemath.native_eval(equation)), false)
     end
 
     private_class_method
@@ -40,21 +41,22 @@ module Parsec
       end
 
       case ans['type']
-      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 syntax_check(ans['value'])
-      when 'c'       then return 'complex number'
+      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
       end
     end
 
-    def self.syntax_check(output)
+    def self.error_check(output)
       raise SyntaxError, output.sub('Error: ', '') if output.include?('Error')
       output.delete('\"')
     end
 
     def self.validate(ans, raise_error)
-      if (ans['type'] == 'string') && ans['value'].include?('Error: ')
+      if (ans['type'] == 's') && 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.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Nilton Vasques
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest