Changeset a04a05 in git

Timestamp:

Aug 1, 2012, 11:29:10 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

29fc84389b9713cdf07cc538bad5becf4758553e

Parents:

5ebd4bcf7ead1b205b12afeec0793f8bc29e16ec

Message:

chg: encapsulating newstruct's overloaded '=' and use in pyobject

Location:

Singular

Files:

• newstruct.cc (modified) (2 diffs)
• pyobject.cc (modified) (1 diff)

Singular/newstruct.cc

@@ -134 +134 @@
 }
 
+// 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)
 {
@@ -193 +223 @@
   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();
-      }
-    }
+    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)",

Singular/pyobject.cc

@@ -339 +339 @@
     }
 
+    sleftv tmp;
+    BOOLEAN newstruct_equal(int, leftv, leftv); // declaring overloaded '='
+    if (!newstruct_equal(PythonInterpreter::id(), &tmp, value))  
+      return PythonCastStatic<>(&tmp);        
+
     if (typeId > MAX_TOK)       // custom types
     {
       blackbox *bbx = getBlackboxStuff(typeId);
-      sleftv tmp;
-      if (! bbx->blackbox_Op1(PythonInterpreter::id(), &tmp, value) )
-        return PythonCastStatic<>(&tmp);
-    }
-    else
-      Werror("type '%s` incompatible with 'pyobject`", iiTwoOps(typeId));
-
+      assume(bbx != NULL);
+      if (! bbx->blackbox_Op1(PythonInterpreter::id(), &tmp, value))
+        return PythonCastStatic<>(&tmp);        
+    }
+
+    Werror("type '%s` incompatible with 'pyobject`", iiTwoOps(typeId));
     return PythonObject();
   }