Changeset 34fbd93 in git

Timestamp:

Jul 9, 1999, 4:58:30 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

6959c49751ce060112fd62dace5b8f7590c72602

Parents:

609ba11e29d4d3c44b5785da0728121bbc8e0065

Message:

* hannes: ring r=(real,20,I),x,lp; <==> ring r=(real(20),I),x,lp;
          error message for CMD_M fixed (see coef("1","2");)
	  (grammar.y iparith.cc ipshell.h scanner.l subexpr.cc)


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

Location:

Singular

Files:

• grammar.y (modified) (8 diffs)
• iparith.cc (modified) (3 diffs)
• ipshell.h (modified) (2 diffs)
• scanner.l (modified) (2 diffs)
• subexpr.cc (modified) (4 diffs)

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.61 1999-05-29 12:00:01 Singular Exp $ */
+/* $Id: grammar.y,v 1.62 1999-07-09 14:58:24 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -58 +58 @@
 char       my_yylinebuf[80];
 char *     currid;
-BOOLEAN    noringvars=FALSE;
+BOOLEAN    yyInRingConstruction=FALSE;
 BOOLEAN    expected_parms;
 int        cmdtok;
@@ -364 +364 @@
             siq=0;
             #endif
-            noringvars = FALSE;
+            yyInRingConstruction = FALSE;
             currentVoice->ifsw=0;
             if (inerror)
@@ -941 +941 @@
         UNKNOWN_IDENT
         {
-#if 0          
-          if (!($$=rOrderName($1)))
-            YYERROR;
-#else
           // let rInit take care of any errors 
           $$=rOrderName($1);
-#endif          
         }
         ;
@@ -1309 +1304 @@
 
 ringcmd1:
-       RING_CMD { noringvars = TRUE; }
+       RING_CMD { yyInRingConstruction = TRUE; }
        ;
 
@@ -1343 +1338 @@
             $6.CleanUp();
             $8.CleanUp();
-            noringvars = FALSE;
+            yyInRingConstruction = FALSE;
             if (b==NULL)
             {
@@ -1371 +1366 @@
             if(do_pop) namespaceroot->pop();
 #endif /* HAVE_NAMESPACES */
-            noringvars = FALSE;
-          }
-        | DRING_CMD { noringvars = TRUE; }
+            yyInRingConstruction = FALSE;
+          }
+        | DRING_CMD { yyInRingConstruction = TRUE; }
           elemexpr cmdeq
           rlist     ','       /* description of coeffs */
@@ -1412 +1407 @@
             rDSet();
             #endif
-            noringvars = FALSE;
+            yyInRingConstruction = FALSE;
           }
         ;

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.157 1999-07-09 14:06:45 obachman Exp $ */
+/* $Id: iparith.cc,v 1.158 1999-07-09 14:58:25 Singular Exp $ */
 
 /*
@@ -4311 +4311 @@
   leftv v=u->next;
   u->next=NULL;
-  BOOLEAN b=iiExprArith2(res,u,iiOp,v);
+  BOOLEAN b=iiExprArith2(res,u,iiOp,v, (iiOp > 255));
   u->next=v;
   return b;
@@ -4522 +4522 @@
 static BOOLEAN jjKLAMMER_PL(leftv res, leftv u)
 {
+  if (yyInRingConstruction)
+  {
+    memcpy(res,u,sizeof(sleftv));
+    memset(u,0,sizeof(sleftv));
+    return FALSE;
+  }
   leftv v=u->next;
   BOOLEAN b;

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.17 1999-04-15 17:28:05 Singular Exp $ */
+/* $Id: ipshell.h,v 1.18 1999-07-09 14:58:28 Singular Exp $ */
 /*
 * ABSTRACT
@@ -32 +32 @@
 extern cmdnames cmds[];
 extern char *lastreserved;
+extern BOOLEAN yyInRingConstruction; /* 1: during ring construction */
 
 int     IsCmd(char *n, int & tok);

Singular/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.17 1999-07-06 15:32:44 Singular Exp $ */
+/* $Id: scanner.l,v 1.18 1999-07-09 14:58:29 Singular Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -23 +23 @@
 //extern unsigned char * yytext;
 extern int yyleng;
-extern BOOLEAN noringvars;
 extern int inerror;
 

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.51 1999-06-15 11:36:41 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.52 1999-07-09 14:58:30 Singular Exp $ */
 
 #include <stdlib.h>
@@ -1211 +1211 @@
 * utility for grammar and iparith
 */
-extern BOOLEAN noringvars;
 void syMake(leftv v,char * id, idhdl packhdl)
 {
@@ -1333 +1332 @@
     {
       BOOLEAN ok=FALSE;
-      poly p = (!noringvars) ? pmInit(id,ok) : (poly)NULL;
+      poly p = (!yyInRingConstruction) ? pmInit(id,ok) : (poly)NULL;
       if (ok)
       {
@@ -1363 +1362 @@
     {
       BOOLEAN ok=FALSE;
-      poly p = ((currRingHdl!=NULL)&&(!noringvars)&&(IDLEV(currRingHdl)!=myynest))
-               /* ring required */  /* not in decl */    /* already in case 4/6 */
+      poly p = ((currRingHdl!=NULL)     /* ring required */
+               &&(!yyInRingConstruction) /* not in decl */
+               &&(IDLEV(currRingHdl)!=myynest)) /* already in case 4/6 */
                      ? pmInit(id,ok) : (poly)NULL;
       if (ok)