Changeset 3f4454b in git

Timestamp:

Aug 19, 2010, 4:42:00 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aa41157ad14a8f3814a8828a44faeeb674508a1b

Parents:

75e447881e02a344e13a6137b716fafa20670868

Message:

tr 254, option(warn)

git-svn-id: file:///usr/local/Singular/svn/trunk@13131 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• iparith.cc (modified) (7 diffs)
• ipconv.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -8464 +8464 @@
           #endif
         }
+        if (TEST_V_ALLWARN)
+          Print("call %s(%s,%s)\n",Tok2Cmdname(iiOp),Tok2Cmdname(at),Tok2Cmdname(bt));
         if ((call_failed=dArith2[i].p(res,a,b)))
         {
@@ -8522 +8524 @@
               #endif
             }
+            if (TEST_V_ALLWARN)
+              Print("call %s(%s,%s)\n",Tok2Cmdname(iiOp),
+              Tok2Cmdname(an->rtyp),Tok2Cmdname(bn->rtyp));
             failed= ((iiConvert(at,dArith2[i].arg1,ai,a,an))
             || (iiConvert(bt,dArith2[i].arg2,bi,b,bn))
@@ -8671 +8676 @@
           #endif
         }
+        if (TEST_V_ALLWARN)
+          Print("call %s(%s)\n",Tok2Cmdname(iiOp),Tok2Cmdname(at));
         if (r<0)
         {
@@ -8748 +8755 @@
           else
           {
+            if (TEST_V_ALLWARN)
+              Print("call %s(%s)\n",Tok2Cmdname(iiOp),Tok2Cmdname(an->rtyp));
             if (an->Next() != NULL)
             {
@@ -8869 +8878 @@
           #endif
         }
+        if (TEST_V_ALLWARN)
+          Print("call %s(%s,%s,%s)\n",
+            Tok2Cmdname(iiOp),Tok2Cmdname(at),Tok2Cmdname(bt),Tok2Cmdname(ct));
         if ((call_failed=dArith3[i].p(res,a,b,c)))
         {
@@ -8915 +8927 @@
               }
               #endif
+              if (TEST_V_ALLWARN)
+                Print("call %s(%s,%s,%s)\n",
+                  Tok2Cmdname(iiOp),Tok2Cmdname(an->rtyp),
+                  Tok2Cmdname(bn->rtyp),Tok2Cmdname(cn->rtyp));
               failed= ((iiConvert(at,dArith3[i].arg1,ai,a,an))
                 || (iiConvert(bt,dArith3[i].arg2,bi,b,bn))
@@ -9113 +9129 @@
           #endif
         }
+        if (TEST_V_ALLWARN)
+          Print("call %s(... (%d args))\n", Tok2Cmdname(iiOp),args);
         if (dArithM[i].p(res,a))
         {

Singular/ipconv.cc

@@ -359 +359 @@
               sprintf(tmp,"%c%d",*(currRing->names[nr-1]),
                 (int)pGetExp((poly)input->data,nr));
-              output->name=tmp;
+              output->name=tmp;
             }
           }
@@ -400 +400 @@
       {
         Print("automatic  conversion %s -> %s\n",
-        Tok2Cmdname(inputType),Tok2Cmdname(outputType));
+        Tok2Cmdname(inputType),Tok2Cmdname(outputType));
       }
       if ((currRing==NULL) && (outputType>BEGIN_RING) && (outputType<END_RING))
@@ -414 +414 @@
       }
       if ((output->data==NULL)
-      && ((outputType==IDEAL_CMD)
-        ||(outputType==MODUL_CMD)
-        ||(outputType==MATRIX_CMD)
-        ||(outputType==INTMAT_CMD)
-        ||(outputType==INTVEC_CMD)))
+      && ((outputType!=INT_CMD)
+        &&(outputType!=POLY_CMD)
+        &&(outputType!=VECTOR_CMD)
+        &&(outputType!=NUMBER_CMD)))
       {
         return TRUE;