Ticket #9880: pynac-order.patch

c_lib/include/ginac_wrap.h

@@ -136 +136 @@
 extern const ex _ex1_2;
 
 }
+
+#include <pynac/order.h>
+
+int cmp_add(const ex& lh, const ex& rh) {
+  return ex_is_greater_degrevlex::in_type(&add::tinfo_static).compare(lh,rh);
+}
+
+int cmp_mul(const ex& lh, const ex& rh) {
+  return ex_is_greater_degrevlex::in_type(&mul::tinfo_static).compare(lh,rh);
+}

sage/libs/ginac/decl.pxi

@@ -505 +505 @@
         object (*py_rational_power_parts)(object basis, object exp)
 
     py_funcs_struct py_funcs "GiNaC::py_funcs"
+
+    int cmp_add(GEx left, GEx right) except +
+    int cmp_mul(GEx left, GEx right) except +

sage/symbolic/expression.pxd

@@ -1 +1 @@
 include "../libs/ginac/decl.pxi"
 
-from sage.structure.element cimport CommutativeRingElement
-
+from sage.structure.element cimport CommutativeRingElement, Element
 
 cdef class Expression(CommutativeRingElement):
     cdef GEx _gobj
@@ -12 +11 @@
     cpdef bint is_relational(self)
     cpdef object pyobject(self)
     cpdef Expression _subs_expr(self, expr)
+    cpdef int _cmp_add(left, Element right) except -2
+    cpdef int _cmp_mul(left, Element right) except -2
     
 cdef Expression new_Expression_from_GEx(parent, GEx juice)
 cdef Expression new_Expression_from_pyobject(parent, x)
+

sage/symbolic/expression.pyx

@@ -2375 +2375 @@
     cdef int _cmp_c_impl(left, Element right) except -2:
         return left._gobj.compare((<Expression>right)._gobj)
 
+    cpdef int _cmp_add(left, Element right) except -2:
+        return cmp_add(left._gobj,(<Expression>right)._gobj)
+
+    cpdef int _cmp_mul(left, Element right) except -2:
+        return cmp_mul(left._gobj,(<Expression>right)._gobj)
+
     def __pow__(self, exp, ignored):
         """
         Return self raised to the power of exp.