Changeset 7b156fb in git

Timestamp:

Jun 25, 2012, 4:50:18 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

c0d2927a1a24fcd6c526178afeb42e5089c5d04b

Parents:

1161a6145a6ca3b9034865b05528815c65f55cfb

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-06-25 16:50:18+02:00

git-committer:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-08-01 23:07:59+02:00

Message:

new: allow customly constructed newstructs by overiding '='

File:

• Singular/newstruct.cc (modified) (1 diff)

Singular/newstruct.cc

@@ -188 +188 @@
       }
       return FALSE;
+    }
+  }
+
+  else if(l->Typ() > MAX_TOK)
+  {
+    blackbox *ll=getBlackboxStuff(l->Typ());
+    newstruct_desc nt=(newstruct_desc)ll->data;
+    newstruct_proc p=nt->procs;
+
+    while( (p!=NULL) && ((p->t!='=')||(p->args!=1)) ) p=p->next;
+
+    if (p!=NULL)
+    {
+      idrec hh;
+      memset(&hh,0,sizeof(hh));
+      hh.id=Tok2Cmdname(p->t);
+      hh.typ=PROC_CMD;
+      hh.data.pinf=p->p;
+      sleftv tmp;
+      memset(&tmp,0,sizeof(sleftv));
+      tmp.Copy(r);
+      leftv sl = iiMake_proc(&hh, NULL, &tmp);
+      if (sl != NULL)
+      {
+        if (sl->Typ()==l->Typ()) return newstruct_Assign(l, sl);
+        else sl->CleanUp();     // @todo Is this enough to kill 'sh`?
+      }
     }
   }