basic == unknown object return false now

Author: isuruf

ext/symengine/ruby_basic.c

@@ -90,12 +90,15 @@ VALUE cbasic_diff(VALUE self, VALUE operand2) {
 }
 
 VALUE cbasic_eq(VALUE self, VALUE operand2) {
+
     basic_struct *this;
 
     basic cbasic_operand2;
     basic_new_stack(cbasic_operand2);
     Data_Get_Struct(self, basic_struct, this);
-    sympify(operand2, cbasic_operand2);
+
+    VALUE ret = check_sympify(operand2, cbasic_operand2);
+    if (ret == Qfalse) return Qfalse;
 
     VALUE ret_val = basic_eq(this, cbasic_operand2) ? Qtrue : Qfalse;
     basic_free_stack(cbasic_operand2);
@@ -109,7 +112,9 @@ VALUE cbasic_neq(VALUE self, VALUE operand2) {
     basic cbasic_operand2;
     basic_new_stack(cbasic_operand2);
     Data_Get_Struct(self, basic_struct, this);
-    sympify(operand2, cbasic_operand2);
+
+    VALUE ret = check_sympify(operand2, cbasic_operand2);
+    if (ret == Qfalse) return Qtrue;
 
     VALUE ret_val =  basic_neq(this, cbasic_operand2) ? Qtrue : Qfalse;
     basic_free_stack(cbasic_operand2);

ext/symengine/symengine_utils.c

@@ -1,13 +1,13 @@
 #include "symengine_utils.h"
 #include "symengine.h"
 
-void sympify(VALUE operand2, basic_struct *cbasic_operand2) {
+VALUE check_sympify(VALUE operand2, basic_struct *cbasic_operand2) {
 
     basic_struct *temp;
     VALUE new_operand2;
     VALUE a, b;
     double f;
-    char *c;
+    const char *c;
 
     switch(TYPE(operand2)) {
         case T_FIXNUM:
@@ -73,7 +73,15 @@ void sympify(VALUE operand2, basic_struct *cbasic_operand2) {
             }
             #endif //HAVE_SYMENGINE_MPFR
         default:
-            rb_raise(rb_eTypeError, "%s can't be coerced into SymEngine::Basic", rb_obj_classname(operand2));
+            return Qfalse;
+    }
+    return Qtrue;
+}
+
+void sympify(VALUE operand2, basic_struct *cbasic_operand2) {
+    VALUE ret = check_sympify(operand2, cbasic_operand2);
+    if (ret == Qfalse) {
+        rb_raise(rb_eTypeError, "%s can't be coerced into SymEngine::Basic", rb_obj_classname(operand2));
     }
 }
 

ext/symengine/symengine_utils.h

@@ -7,8 +7,10 @@
 
 VALUE rb_cBigDecimal;
 
-//Returns the pointer wrapped inside the Ruby VALUE
+//Coerces operand2 into a SymEngine object
 void sympify(VALUE operand2, basic_struct *cbasic_operand2);
+//Coerces operand2 into a SymEngine object and returns whether successful
+VALUE check_sympify(VALUE operand2, basic_struct *cbasic_operand2);
 //Returns the pointer wrapped inside the Ruby Fixnum or Bignum 
 void get_symintfromval(VALUE operand2, basic_struct *cbasic_operand2);
 //Returns the Ruby class of the corresponding basic_struct pointer