Changeset 188de86 in git for Singular/newstruct.cc

Timestamp:

Aug 2, 2012, 4:09:13 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4f9652847609cefd5ff3b91d14f34611592ab699

Parents:

0419aba8292e7109329604d8ad03b70f8ef6542344a1c2199e33375a631289eaab7a81954c8383e2

Message:

Merge pull request #158 from alexanderdreyer/spielwiese

Transfering newstruct and pyobject fixes to Spielwiese

File:

• Singular/newstruct.cc (modified) (12 diffs)

Singular/newstruct.cc

@@ -39 +39 @@
 };
 
+int newstruct_desc_size() 
+{
+  return sizeof(newstruct_desc_s);
+}
 
 char * newstruct_String(blackbox *b, void *d)
@@ -46 +50 @@
   {
     newstruct_desc ad=(newstruct_desc)(b->data);
+
+    newstruct_proc p=ad->procs;
+    while((p!=NULL)&&(p->t!=STRING_CMD))
+      p=p->next;
+
+    if (p!=NULL)
+    {
+      leftv sl;
+      sleftv tmp;
+      memset(&tmp,0,sizeof(tmp));
+      tmp.rtyp=ad->id;
+      void * newstruct_Copy(blackbox*, void *); //forward declaration
+      tmp.data=(void*)newstruct_Copy(b,d);
+      idrec hh;
+      memset(&hh,0,sizeof(hh));
+      hh.id=Tok2Cmdname(p->t);
+      hh.typ=PROC_CMD;
+      hh.data.pinf=p->p;
+      sl=iiMake_proc(&hh,NULL,&tmp);
+
+      if (sl->Typ() == STRING_CMD)
+      {
+        char *res = omStrDup((char*)sl->Data());
+        sl->CleanUp();
+        return res;
+      }
+      else
+        sl->CleanUp();      
+    }
+
     lists l=(lists)d;
     newstruct_member a=ad->member;
@@ -130 +164 @@
 }
 
+// Used by newstruct_Assign for overloaded '='
+BOOLEAN newstruct_equal(int op, leftv l, leftv r)
+{
+  blackbox *ll=getBlackboxStuff(op);
+  assume(ll->data != NULL);
+  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() == op) { l->Copy(sl); return FALSE;}
+      else sl->CleanUp();
+    }
+  }
+  return TRUE;
+}
+
 BOOLEAN newstruct_Assign(leftv l, leftv r)
 {
@@ -138 +202 @@
     {
       newstruct_desc rrn=(newstruct_desc)rr->data;
+
+      if (!rrn)
+      {
+        Werror("custom type %s(%d) cannot be assigned to newstruct %s(%d)",
+               Tok2Cmdname(r->Typ()), r->Typ(), Tok2Cmdname(l->Typ()), l->Typ());
+        return TRUE;
+      }
+
       newstruct_desc rrp=rrn->parent;
       while ((rrp!=NULL)&&(rrp->id!=l->Typ())) rrp=rrp->parent;
@@ -151 +223 @@
         }
       }
+      else                      // unrelated types - look for custom conversion
+      {
+        sleftv tmp;
+        BOOLEAN newstruct_Op1(int, leftv, leftv);  // forward declaration
+        if (! newstruct_Op1(l->Typ(), &tmp, r))  return newstruct_Assign(l, &tmp);
+      }
     }
     if (l->Typ()==r->Typ())
@@ -172 +250 @@
     }
   }
+
+  else if(l->Typ() > MAX_TOK)
+  {
+    assume(l->Typ() > MAX_TOK);
+    sleftv tmp;
+    if(!newstruct_equal(l->Typ(), &tmp, r)) return newstruct_Assign(l, &tmp);
+  }
   Werror("assign %s(%d) = %s(%d)",
         Tok2Cmdname(l->Typ()),l->Typ(),Tok2Cmdname(r->Typ()),r->Typ());
   return TRUE;
 }
+
+BOOLEAN newstruct_Op1(int op, leftv res, leftv arg)
+{
+  // interpreter: arg is newstruct
+  blackbox *a=getBlackboxStuff(arg->Typ());
+  newstruct_desc nt=(newstruct_desc)a->data;
+  newstruct_proc p=nt->procs;
+
+  while((p!=NULL) &&( (p->t!=op) || (p->args!=1) )) p=p->next;
+
+  if (p!=NULL)
+  {
+    leftv sl;
+    sleftv tmp;
+    memset(&tmp,0,sizeof(sleftv));
+    tmp.Copy(arg);
+    idrec hh;
+    memset(&hh,0,sizeof(hh));
+    hh.id=Tok2Cmdname(p->t);
+    hh.typ=PROC_CMD;
+    hh.data.pinf=p->p;
+    sl=iiMake_proc(&hh,NULL,&tmp);
+    if (sl==NULL) return TRUE;
+    else
+    {
+      res->Copy(sl);
+      return FALSE;
+    }
+  }
+  return blackboxDefaultOp1(op,res,arg);
+}
+
+
 
 BOOLEAN newstruct_Op2(int op, leftv res, leftv a1, leftv a2)
@@ -280 +398 @@
   }
   newstruct_proc p=nt->procs;
-  while((p!=NULL) &&(p->t=op)&&(p->args!=2)) p=p->next;
+  while((p!=NULL) && ( (p->t!=op) || (p->args!=2) )) p=p->next;
   if (p!=NULL)
   {
@@ -323 +441 @@
   }
   newstruct_proc p=nt->procs;
-  while((p!=NULL) &&(p->t=op)&&(p->args!=4)) p=p->next;
+  
+  while((p!=NULL) &&( (p->t!=op) || (p->args!=4) )) p=p->next;
+
   if (p!=NULL)
   {
@@ -474 +594 @@
   b->blackbox_Copy=newstruct_Copy;
   b->blackbox_Assign=newstruct_Assign;
-  //b->blackbox_Op1=blackboxDefaultOp1;
+  b->blackbox_Op1=newstruct_Op1;
   b->blackbox_Op2=newstruct_Op2;
   //b->blackbox_Op3=blackbox_default_Op3;
@@ -617 +737 @@
   newstruct_proc p=(newstruct_proc)omAlloc(sizeof(*p));
   p->next=desc->procs; desc->procs=p;
+
+  idhdl save_ring=currRingHdl;
+  currRingHdl=(idhdl)1; // fake ring detection
+
   if(!IsCmd(func,p->t))
   {
@@ -628 +752 @@
     {
       Werror(">>%s<< is not a kernel command",func);
+      currRingHdl = save_ring;
       return TRUE;
     }
@@ -633 +758 @@
   p->args=args;
   p->p=pr; pr->ref++;
+  currRingHdl = save_ring;
   return FALSE;
 }