Attachment 873769 Details for Bug 1074597 – sagemath-singular-3.1.6.patch

[patch] sagemath-singular-3.1.6.patch

sagemath-singular-3.1.6.patch (text/plain), 2.29 KB, created by Paulo Andrade on 2014-03-12 21:36:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Andrade

Created: 2014-03-12 21:36:15 UTC

Size: 2.29 KB

patch

obsolete

>From 536a31f920117a8d048447f6b7a7477bcffc213a Mon Sep 17 00:00:00 2001
>From: Jean-Pierre Flori <jean-pierre.flori@ssi.gouv.fr>
>Date: Mon, 23 Dec 2013 23:35:07 +0000
>Subject: Update Singular function interface to API changes in Singular 3.1.6.
>
>iiMake_proc function in libsingular no longer returns an sleftv. Instead, the
>return value is a boolean error condition and the return value is stored in a
>global variable iiRETURNEXPR.
>---
>diff --git a/src/sage/libs/singular/function.pyx b/src/sage/libs/singular/function.pyx
>index 4f63ad3..3fd6853 100644
>--- a/src/sage/libs/singular/function.pyx
>+++ b/src/sage/libs/singular/function.pyx
>@@ -1035,7 +1035,15 @@ cdef class LibraryCallHandler(BaseCallHandler):
> 
>     cdef leftv* handle_call(self, Converter argument_list, ring *_ring=NULL):
>         if _ring != currRing: rChangeCurrRing(_ring)
>-        return iiMake_proc(self.proc_idhdl, NULL, argument_list.args)
>+        cdef bint error = iiMake_proc(self.proc_idhdl, NULL, argument_list.args)
>+        cdef leftv * res
>+        if not error:
>+            res = <leftv*> omAllocBin(sleftv_bin)
>+            res.Init()
>+            res.Copy(&iiRETURNEXPR)
>+            iiRETURNEXPR.Init();
>+            return res
>+        raise RuntimeError("Error raised calling singular function")
> 
>     cdef bint free_res(self):
>         """
>diff --git a/src/sage/libs/singular/singular-cdefs.pxi b/src/sage/libs/singular/singular-cdefs.pxi
>index b678a98..bc4b8ef 100644
>--- a/src/sage/libs/singular/singular-cdefs.pxi
>+++ b/src/sage/libs/singular/singular-cdefs.pxi
>@@ -338,6 +338,7 @@ cdef extern from "libsingular.h":
>         void* data
>         #data is some union, so this might be very dangerous, but I am lazy now
>         attr *attribute
>+        void (* Copy)(leftv*)
>         void (* Init)()
>         void (* CleanUp)(ring *r)
>         int  rtyp
>@@ -953,6 +954,7 @@ cdef extern from "libsingular.h":
>     #
>     # INTERPRETER
>     #
>+    leftv iiRETURNEXPR
> 
>     cdef omBin* sleftv_bin
> 
>@@ -960,7 +962,7 @@ cdef extern from "libsingular.h":
> 
>     idhdl* ggetid(char *n)
> 
>-    leftv * iiMake_proc(idhdl *pn, package *pack, leftv *sl)
>+    bint iiMake_proc(idhdl *pn, package *pack, leftv *sl)
> 
>     bint iiExprArith1(leftv *res, leftv* a, int op)
>     bint iiExprArith2(leftv *res, leftv* a, int op, leftv *b, bint proc_call)
>--
>cgit v0.9.2

Actions: View | Diff

Attachments on bug 1074597: 873769