Changeset f92a39 in git for Singular/ipshell.cc

Timestamp:

Oct 15, 2012, 7:44:58 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d6b9d791f6efb67f432972147de4dfd0f4081862

Parents:

17874ed75ee295b8f839c9c6087da10a82e6ff2e

Message:

fix: implementation of return(..) improved

File:

• Singular/ipshell.cc (modified) (4 diffs)

Singular/ipshell.cc

@@ -393 +393 @@
   if (iiRETURNEXPR_len > myynest)
   {
-    int t=iiRETURNEXPR[myynest].Typ();
-    if ((/*iiRETURNEXPR[myynest].Typ()*/ t==RING_CMD)
-    || (/*iiRETURNEXPR[myynest].Typ()*/ t==QRING_CMD))
-    {
-      leftv h=&iiRETURNEXPR[myynest];
+    int t=iiRETURNEXPR.Typ();
+    if ((/*iiRETURNEXPR.Typ()*/ t==RING_CMD)
+    || (/*iiRETURNEXPR.Typ()*/ t==QRING_CMD))
+    {
+      leftv h=&iiRETURNEXPR;
       if (((ring)h->data)->idroot!=NULL)
         killlocals0(v,&(((ring)h->data)->idroot),(ring)h->data);
     }
-    else if (/*iiRETURNEXPR[myynest].Typ()*/ t==LIST_CMD)
-    {
-      leftv h=&iiRETURNEXPR[myynest];
+    else if (/*iiRETURNEXPR.Typ()*/ t==LIST_CMD)
+    {
+      leftv h=&iiRETURNEXPR;
       changed |=killlocals_list(v,(lists)h->data);
     }
@@ -2147 +2147 @@
   // 5: D
 
-  ring R = (ring) omAlloc0Bin(sip_sring_bin); // why
-
-
-  //assume( R->cf == NULL );
+  ring R = (ring) omAlloc0Bin(sip_sring_bin);
+
 
   // ------------------------------------------------------------------
@@ -2486 +2484 @@
 
 #ifdef HAVE_RINGS
-  // This was a BUG IN SINGULAR: There is no HABE_RINGS!!!
-
 // currently, coefficients which are ring elements require a global ordering:
   if (rField_is_Ring(R) && (R->OrdSgn==-1))
@@ -5584 +5580 @@
         sLastPrinted.CleanUp();
       }
-      if ((myynest>0) && (iiRETURNEXPR[myynest].RingDependend()))
+      if ((myynest>0) && (iiRETURNEXPR.RingDependend()))
       {
         WerrorS("return value depends on local ring variable (export missing ?)");
-        iiRETURNEXPR[myynest].CleanUp();
+        iiRETURNEXPR.CleanUp();
       }
       currRing=NULL;