Changeset 81b85b4 in git for Singular/iparith.cc

Timestamp:

Dec 12, 2008, 4:45:20 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

4ad6362123b6d59ef8af60d6f27d6babb506c1df

Parents:

75c4bcfb61894ffe476e609a45d90b5939155613

Message:

*hannes: error msg.


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.483 2008-12-08 18:47:03 Singular Exp $ */
+/* $Id: iparith.cc,v 1.484 2008-12-12 15:45:20 Singular Exp $ */
 
 /*
@@ -7496 +7496 @@
 #ifndef GENTABLE
   memset(res,0,sizeof(sleftv));
+  BOOLEAN call_failed=FALSE;
 
   if (!errorreported)
@@ -7542 +7543 @@
         }
         #endif
-        if (dArith2[i].p(res,a,b))
+        if (call_failed=dArith2[i].p(res,a,b))
         {
           break;// leave loop, goto error handling
@@ -7588 +7589 @@
             failed= ((iiConvert(at,dArith2[i].arg1,ai,a,an))
             || (iiConvert(bt,dArith2[i].arg2,bi,b,bn))
-            || (dArith2[i].p(res,an,bn)));
+            || (call_failed=dArith2[i].p(res,an,bn)));
             // everything done, clean up temp. variables
             if (failed)
@@ -7643 +7644 @@
                 ,Tok2Cmdname(at),s,Tok2Cmdname(bt));
         }
-        if (BVERBOSE(V_SHOW_USE))
+        if ((!call_failed) && BVERBOSE(V_SHOW_USE))
         {
           while (dArith2[i].cmd==op)
@@ -7677 +7678 @@
 #ifndef GENTABLE
   memset(res,0,sizeof(sleftv));
+  BOOLEAN call_failed=FALSE;
 
   if (!errorreported)
@@ -7729 +7731 @@
           #endif
         }
-        else if (dArith1[i].p(res,a))
+        else if (call_failed=dArith1[i].p(res,a))
         {
           break;// leave loop, goto error handling
@@ -7787 +7789 @@
           {
             failed= ((iiConvert(at,dArith1[i].arg,ai,a,an))
-            || (dArith1[i].p(res,an)));
+            || (call_failed=dArith1[i].p(res,an)));
           }
           // everything done, clean up temp. variables
@@ -7827 +7829 @@
         Werror("%s(`%s`) failed"
                 ,s,Tok2Cmdname(at));
-        if (BVERBOSE(V_SHOW_USE))
+        if ((!call_failed) && BVERBOSE(V_SHOW_USE))
         {
           while (dArith1[i].cmd==op)
@@ -7853 +7855 @@
 #ifndef GENTABLE
   memset(res,0,sizeof(sleftv));
+  BOOLEAN call_failed=FALSE;
 
   if (!errorreported)
@@ -7903 +7906 @@
         }
         #endif
-        if (dArith3[i].p(res,a,b,c))
+        if (call_failed=dArith3[i].p(res,a,b,c))
         {
           break;// leave loop, goto error handling
@@ -7952 +7955 @@
                 || (iiConvert(bt,dArith3[i].arg2,bi,b,bn))
                 || (iiConvert(ct,dArith3[i].arg3,ci,c,cn))
-                || (dArith3[i].p(res,an,bn,cn)));
+                || (call_failed=dArith3[i].p(res,an,bn,cn)));
               // everything done, clean up temp. variables
               if (failed)
@@ -8011 +8014 @@
         Werror("%s(`%s`,`%s`,`%s`) failed"
                 ,s,Tok2Cmdname(at),Tok2Cmdname(bt),Tok2Cmdname(ct));
-        if (BVERBOSE(V_SHOW_USE))
+        if ((!call_failed) && BVERBOSE(V_SHOW_USE))
         {
           while (dArith3[i].cmd==op)