Jerry James 51c14ed
--- ./bundled/singular/apps/ideal/src/singularIdeal.cc.orig	2014-04-04 12:57:29.000000000 -0600
Jerry James 51c14ed
+++ ./bundled/singular/apps/ideal/src/singularIdeal.cc	2014-04-07 11:24:49.447637191 -0600
98bd214
@@ -123,16 +123,16 @@ public:
Jerry James f508679
       arg.rtyp=IDEAL_CMD;
Jerry James f508679
       arg.data=(void *)idCopy(singIdeal);
Jerry James f508679
       // call radical
Jerry James f508679
-      BOOLEAN res=iiMake_proc(radical,NULL,&arg;;
Jerry James f508679
-      if (res) {
Jerry James f508679
+      leftv res=iiMake_proc(radical,NULL,&arg;;
Jerry James f508679
+      if (!res) {
Jerry James f508679
          errorreported = 0;
Jerry James f508679
-         iiRETURNEXPR.Init();
Jerry James f508679
+         iiRETURNEXPR->Init();
Jerry James f508679
          throw std::runtime_error("radical returned an error");
Jerry James f508679
       }
Jerry James f508679
-      SingularIdeal_wrap* radical_wrap = new SingularIdeal_impl((::ideal) (iiRETURNEXPR.Data()), singRing);
98bd214
+      SingularIdeal_wrap* radical_wrap = new SingularIdeal_impl((::ideal) (iiRETURNEXPR->Data()), singRing);
Jerry James f508679
       // FIXME cleanup iiRETURNEXPR ?
Jerry James f508679
-      iiRETURNEXPR.CleanUp();
Jerry James f508679
-      iiRETURNEXPR.Init();
98bd214
+      iiRETURNEXPR->CleanUp();
98bd214
+      iiRETURNEXPR->Init();
Jerry James f508679
       return radical_wrap;
Jerry James f508679
    }
Jerry James f508679
 
98bd214
@@ -145,9 +145,9 @@ public:
Jerry James f508679
       arg.rtyp=IDEAL_CMD;
Jerry James f508679
       arg.data=(void *)idCopy(singIdeal);
Jerry James f508679
       // call primdecSY
Jerry James f508679
-      BOOLEAN res=iiMake_proc(primdecSY,NULL,&arg;;
Jerry James f508679
-      if(!res && (iiRETURNEXPR.Typ() == LIST_CMD)){
Jerry James f508679
-         lists L = (lists)iiRETURNEXPR.Data();
Jerry James f508679
+      leftv res=iiMake_proc(primdecSY,NULL,&arg;;
98bd214
+      if(res && (iiRETURNEXPR->Typ() == LIST_CMD)){
98bd214
+         lists L = (lists)iiRETURNEXPR->Data();
Jerry James f508679
          Array<SingularIdeal_wrap*> result(L->nr+1);
Jerry James f508679
          for(int j=0; j<=L->nr; j++){
Jerry James f508679
             lists LL = (lists)L->m[j].Data();
98bd214
@@ -158,11 +158,11 @@ public:
Jerry James f508679
             }
Jerry James f508679
          }
Jerry James f508679
          // FIXME cleanup returndata ?
Jerry James f508679
-         iiRETURNEXPR.CleanUp();
Jerry James f508679
-         iiRETURNEXPR.Init();
98bd214
+         iiRETURNEXPR->CleanUp();
98bd214
+         iiRETURNEXPR->Init();
Jerry James f508679
          return result;
Jerry James f508679
       } else {
Jerry James f508679
-         iiRETURNEXPR.Init();
Jerry James f508679
+         iiRETURNEXPR->Init();
Jerry James f508679
          throw std::runtime_error("Something went wrong for the primary decomposition");
Jerry James f508679
       }
Jerry James f508679
    }
98bd214
@@ -184,11 +184,11 @@ public:
Jerry James f508679
       int plevel = printlevel;
Jerry James f508679
       printlevel=-1;
Jerry James f508679
       // call solve
Jerry James f508679
-      BOOLEAN res=iiMake_proc(solve,NULL,&arg;;
Jerry James f508679
+      leftv res=iiMake_proc(solve,NULL,&arg;;
Jerry James f508679
       printlevel=plevel;
Jerry James f508679
-      if(!res && (iiRETURNEXPR.Typ() == RING_CMD)){
98bd214
+      if(res && (iiRETURNEXPR->Typ() == RING_CMD)){
Jerry James f508679
          // retrieve returned ring
Jerry James f508679
-         ring solring = (ring)iiRETURNEXPR.Data();
98bd214
+         ring solring = (ring)iiRETURNEXPR->Data();
Jerry James f508679
          // avoid redefinition message
Jerry James 51c14ed
          BITSET oldverb;
Jerry James 51c14ed
          SI_SAVE_OPT2(oldverb);