Changeset 34fbd93 in git for Singular/subexpr.cc

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

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

File:

• Singular/subexpr.cc (modified) (4 diffs)

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)