Changeset 0de0509 in git for Singular

Timestamp:

Nov 21, 2013, 11:15:23 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

78aaec0999577dbe04c598349d696da11bf79ebd

Parents:

a9c2986e020e2efafd15932b4d1b2b2fa77407e4

Message:

chg: better error check and debug stuff for newstruct/blackbox

Location:

Singular

Files:

• extra.cc (modified) (2 diffs)
• newstruct.cc (modified) (5 diffs)

Singular/extra.cc

@@ -102 +102 @@
 #include "walk.h"
 #include <Singular/newstruct.h>
+#include <Singular/blackbox.h>
 #include <Singular/pyobject_setup.h>
 
@@ -3834 +3835 @@
       return newstruct_set_proc((char*)h->Data(),(char*)h->next->Data(),
                                 (int)(long)h->next->next->next->Data(),
-                                (procinfov)h->next->next->Data());
+                                (procinfov)h->next->next->Data());
     }
     return TRUE;
+  }
+  else
+  if (strcmp(sys_cmd,"newstruct")==0)
+  {
+    if ((h!=NULL) && (h->Typ()==STRING_CMD))
+    {
+      int id=0;
+      blackboxIsCmd((char*)h->Data(),id);
+      if (id>0)
+      {
+        blackbox *bb=getBlackboxStuff(id);
+        if (BB_LIKE_LIST(bb))
+        {
+          newstruct_desc desc=(newstruct_desc)bb->data;
+          newstructShow(desc);
+          return FALSE;
+        }
+      }
+    }
+    return TRUE;
+  }
+  else
+  if (strcmp(sys_cmd,"blackbox")==0)
+  {
+    printBlackboxTypes();
+    return FALSE;
   }
   else

Singular/newstruct.cc

@@ -260 +260 @@
       }
     }
-    if (l->Typ()==r->Typ())
+    else /*if (l->Typ()==r->Typ())*/
     {
       if (l->Data()!=NULL)
@@ -370 +370 @@
           }
           else if (RingDependend(nm->typ)
-          || (al->m[nm->pos].RingDependend()))
+          || (al->m[nm->pos].RingDependend()))
           {
             if (al->m[nm->pos].data==NULL)
@@ -402 +402 @@
             }
           }
-          else if ((nm->typ==DEF_CMD)||(nm->typ==LIST_CMD))
-          {
-            if (al->m[nm->pos-1].data==NULL)
-            {
-              al->m[nm->pos-1].data=(void*)currRing;
-              if (currRing!=NULL) currRing->ref++;
-            }
-          }
+          else if ((nm->typ==DEF_CMD)||(nm->typ==LIST_CMD))
+          {
+            if (al->m[nm->pos-1].data==NULL)
+            {
+              al->m[nm->pos-1].data=(void*)currRing;
+              if (currRing!=NULL) currRing->ref++;
+            }
+          }
           Subexpr r=(Subexpr)omAlloc0Bin(sSubexpr_bin);
           r->start = nm->pos+1;
@@ -618 +618 @@
     hh.data.pinf=p->p;
     sl=iiMake_proc(&hh,NULL,&tmp);
-    if (!sl) iiRETURNEXPR.CleanUp();
+    if (!sl)
+    {
+      if (iiRETURNEXPR.Typ()!=NONE) Warn("ignoring return value (%s)",Tok2Cmdname(iiRETURNEXPR.Typ()));
+      iiRETURNEXPR.CleanUp();
+    }
     iiRETURNEXPR.Init();
   }
@@ -772 +776 @@
     elem=elem->next;
   }
+  newstruct_proc p=d->procs;
+  while (p!=NULL)
+  {
+    Print("op:%d(%s) with %d args -> %s\n",p->t,iiTwoOps(p->t),p->args,p->p->procname);
+    p=p->next;
+  }
 }