Changeset c4b69a in git

Timestamp:

May 14, 1998, 12:02:39 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

cc1af47e33536635353285fc4554d077c82e4088

Parents:

12bb45dd1793c53f0cae4d1f1f743234e93e882c

Message:

* hannes: a ring with a coeff. field GF(p,n) cannot be constructed
          without gftables


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• ffields.cc (modified) (2 diffs)
• grammar.y (modified) (3 diffs)
• iparith.cc (modified) (1 diff)
• ring.cc (modified) (7 diffs)

Singular/ChangeLog

@@ +1 @@
+Thu May 14 12:01:53 MET DST 1998 hannes
+* a ring with a coeff. field GF(p,n) cannot be constructed
+  without gftables
 Wed May 13 16:52:09 MET DST 1998 hannes
         * changed syntax of NOT (does not require () any more)

Singular/ffields.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.cc,v 1.12 1998-04-21 10:48:56 obachman Exp $ */
+/* $Id: ffields.cc,v 1.13 1998-05-14 10:02:31 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -626 +626 @@
     {
       sprintf(buf,"../gftables/%d",nfCharQ);
-      fp = feFopen(buf,"r",NULL,TRUE);
+      fp = feFopen(buf,"r",NULL,FALSE);
       if (fp == NULL)
       {

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.33 1998-05-13 14:53:44 Singular Exp $ */
+/* $Id: grammar.y,v 1.34 1998-05-14 10:02:35 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -1190 +1190 @@
           {
             //noringvars = FALSE;
-            if(!rInit($2.name,        /* ringname */
-                     &$4,            /* characteristik and list of parameters*/
-                     &$6,            /* names of ringvariables */
-                     &$8,            /* ordering */
-                     FALSE))         /* is not a dring */
-            {
-              MYYERROR("cannot make ring");
-            }
+            idhdl b=
+            rInit($2.name,        /* ringname */
+                  &$4,            /* characteristik and list of parameters*/
+                  &$6,            /* names of ringvariables */
+                  &$8,            /* ordering */
+                  FALSE);         /* is not a dring */
             $4.CleanUp();
             $6.CleanUp();
             $8.CleanUp();
+            if (b==NULL)
+            {
+              MYYERROR("cannot make ring");
+            }
           }
         | ringcmd1 elemexpr
@@ -1216 +1218 @@
             idhdl h;
             //noringvars = FALSE;
-            if(!(h=rInit($3.name,    /* ringname */
-                     &$5,            /* characteristik and list of parameters*/
-                     &$7,            /* names of ringvariables */
-                     &$9,            /* ordering */
-                     TRUE)))         /* is a dring */
-            {
-              YYERROR;
-            }
-            setFlag(h,FLAG_DRING);
-            rDSet();
+            h=rInit($3.name,    /* ringname */
+                   &$5,            /* characteristik and list of parameters*/
+                   &$7,            /* names of ringvariables */
+                   &$9,            /* ordering */
+                   TRUE));         /* is a dring */
             $5.CleanUp();
             $7.CleanUp();
             $9.CleanUp();
+            if(h==NULL)
+            {
+              YYERROR;
+            }
+            setFlag(h,FLAG_DRING);
+            rDSet();
             #endif
           }

Singular/iparith.cc

@@ -3226 +3226 @@
 ,{jjPRINT_MA,   PRINT_CMD,       NONE,           MATRIX_CMD }
 ,{jjPRINT_LIST, PRINT_CMD,       NONE,           LIST_CMD }
+,{jjPRINT_GEN,  PRINT_CMD,       NONE,           RESOLUTION_CMD }
 ,{jjidMinEmbedding, PRUNE_CMD,   XS(MODUL_CMD),  MODUL_CMD }
 ,{kQHWeight,    QHWEIGHT_CMD,    INTVEC_CMD,     IDEAL_CMD }

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.23 1998-04-24 16:39:26 Singular Exp $ */
+/* $Id: ring.cc,v 1.24 1998-05-14 10:02:39 Singular Exp $ */
 
 /*
@@ -289 +289 @@
   else
   {
-    pn->CleanUp();
-    rv->CleanUp();
-    ord->CleanUp();
     return NULL;
   }
@@ -332 +329 @@
         if(errorreported)
         {
-          errorreported=0;
-          ch=IsPrime(ch);
+          return NULL;
         }
         else
@@ -408 +404 @@
       {
         WerrorS("parameter expected");
-        pn->CleanUp();
-        rv->CleanUp();
-        ord->CleanUp();
         return NULL;
       }
@@ -475 +468 @@
       {
         WerrorS("expected name of ring variable");
-        sl->CleanUp();
-        ord->CleanUp();
         return NULL;
       }
@@ -520 +511 @@
     {
       WerrorS("invalid combination of orderings");
-      ord->CleanUp();
       return NULL;
     }
@@ -636 +626 @@
           tmpR.block1[n]=tmpR.block0[n];
           goto ord_mismatch;
-          //Werror("mismatch of number of vars (%d) and ordering (>=%d vars)",
-          //  tmpR.N,tmpR.block0[n]);
-          //return NULL;
         }
       }