Changeset 894939e in git

Timestamp:

Feb 11, 2020, 4:31:35 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

024d099551e83f0d1d860e67ed16ddf4577dce4c645c77cc0cd67244418581efcd97abbb9c96ea3a

Parents:

99fc84ca6907a6183c70b8fd1bce8b7695bf27ca

Message:

fix syntax: warn if qring q=<ring>

Location:

Singular

Files:

• ipassign.cc (modified) (6 diffs)
• ipid.h (modified) (1 diff)
• ipshell.cc (modified) (3 diffs)

Singular/ipassign.cc

@@ -164 +164 @@
         jjMINPOLY_red((idhdl)&(L->m[i]));
       }
+      break;
     }
     default:
@@ -1114 +1115 @@
 * assign a = b
 */
-static BOOLEAN jiAssign_1(leftv l, leftv r, BOOLEAN toplevel)
+static BOOLEAN jiAssign_1(leftv l, leftv r, BOOLEAN toplevel, BOOLEAN is_qring=FALSE)
 {
   int rt=r->Typ();
@@ -1199 +1200 @@
 #endif
     return (bb==NULL) || bb->blackbox_Assign(l,r);
+  }
+  if ((is_qring)
+  &&(lt==RING_CMD)
+  &&(rt==RING_CMD))
+  {
+    Warn("qring .. = <ring>; is misleading in >>%s<<",my_yylinebuf);
   }
   int start=0;
@@ -1835 +1842 @@
   int lt=l->Typ();
   int rt=NONE;
+  int is_qring=FALSE;
   BOOLEAN b=FALSE;
   if (l->rtyp==ALIAS_CMD)
@@ -1844 +1852 @@
   {
     atKillAll((idhdl)l->data);
+    is_qring=hasFlag((idhdl)l->data,FLAG_QRING_DEF);
     IDFLAG((idhdl)l->data)=0;
     l->attribute=NULL;
@@ -1929 +1938 @@
       &&((lt==rt)||(lt!=LIST_CMD)))
       {
-        b=jiAssign_1(l,r,toplevel);
+        b=jiAssign_1(l,r,toplevel,is_qring);
         if (l->rtyp==IDHDL)
         {

Singular/ipid.h

@@ -102 +102 @@
 void *idrecDataInit(int t);
 
-#define FLAG_STD   0
-#define FLAG_TWOSTD  3
-#define FLAG_QRING   4
+#define FLAG_STD       0
+#define FLAG_TWOSTD    3
+#define FLAG_QRING     4
+#define FLAG_QRING_DEF 5
 #define hasFlag(A,F) Sy_inset((F),(A)->flag)
 #define setFlag(A,F) (A)->flag|=Sy_bit(F)

Singular/ipshell.cc

@@ -1126 +1126 @@
 {
   BOOLEAN res=FALSE;
+  BOOLEAN is_qring=FALSE;
   const char *id = name->name;
 
@@ -1145 +1146 @@
       }
     }
-    if (t==QRING_CMD) t=RING_CMD; // qring is always RING_CMD
+    if (t==QRING_CMD)
+    {
+      t=RING_CMD; // qring is always RING_CMD
+      is_qring=TRUE;
+    }
 
     if (TEST_V_ALLWARN
@@ -1162 +1167 @@
       sy->rtyp=IDHDL;
       currid=sy->name=IDID((idhdl)sy->data);
+      if (is_qring)
+      {
+        IDFLAG((idhdl)sy->data)=sy->flag=Sy_bit(FLAG_QRING_DEF);
+      }
       // name->name=NULL; /* used in enterid */
       //sy->e = NULL;