Changeset e7463f in git

Timestamp:

Mar 17, 2011, 6:23:03 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

bb08d5b1bb68c30edc7e32f68fe823249cbc3c63

Parents:

4199b35cfc53b9be00ef55a9d8750f9f784d4254

Message:

fix tr. 323

git-svn-id: file:///usr/local/Singular/svn/trunk@14012 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/subexpr.cc

@@ -145 +145 @@
         case RESOLUTION_CMD:
         {
-          syStrategy tmp=(syStrategy)d; 
+          syStrategy tmp=(syStrategy)d;
           syPrint(tmp);
           break;
@@ -263 +263 @@
   {
     if ((store!=NULL)
-    && (store!=this)
-    && (t/*Typ()*/!=LINK_CMD)
-    && (t/*Typ()*/!=RING_CMD)
-    && (t/*Typ()*/!=QRING_CMD)
-    && (t/*Typ()*/!=POINTER_CMD)
-    && (t/*Typ()*/!=PACKAGE_CMD)
-    && (t/*Typ()*/!=PROC_CMD)
-    && (t/*Typ()*/!=DEF_CMD)
-    )
-    {
-      store->rtyp=t/*Typ()*/;
-      store->data=CopyD();
-      if(attribute!=NULL)
-      {
-        store->attribute=CopyA();
-      }
-      store->flag=flag;
+    && (store!=this))
+    {
+      if((t/*Typ()*/!=LINK_CMD)
+      && (t/*Typ()*/!=POINTER_CMD)
+      && (t/*Typ()*/!=PACKAGE_CMD)
+      && (t/*Typ()*/!=DEF_CMD)
+      )
+      {
+        store->rtyp=t/*Typ()*/;
+        store->data=CopyD();
+        if(attribute!=NULL)
+        {
+          store->attribute=CopyA();
+        }
+        store->flag=flag;
+      }
     }
   }
@@ -403 +402 @@
         ring r=(ring)d;
         r->ref++;
+        //Print("+  ring %d, ref %d\n",r,r->ref);
         return d;
       }
@@ -500 +500 @@
       ring R=(ring)d;
       #ifdef TEST
-      if (R==currRing)
-        PrintS("currRing?\n");
+      if ((R==currRing)&&(R->ref<=0))
+        Print("currRing? ref=%d\n",R->ref);
       else
       #endif