Use arithmetic operators from libgap-api.h. Refs #2.

gappy/gap_includes.pxd

@@ -42,6 +42,16 @@ cdef extern from "gap/libgap-api.h" nogil:
             GAP_CallbackFunc markBagsCallback, GAP_CallbackFunc errorCallback,
             int handleSignals)
 
+    # Arithmetic and operators
+    Obj GAP_SUM(Obj, Obj)
+    Obj GAP_DIFF(Obj, Obj)
+    Obj GAP_PROD(Obj, Obj)
+    Obj GAP_QUO(Obj, Obj)
+    Obj GAP_POW(Obj, Obj)
+    Obj GAP_MOD(Obj, Obj)
+    int GAP_EQ(Obj opL, Obj opR)
+    int GAP_LT(Obj opL, Obj opR)
+
     # Evaluation
     Obj GAP_EvalString(const char *) except *
     Obj GAP_EvalStringNoExcept "GAP_EvalString"(const char *)
@@ -85,17 +95,6 @@ cdef extern from "gap/libgap-api.h" nogil:
     Obj GAP_NewPrecord(Int)
 
 
-cdef extern from "gap/ariths.h" nogil:
-    Obj SUM(Obj, Obj)
-    Obj DIFF(Obj, Obj)
-    Obj PROD(Obj, Obj)
-    Obj QUO(Obj, Obj)
-    Obj POW(Obj, Obj)
-    Obj MOD(Obj, Obj)
-    bint EQ(Obj opL, Obj opR)
-    bint LT(Obj opL, Obj opR)
-
-
 cdef extern from "gap/bool.h" nogil:
     cdef Obj GAP_True "True"
     cdef Obj GAP_False "False"

gappy/gapobj.pyx

@@ -998,7 +998,7 @@ cdef class GapObj:
         sig_on()
         try:
             GAP_Enter()
-            return EQ(self.value, other.value)
+            return GAP_EQ(self.value, other.value)
         finally:
             GAP_Leave()
             sig_off()
@@ -1020,7 +1020,7 @@ cdef class GapObj:
         sig_on()
         try:
             GAP_Enter()
-            return LT(self.value, other.value)
+            return GAP_LT(self.value, other.value)
         finally:
             GAP_Leave()
             sig_off()
@@ -1055,7 +1055,7 @@ cdef class GapObj:
         try:
             sig_GAP_Enter()
             sig_on()
-            result = SUM(self.value, (<GapObj>right).value)
+            result = GAP_SUM(self.value, (<GapObj>right).value)
             sig_off()
         finally:
             GAP_Leave()
@@ -1089,7 +1089,7 @@ cdef class GapObj:
         try:
             sig_GAP_Enter()
             sig_on()
-            result = DIFF(self.value, (<GapObj>right).value)
+            result = GAP_DIFF(self.value, (<GapObj>right).value)
             sig_off()
         finally:
             GAP_Leave()
@@ -1124,7 +1124,7 @@ cdef class GapObj:
         try:
             sig_GAP_Enter()
             sig_on()
-            result = PROD(self.value, (<GapObj>right).value)
+            result = GAP_PROD(self.value, (<GapObj>right).value)
             sig_off()
         finally:
             GAP_Leave()
@@ -1165,7 +1165,7 @@ cdef class GapObj:
         try:
             sig_GAP_Enter()
             sig_on()
-            result = QUO(self.value, (<GapObj>right).value)
+            result = GAP_QUO(self.value, (<GapObj>right).value)
             sig_off()
         finally:
             GAP_Leave()
@@ -1198,7 +1198,7 @@ cdef class GapObj:
         try:
             sig_GAP_Enter()
             sig_on()
-            result = MOD(self.value, (<GapObj>right).value)
+            result = GAP_MOD(self.value, (<GapObj>right).value)
             sig_off()
         finally:
             GAP_Leave()
@@ -1276,7 +1276,7 @@ cdef class GapObj:
         try:
             sig_GAP_Enter()
             sig_on()
-            result = POW(self.value, (<GapObj>other).value)
+            result = GAP_POW(self.value, (<GapObj>other).value)
             sig_off()
         finally:
             GAP_Leave()