Changeset ab1e00 in git

Timestamp:

Feb 6, 2015, 4:56:12 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f3e9f213750aba467340536c024a8ae71b187679

Parents:

5c8a1f0db6891ec4174df4b8a92233e607c4daf4

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-02-06 16:56:12+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-02-06 17:01:25+01:00

Message:

warnings: definition of constants as new variables

Location:

Singular

Files:

• ipassign.cc (modified) (1 diff)
• ipshell.cc (modified) (1 diff)
• subexpr.cc (modified) (1 diff)

Singular/ipassign.cc

@@ -985 +985 @@
     )
     {
-      Warn("use `%s` instead of `def`",Tok2Cmdname(rt));
+      Warn("use `%s` instead of `def` in %s:%d:%s",Tok2Cmdname(rt),
+            currentVoice->filename,yylineno,my_yylinebuf);
     }
     if (l->rtyp==IDHDL)

Singular/ipshell.cc

@@ -1138 +1138 @@
   else
   {
-    //if (name->rtyp!=0)
-    //{
-    //  Warn("`%s` is already in use",name->name);
-    //}
+    if (TEST_V_ALLWARN
+    && (name->rtyp!=0)
+    && (name->rtyp!=IDHDL)
+    && (currRingHdl!=NULL) && (IDLEV(currRingHdl)==myynest))
+    {
+      Warn("`%s` is %s in %s:%d:%s",name->name,Tok2Cmdname(name->rtyp),
+      currentVoice->filename,yylineno,my_yylinebuf);
+    }
     {
       sy->data = (char *)enterid(id,lev,t,root,init_b);

Singular/subexpr.cc

@@ -1651 +1651 @@
           v->name = id;
         }
-        if (TEST_V_ALLWARN /*&& (myynest>0)*/
-        && ((r_IsRingVar(id, currRing->names,currRing->N)>=0)
-          || ((n_NumberOfParameters(currRing->cf)>0)
-             &&(r_IsRingVar(id, (char**)n_ParameterNames(currRing->cf),
-                                n_NumberOfParameters(currRing->cf))>=0))))
-        {
-        // WARNING: do not use ring variable names in procedures
-          Warn("use of variable >>%s<< in a procedure in line %s",id,my_yylinebuf);
-        }
+        //if (TEST_V_ALLWARN /*&& (myynest>0)*/
+        //&& ((r_IsRingVar(id, currRing->names,currRing->N)>=0)
+        //  || ((n_NumberOfParameters(currRing->cf)>0)
+        //     &&(r_IsRingVar(id, (char**)n_ParameterNames(currRing->cf),
+        //                        n_NumberOfParameters(currRing->cf))>=0))))
+        //{
+        //// WARNING: do not use ring variable names in procedures
+        //  Warn("use of variable >>%s<< in a procedure in line %s",id,my_yylinebuf);
+        //}
         return;
       }