Changeset 137883e in git

Timestamp:

Feb 25, 2014, 2:51:01 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

76df619ea2e1d07990ab83e0f5acd9cc2ccece97

Parents:

e8f898970062b0449f9db166877f0e1811d15b63

Message:

chg: option(warn): warn if def is used to much

Location:

Singular

Files:

• ipassign.cc (modified) (1 diff)
• ipshell.cc (modified) (5 diffs)

Singular/ipassign.cc

@@ -865 +865 @@
   if (lt==DEF_CMD)
   {
+    if (TEST_V_ALLWARN
+    && (rt!=RING_CMD)
+    && (rt!=QRING_CMD)
+    && (l->name!=NULL)
+    && (l->e==NULL)
+    && (iiCurrArgs==NULL) /* not in proc header */
+    )
+    {
+      Warn("use `%s` instead of `def`",Tok2Cmdname(rt));
+    }
     if (l->rtyp==IDHDL)
     {

Singular/ipshell.cc

@@ -1155 +1155 @@
   }
   leftv h=iiCurrArgs;
+  leftv rest=h->next; /*iiCurrArgs is not NULLi here*/
+  BOOLEAN is_default_list=FALSE;
   if (strcmp(p->name,"#")==0)
   {
+    is_default_list=TRUE;
+    rest=NULL;
+  }
+  else
+  {
+    h->next=NULL;
+  }
+  BOOLEAN res=iiAssign(p,h);
+  if (is_default_list)
+  {
     iiCurrArgs=NULL;
   }
   else
   {
-    iiCurrArgs=h->next;
-    h->next=NULL;
-  }
-  BOOLEAN res=iiAssign(p,h);
+    iiCurrArgs=rest;
+  }
   h->CleanUp();
   omFreeBin((ADDRESS)h, sleftv_bin);
@@ -2198 +2208 @@
     lists v=(lists)L->m[1].Data();
     R->N = v->nr+1;
-    if (R->N<=0) 
+    if (R->N<=0)
     {
       WerrorS("no ring variables");
@@ -5057 +5067 @@
       else // (0/p, a, b, ..., z)
       {
-        if ((ch!=0) && (ch!=IsPrime(ch)))
-        {
-          WerrorS("too many parameters");
-          goto rInitError;
-        }
+        if ((ch!=0) && (ch!=IsPrime(ch)))
+        {
+          WerrorS("too many parameters");
+          goto rInitError;
+        }
 
         char ** names = (char**)omAlloc0(pars * sizeof(char_ptr));
@@ -5074 +5084 @@
 
         extParam.r = rDefault( ch, pars, names); // Q/Zp [ p_1, ... p_pars ]
-        for(int i=pars-1; i>=0;i--)
-        {
-          omFree(names[i]);
-        }
-        omFree(names);
+        for(int i=pars-1; i>=0;i--)
+        {
+          omFree(names[i]);
+        }
+        omFree(names);
 
         cf = nInitChar(n_transExt, &extParam);
@@ -5158 +5168 @@
         number p=(number)pn->next->CopyD();
         nlGMP(p,(number)modBase,coeffs_BIGINT);
-        nlDelete(&p,coeffs_BIGINT);
+        nlDelete(&p,coeffs_BIGINT);
       }
     }