Merge branch 'master' of http://github.com/symengine/symengine.rb into double2

Author: rajithv

ext/symengine/ruby_complex.c

@@ -1,37 +1,9 @@
 #include "ruby_complex.h"
 
 VALUE ccomplex_real_part(VALUE self) {
-    basic_struct *c_result = basic_new_heap();
-
-    basic cbasic_operand;
-    basic_new_stack(cbasic_operand);
-
-    VALUE result;
-
-    sympify(self, cbasic_operand);
-    complex_real_part(c_result, cbasic_operand);
-
-    result = Data_Wrap_Struct(Klass_of_Basic(c_result), NULL, cbasic_free_heap, c_result);
-    
-    basic_free_stack(cbasic_operand);
-
-    return result;
+    return function_onearg(complex_real_part, self);
 }
 
 VALUE ccomplex_imaginary_part(VALUE self) {
-    basic_struct *c_result = basic_new_heap();
-
-    basic cbasic_operand;
-    basic_new_stack(cbasic_operand);
-
-    VALUE result;
-
-    sympify(self, cbasic_operand);
-    complex_imaginary_part(c_result, cbasic_operand);
-
-    result = Data_Wrap_Struct(Klass_of_Basic(c_result), NULL, cbasic_free_heap, c_result);
-    
-    basic_free_stack(cbasic_operand);
-
-    return result;
+    return function_onearg(complex_imaginary_part, self);
 }

ext/symengine/ruby_constant.c

@@ -1,35 +1,28 @@
 #include "ruby_constant.h"
 
-VALUE cconstant_const(void (*cwfunc_ptr)(basic_struct*)) {
+VALUE cconstant_const(void (*cwfunc_ptr)(basic_struct*), VALUE klass) {
     basic_struct *cresult;
     VALUE result;
 
     cresult = basic_new_heap();
     cwfunc_ptr(cresult);
 
-    result = Data_Wrap_Struct(c_constant, NULL, cbasic_free_heap, cresult);
+    result = Data_Wrap_Struct(klass, NULL, cbasic_free_heap, cresult);
     return result;
 }
 
 VALUE cconstant_pi() {
-    return cconstant_const(basic_const_pi);
+    return cconstant_const(basic_const_pi, c_constant);
 }
 
 VALUE cconstant_e() {
-    return cconstant_const(basic_const_E);
+    return cconstant_const(basic_const_E, c_constant);
 }
 
 VALUE cconstant_euler_gamma() {
-    return cconstant_const(basic_const_EulerGamma);
+    return cconstant_const(basic_const_EulerGamma, c_constant);
 }
 
 VALUE cconstant_i() {
-    basic_struct *cresult;
-    VALUE result;
-
-    cresult = basic_new_heap();
-    basic_const_I(cresult);
-    
-    result = Data_Wrap_Struct(c_complex, NULL, cbasic_free_heap, cresult);
-    return result;
+    return cconstant_const(basic_const_I, c_complex);
 }

ext/symengine/ruby_constant.h

@@ -7,7 +7,7 @@
 #include "symengine.h"
 #include "symengine_utils.h"
 
-VALUE cconstant_const(void (*cwfunc_ptr)(basic_struct*));
+VALUE cconstant_const(void (*cwfunc_ptr)(basic_struct*), VALUE klass);
 
 VALUE cconstant_pi();
 

lib/symengine/complex.rb

@@ -1,7 +1,7 @@
 module SymEngine
   class Complex
     def to_c
-        self.to_s.sub('I', 'i').sub('*','').gsub(' ','').to_c
+        to_s.tr('I', 'i').delete(' *').to_c
     end
   end
 end 

spec/complex_spec.rb

@@ -1,5 +1,5 @@
 describe SymEngine::Complex do
-  context '#initialize' do
+  context 'Convert to SymEngine types' do
     context 'with a Complex' do
       subject { SymEngine(Complex(2, 3)) }
 

spec/rational_spec.rb

@@ -1,5 +1,5 @@
 describe SymEngine::Rational do
-  context '#initialize' do
+  context 'Convert to SymEngine types' do
     context 'with a Rational' do
       subject { SymEngine(Rational('2/3')) }