Changeset a97ac0 in git

Timestamp:

Nov 7, 2013, 1:59:53 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

b38f8137dbcaf7b468232f449c1346a88a9cc6fd

Parents:

823679a657c538153cba3a477bf92e2c9102c451

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-07 13:59:53+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-07 14:04:32+01:00

Message:

chg: messages about assign/conversion/calling: option(warn) -> TRACE

from master

Files:

• Singular/iparith.cc (modified) (7 diffs)
• Singular/ipassign.cc (modified) (6 diffs)
• Singular/ipconv.cc (modified) (1 diff)
• libpolys/reporter/reporter.h (modified) (1 diff)
• resources/feResource.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -7887 +7887 @@
           if (check_valid(dArith2[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(%s,%s)\n",iiTwoOps(op),Tok2Cmdname(at),Tok2Cmdname(bt));
         if ((call_failed=dArith2[i].p(res,a,b)))
@@ -7921 +7921 @@
               if (check_valid(dArith2[i].valid_for,op)) break;
             }
-            if (TEST_V_ALLWARN)
+            if (traceit&TRACE_CALL)
               Print("call %s(%s,%s)\n",iiTwoOps(op),
               Tok2Cmdname(an->rtyp),Tok2Cmdname(bn->rtyp));
@@ -8054 +8054 @@
           if (check_valid(dArith1[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(at));
         if (r<0)
@@ -8122 +8122 @@
           else
           {
-            if (TEST_V_ALLWARN)
+            if (traceit&TRACE_CALL)
               Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(an->rtyp));
             if (an->Next() != NULL)
@@ -8226 +8226 @@
           if (check_valid(dArith3[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(%s,%s,%s)\n",
             iiTwoOps(op),Tok2Cmdname(at),Tok2Cmdname(bt),Tok2Cmdname(ct));
@@ -8263 +8263 @@
                 if (check_valid(dArith3[i].valid_for,op)) break;
               }
-              if (TEST_V_ALLWARN)
+              if (traceit&TRACE_CALL)
                 Print("call %s(%s,%s,%s)\n",
                   iiTwoOps(op),Tok2Cmdname(an->rtyp),
@@ -8446 +8446 @@
           if (check_valid(dArithM[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(... (%d args))\n", iiTwoOps(op),args);
         if (dArithM[i].p(res,a))

Singular/ipassign.cc

@@ -900 +900 @@
   if (dAssign[i].res!=0)
   {
-    if (TEST_V_ALLWARN) Print("assign %s=%s\n",Tok2Cmdname(lt),Tok2Cmdname(rt));
+    if (traceit&TRACE_ASSIGN) Print("assign %s=%s\n",Tok2Cmdname(lt),Tok2Cmdname(rt));
     BOOLEAN b;
     b=dAssign[i].p(ld,r,l->e);
@@ -927 +927 @@
         {
           failed= dAssign[i].p(ld,rn,l->e);
-          if (TEST_V_ALLWARN)
+          if (traceit&TRACE_ASSIGN)
             Print("assign %s=%s ok? %d\n",Tok2Cmdname(lt),Tok2Cmdname(rn->rtyp),!failed);
         }
@@ -1194 +1194 @@
     if (i>=iv->length())
     {
-      if (TEST_V_ALLWARN)
+      if (traceit&TRACE_ASSIGN)
       {
         Warn("expression list length(%d) does not match intmat size(%d)",
@@ -1236 +1236 @@
     if (i>=bim->cols()*bim->rows())
     {
-      if (TEST_V_ALLWARN)
+      if (traceit&TRACE_ASSIGN)
       {
         Warn("expression list length(%d) does not match bigintmat size(%d x %d)",
@@ -1538 +1538 @@
       if(like_lists)
       {
-        if (TEST_V_ALLWARN) PrintS("assign list[..]=...or similiar\n");
+        if (traceit&TRACE_ASSIGN) PrintS("assign list[..]=...or similiar\n");
         if (like_lists==1)
         {
@@ -1720 +1720 @@
         lm=mpNew(olm->rows(),olm->cols());
         int el;
-        if ((TEST_V_ALLWARN) && (num!=(el=exprlist_length(hh))))
+        if ((traceit&TRACE_ASSIGN) && (num!=(el=exprlist_length(hh))))
         {
           Warn("expression list length(%d) does not match matrix size(%d)",el,num);

Singular/ipconv.cc

@@ -362 +362 @@
     &&(dConvertTypes[index].o_typ==outputType))
     {
-      if(TEST_V_ALLWARN)
+      if(traceit&TRACE_CONV)
       {
         Print("automatic  conversion %s -> %s\n",

libpolys/reporter/reporter.h

@@ -30 +30 @@
 #define TRACE_BREAKPOINT  32
 #define TRACE_TMP_BREAKPOINT  64
+#define TRACE_CALL       128
+#define TRACE_ASSIGN     256
+#define TRACE_CONV       512
+
 
 #define SI_PROT_I    1

resources/feResource.cc

@@ -71 +71 @@
    "%b/MOD;"
    LIBEXEC_DIR "/singular/MOD;"
-   LIB_DIR "/singular/MOD;"
+   LIB_DIR "/singular/MOD;"   /*debian*/
    "%b",
    (char *)""},
@@ -80 +80 @@
      "%b/MOD;"
      LIBEXEC_DIR "/singular/MOD;"
-     LIB_DIR "/singular/MOD;"
+     LIB_DIR "/singular/MOD;"   /*debian*/
      "%r/libexec/singular/MOD",                  (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},