Fixes #47

Author: rajithv

ext/symengine/ruby_integer.c

@@ -3,7 +3,7 @@
 VALUE cinteger_init(VALUE self, VALUE num_value) {
     basic_struct *this;
     Data_Get_Struct(self, basic_struct, this);
-    GET_SYMINTFROMVAL(num_value, this);
+    get_symintfromval(num_value, this);
     return self;
 }
 

ext/symengine/symengine_utils.c

@@ -11,7 +11,7 @@ void sympify(VALUE operand2, basic_struct *cbasic_operand2) {
     switch(TYPE(operand2)) {
         case T_FIXNUM:
         case T_BIGNUM:
-            GET_SYMINTFROMVAL(operand2, cbasic_operand2);
+            get_symintfromval(operand2, cbasic_operand2);
             break;
 
         case T_FLOAT:         
@@ -27,8 +27,8 @@ void sympify(VALUE operand2, basic_struct *cbasic_operand2) {
             basic_new_stack(num_basic);
             basic_new_stack(den_basic);
 
-            GET_SYMINTFROMVAL(num, num_basic);
-            GET_SYMINTFROMVAL(den, den_basic);
+            get_symintfromval(num, num_basic);
+            get_symintfromval(den, den_basic);
 
             rational_set(cbasic_operand2, num_basic, den_basic);
 
@@ -66,6 +66,19 @@ void sympify(VALUE operand2, basic_struct *cbasic_operand2) {
     }
 }
 
+void get_symintfromval(VALUE operand2, basic_struct *cbasic_operand2)
+{
+    if ( TYPE(operand2) == T_FIXNUM ){
+        int i = NUM2INT( operand2 );
+        integer_set_si(cbasic_operand2, i);
+    } else if ( TYPE(operand2) == T_BIGNUM ){
+        VALUE Rb_Temp_String = rb_funcall(operand2, rb_intern("to_s"), 0, NULL);
+        integer_set_str(cbasic_operand2, StringValueCStr(Rb_Temp_String));
+    } else {
+        rb_raise(rb_eTypeError, "Invalid Type: Fixnum or Bignum required");
+    }
+}
+
 VALUE Klass_of_Basic(const basic_struct *basic_ptr) {
     switch(basic_get_type(basic_ptr)) {
         case SYMENGINE_SYMBOL:

ext/symengine/symengine_utils.h

@@ -1,12 +1,14 @@
-#ifndef SYMENGINE_MACROS_H_
-#define SYMENGINE_MACROS_H_
+#ifndef SYMENGINE_UTILS_H_
+#define SYMENGINE_UTILS_H_
 
 #include "ruby.h"
 #include "ruby_basic.h"
 #include "symengine/cwrapper.h"
 
 //Returns the pointer wrapped inside the Ruby VALUE
 void 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
 VALUE Klass_of_Basic(const basic_struct *basic_ptr);
 //Returns the result from the function pointed by cwfunc_ptr: for one argument functions
@@ -15,13 +17,4 @@ VALUE function_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), VA
 VALUE function_twoarg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*, const basic_struct*),
                       VALUE operand1, VALUE operand2);
 
-//Obtains the value from Ruby Fixnum or Bignum to an already allocated basic_struct
-#define GET_SYMINTFROMVAL(num_value, this) { \
-    if ( ! RB_TYPE_P(num_value, T_FIXNUM) && ! RB_TYPE_P(num_value, T_BIGNUM) ) { \
-        rb_raise(rb_eTypeError, "Invalid Type: Fixnum or Bignum required"); \
-    } \
-    VALUE Rb_Temp_String = rb_funcall(num_value, rb_intern("to_s"), 0, NULL); \
-    integer_set_str(this, StringValueCStr(Rb_Temp_String)); \
-    }
-
-#endif //SYMENGINE_MACROS_H_
+#endif //SYMENGINE_UTILS_H_