Changeset d906dc in git for Singular/iparith.cc

Timestamp:

Jun 4, 2019, 2:33:32 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d4cec6ab781a81162945ff680935242fcccc952a

Parents:

56ff8efc45f5392a6e465782a66a5df5a54180f01708fac9cfbd392cceea00167eaa2746d291cd98

Message:

Merge branch 'spielwiese' into stable

File:

• Singular/iparith.cc (modified) (12 diffs)

Singular/iparith.cc

@@ -4769 +4769 @@
   if (currRing==NULL)
   {
-    WerrorS("no ring active");
+    WerrorS("no ring active (1)");
     return TRUE;
   }
@@ -5390 +5390 @@
   if (currRing==NULL)
   {
-    WerrorS("no ring active");
+    WerrorS("no ring active (2)");
     return TRUE;
   }
@@ -7685 +7685 @@
   {
     Werror("%s(`ideal`,`ideal`,`matrix`,`string`)\n"
-           "or (`module`,`module`,`matrix`,`string`)expected",
+           "or (`module`,`module`,`matrix`,`string`) expected",
            Tok2Cmdname(iiOp));
     return TRUE;
@@ -7692 +7692 @@
 static BOOLEAN jjLIFTSTD_4(leftv res, leftv U)
 {
-  const short t1[]={4,IDEAL_CMD,IDEAL_CMD,MATRIX_CMD,STRING_CMD};
-  const short t2[]={4,MODUL_CMD,MODUL_CMD,MATRIX_CMD,STRING_CMD};
+  const short t1[]={4,IDEAL_CMD,MATRIX_CMD,MODUL_CMD,STRING_CMD};
+  const short t2[]={4,MODUL_CMD,MATRIX_CMD,MODUL_CMD,STRING_CMD};
   leftv u=U;
   leftv v=u->next;
@@ -7716 +7716 @@
   else
   {
-    Werror("%s(`ideal`,`ideal`,`matrix`,`string`)\n"
-           "or (`module`,`module`,`matrix`,`string`)expected",
+    Werror("%s(`ideal`,`matrix`,`module`,`string`)\n"
+           "or (`module`,`matrix`,`module`,`string`) expected",
            Tok2Cmdname(iiOp));
     return TRUE;
@@ -7930 +7930 @@
   return FALSE;
 }
+
+static BOOLEAN jjRESERVEDLIST0(leftv res, leftv)
+{
+        unsigned i=1;
+        int l = 0;
+        int k = 0;
+        lists L = (lists)omAllocBin(slists_bin);
+        struct blackbox_list *bb_list = NULL;
+        unsigned nCount = (sArithBase.nCmdUsed-1) / 3;
+        if ((3*nCount) < sArithBase.nCmdUsed) {
+                nCount++;
+        }
+        bb_list = getBlackboxTypes();
+        // count the  number of entries;
+        for (i=0; i<nCount; i++) {
+                l++;
+                if (i + 1 + nCount < sArithBase.nCmdUsed) {
+                        l++;
+                }
+                if(i+1+2*nCount<sArithBase.nCmdUsed) {
+                        l++;
+                }
+        }
+        for (i = 0; i < bb_list->count; i++) {
+                if (bb_list->list[i] != NULL) {
+                        l++;
+                }
+        }
+        // initiate list
+        L->Init(l);
+        k = 0;
+        for (i=0; i<nCount; i++) {
+                L->m[k].rtyp = STRING_CMD;
+                L->m[k].data = omStrDup(sArithBase.sCmds[i+1].name);
+                k++;
+                // Print("%-20s", sArithBase.sCmds[i+1].name);
+                if (i + 1 + nCount < sArithBase.nCmdUsed) {
+                        L->m[k].rtyp = STRING_CMD;
+                        L->m[k].data = omStrDup(sArithBase.sCmds[i+1+nCount].name);
+                        k++;
+                        // Print("%-20s", sArithBase.sCmds[i+1 + nCount].name);
+                }
+                if(i+1+2*nCount<sArithBase.nCmdUsed) {
+                        L->m[k].rtyp = STRING_CMD;
+                        L->m[k].data = omStrDup(sArithBase.sCmds[i+1+2*nCount].name);
+                        k++;
+                        // Print("%-20s", sArithBase.sCmds[i+1+2*nCount].name);
+                }
+                // PrintLn();
+        }
+
+        // assign blackbox types
+        for (i = 0; i < bb_list->count; i++) {
+                if (bb_list->list[i] != NULL) {
+                        L->m[k].rtyp = STRING_CMD;
+                        // already used strdup in getBlackBoxTypes
+                        L->m[k].data = bb_list->list[i];
+                        k++;
+                }
+        }
+        // free the struct (not the list itself)
+        omfree(bb_list);
+
+        // pass the resultant list to the res datastructure
+        res->data=(void *)L;
+
+        return FALSE;
+}
 static BOOLEAN jjSTRING_PL(leftv res, leftv v)
 {
@@ -8152 +8220 @@
   leftv w = v->next;
   if (w==NULL) return TRUE;
-  leftv rest = w->next;;
+  leftv rest = w->next;
 
   u->next = NULL;
@@ -8355 +8423 @@
           if (RingDependend(dA2[i].res))
           {
-            WerrorS("no ring active");
+            WerrorS("no ring active (3)");
             break;
           }
@@ -8399 +8467 @@
                 if (RingDependend(dA2[i].res))
                 {
-                  WerrorS("no ring active");
+                  WerrorS("no ring active (4)");
                   break;
                 }
@@ -8582 +8650 @@
           if (RingDependend(dA1[i].res))
           {
-            WerrorS("no ring active");
+            WerrorS("no ring active (5)");
             break;
           }
@@ -8625 +8693 @@
               if (RingDependend(dA1[i].res))
               {
-                WerrorS("no ring active");
+                WerrorS("no ring active (6)");
                 break;
               }
@@ -9757 +9825 @@
   int at=a->Typ();
   leftv b=(leftv)bb;
-  int bt=b->Typ();;
+  int bt=b->Typ();
   if (at < bt) return -1;
   if (at > bt) return 1;