Changeset 10ea86a in git for Singular/iparith.cc

Timestamp:

Feb 10, 2021, 2:21:22 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

128f6e114bf15118ac5e6486fce5d0b0c7b5d099

Parents:

ad3ce5bc5a80205609240191f75599c26d8da182

Message:

format, debug helper (option Imap)

File:

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

Singular/iparith.cc

@@ -2152 +2152 @@
     int par_perm_size=0;
     BOOLEAN bo;
-    if ((nMap=n_SetMap(r->cf,currRing->cf))==NULL)
+    nMap=n_SetMap(r->cf,currRing->cf);
+    if (nMap==NULL)
     {
       // Allow imap/fetch to be make an exception only for:
@@ -2165 +2166 @@
         goto err_fetch;
       }
+    }
+    else
+    {
+      par_perm_size=rPar(r);
     }
     if ((iiOp!=FETCH_CMD) || (r->N!=currRing->N) || (rPar(r)!=rPar(currRing)))
@@ -2211 +2216 @@
       }
     }
-    if ((iiOp==FETCH_CMD) &&(BVERBOSE(V_IMAP)))
+    if (BVERBOSE(V_IMAP))
     {
       unsigned i;
@@ -7920 +7925 @@
 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 entries itself, which were allocated
-        // by strdup)
-        omfree(bb_list->list);
-        omfree(bb_list);
-
-        // pass the resultant list to the res datastructure
-        res->data=(void *)L;
-
-        return FALSE;
+  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 entries itself, which were allocated
+  // by strdup)
+  omfree(bb_list->list);
+  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)