Changeset e1859b in git for Singular/iparith.cc

Timestamp:

May 26, 2019, 9:33:22 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

1708fac9cfbd392cceea00167eaa2746d291cd98

Parents:

5c0680a81e434b189faabda5d2d0aa0bbcff343c

Message:

Add proc reservedNamesList, similar to reservedNames

File:

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

Singular/iparith.cc

@@ -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;
@@ -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;