Changeset 8357e21 in git

Timestamp:

Jun 28, 2012, 3:32:59 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

19b0184aff4a5a9ba4c2d12f88c2c9ec66e5552c

Parents:

6dffa9e5b66ac5a81df2b68ff1c38dafc918b1f9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-06-28 15:32:59+02:00

git-committer:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-09-08 00:20:22+02:00

Message:

fix: #433, type change in newstruct assignments

Location:

Singular

Files:

• blackbox.cc (modified) (3 diffs)
• blackbox.h (modified) (1 diff)
• ipassign.cc (modified) (2 diffs)
• newstruct.cc (modified) (5 diffs)

Singular/blackbox.cc

@@ -61 +61 @@
 {
   assume( bb->Typ() > MAX_TOK ); // it IS a blackbox type, right?!
-  
+
   if( op > 127 )
     Werror("'%s' of type %s(%d) for op %s(%d) not implemented",
@@ -108 +108 @@
 }
 
-BOOLEAN blackbox_default_Check(blackbox *b, void *d)
+BOOLEAN blackbox_default_Check(blackbox *,leftv,leftv)
 {
   return FALSE;
@@ -149 +149 @@
     if (bb->blackbox_Op3==NULL)     bb->blackbox_Op3=blackbox_default_Op3;
     if (bb->blackbox_OpM==NULL)     bb->blackbox_OpM=blackbox_default_OpM;
-    if (bb->blackbox_Check==NULL)   bb->blackbox_Check=blackbox_default_Check;
+    if (bb->blackbox_CheckAssign==NULL) bb->blackbox_CheckAssign=blackbox_default_Check;
     if (bb->blackbox_serialize==NULL) bb->blackbox_serialize=blackbox_default_serialize;
     if (bb->blackbox_deserialize==NULL) bb->blackbox_deserialize=blackbox_default_deserialize;

Singular/blackbox.h

@@ -39 +39 @@
   /// interpreter: operations with undefined number of operands
   BOOLEAN (*blackbox_OpM)(int op,leftv l, leftv r);
-  /// check internal structure
-  BOOLEAN (*blackbox_Check)(blackbox *b,void *d);
+  /// is an assign of r to l (part of b) impossible?
+  BOOLEAN (*blackbox_CheckAssign)(blackbox *b,leftv l, leftv r);
   /// serialize
   BOOLEAN (*blackbox_serialize)(blackbox *b,void *d, si_link f);

Singular/ipassign.cc

@@ -1510 +1510 @@
       {
         bb=getBlackboxStuff(bt);
-        like_lists=BB_LIKE_LIST(bb);
+        like_lists=BB_LIKE_LIST(bb); // bb like a list
       }
       else if (((l->rtyp==IDHDL) && (IDTYP((idhdl)l->data)==LIST_CMD))
         || (l->rtyp==LIST_CMD))
       {
-        like_lists=2;
+        like_lists=2; // bb in a list
       }
       if(like_lists)
       {
         if (TEST_V_ALLWARN) PrintS("assign list[..]=...or similiar\n");
+        if (like_lists==1)
+        {
+          // check blackbox/newtype type:
+          if(bb->blackbox_CheckAssign(bb,l,r)) return TRUE;
+        }
         b=jiAssign_list(l,r);
         if((!b) && (like_lists==2))
@@ -1538 +1543 @@
           omFreeBin((ADDRESS)l->e, sSubexpr_bin);
           l->e=h;
-        }
-        if ((!b) && (like_lists==1))
-        {
-          // check blackbox/newtype type:
-          if(bb->blackbox_Check(bb,l->Data())) return TRUE;
         }
         return b;

Singular/newstruct.cc

@@ -39 +39 @@
 };
 
-int newstruct_desc_size() 
+int newstruct_desc_size()
 {
   return sizeof(newstruct_desc_s);
@@ -441 +441 @@
   }
   newstruct_proc p=nt->procs;
-  
+
   while((p!=NULL) &&( (p->t!=op) || (p->args!=4) )) p=p->next;
 
@@ -510 +510 @@
 }
 
-BOOLEAN newstruct_Check(blackbox *b, void *d)
+BOOLEAN newstruct_CheckAssign(blackbox *b, leftv L, leftv R)
+{
+  int lt=L->Typ();
+  int rt=R->Typ();
+  if ((lt!=DEF_CMD)&&(lt!=rt))
+  {
+    Werror("can not assign %s(%d) to member of type %s(%d)",
+            Tok2Cmdname(rt),rt,
+            Tok2Cmdname(lt),lt);
+    return TRUE;
+  }
+  return FALSE;
+}
+
+/* check internal structure:
+* BOOLEAN newstruct_Check(blackbox *b, void *d)
 {
   newstruct_desc n=(newstruct_desc)b->data;
@@ -529 +544 @@
   return FALSE;
 }
+*/
 
 BOOLEAN newstruct_serialize(blackbox *b, void *d, si_link f)
@@ -598 +614 @@
   //b->blackbox_Op3=blackbox_default_Op3;
   b->blackbox_OpM=newstruct_OpM;
-  b->blackbox_Check=newstruct_Check;
+  b->blackbox_CheckAssign=newstruct_CheckAssign;
   b->blackbox_serialize=newstruct_serialize;
   b->blackbox_deserialize=newstruct_deserialize;