Changeset 75fde54 in git

Timestamp:

Nov 21, 2014, 5:49:34 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

cecb7ea8a22076db547d32bfdc5c879d5283420d

Parents:

cb6dc33c118a894b213ceda9734ce618f5c616b9

Message:

fix: var(i)/gen(i)/farey(i,j) with no ring defined

Location:

Singular

Files:

• gentable.cc (modified) (4 diffs)
• iparith.cc (modified) (6 diffs)

Singular/gentable.cc

@@ -20 +20 @@
 #include "grammar.h"
 #include "tok.h"
+
+inline int RingDependend(int t) { return (BEGIN_RING<t)&&(t<END_RING); }
 
 // to produce convert_table.texi for doc:
@@ -348 +350 @@
           Tok2Cmdname(dArith1[i].arg),
           Tok2Cmdname(dArith1[i].res));
+    if (RingDependend(dArith1[i].res) && (!RingDependend(dArith1[i].arg)))
+    {
+      fprintf(outfile,"// WARNING: %s requires currRing\n",s);
+    }
     i++;
   }
@@ -362 +368 @@
           Tok2Cmdname(dArith2[i].arg2),
           Tok2Cmdname(dArith2[i].res));
+    if (RingDependend(dArith2[i].res)
+       && (!RingDependend(dArith2[i].arg1))
+       && (!RingDependend(dArith2[i].arg2)))
+    {
+      fprintf(outfile,"// WARNING: %s requires currRing\n",s);
+    }
     i++;
   }
@@ -377 +389 @@
           Tok2Cmdname(dArith3[i].arg3),
           Tok2Cmdname(dArith3[i].res));
+    if (RingDependend(dArith3[i].res)
+       && (!RingDependend(dArith3[i].arg1))
+       && (!RingDependend(dArith3[i].arg2))
+       && (!RingDependend(dArith3[i].arg3)))
+    {
+      fprintf(outfile,"// WARNING: %s requires currRing\n",s);
+    }
     i++;
   }

Singular/iparith.cc

@@ -108 +108 @@
   #include <polys/nc/nc.h>
   #include <polys/nc/sca.h>
-  #define ALLOW_PLURAL     1
-  #define NO_PLURAL        0
-  #define COMM_PLURAL      2
   #define  PLURAL_MASK 3
 #else /* HAVE_PLURAL */
-  #define ALLOW_PLURAL     0
-  #define NO_PLURAL        0
-  #define COMM_PLURAL      0
   #define  PLURAL_MASK     0
 #endif /* HAVE_PLURAL */
@@ -126 +120 @@
   #define ZERODIVISOR_MASK 0
 #endif
+#define ALLOW_PLURAL     1
+#define NO_PLURAL        0
+#define COMM_PLURAL      2
 #define ALLOW_RING       4
 #define NO_RING          0
@@ -7792 +7789 @@
           if (check_valid(dA2[i].valid_for,op)) break;
         }
+        else
+        {
+          if (RingDependend(dA2[i].res))
+          {
+            WerrorS("no ring active");
+            break;
+          }
+        }
         if (traceit&TRACE_CALL)
           Print("call %s(%s,%s)\n",iiTwoOps(op),Tok2Cmdname(at),Tok2Cmdname(bt));
@@ -7825 +7830 @@
             {
               if (check_valid(dA2[i].valid_for,op)) break;
+            }
+            else
+            {
+              if (RingDependend(dA2[i].res))
+              {
+                WerrorS("no ring active");
+                break;
+              }
             }
             if (traceit&TRACE_CALL)
@@ -8003 +8016 @@
           if (check_valid(dA1[i].valid_for,op)) break;
         }
+        else
+        {
+          if (RingDependend(dA1[i].res))
+          {
+            WerrorS("no ring active");
+            break;
+          }
+        }
         if (traceit&TRACE_CALL)
           Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(at));
@@ -8035 +8056 @@
           {
             if (check_valid(dA1[i].valid_for,op)) break;
+          }
+          else
+          {
+            if (RingDependend(dA1[i].res))
+            {
+              WerrorS("no ring active");
+              break;
+            }
           }
           if (traceit&TRACE_CALL)