Changeset 769a27 in git

Timestamp:

Apr 24, 2015, 11:04:41 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

20f29bb8cb76fe2c06f278317d3df2c5d344e796

Parents:

dabe36d14b912971b3ee9a07d9d75e0ad989dc13

Message:

fix: user defined assign of newstruct objects

Location:

Singular

Files:

• dyn_modules/pyobject/pyobject.cc (modified) (1 diff)
• newstruct.cc (modified) (3 diffs)

Singular/dyn_modules/pyobject/pyobject.cc

@@ -358 +358 @@
 
     sleftv tmp;
-    BOOLEAN newstruct_equal(int, leftv, leftv); // declaring overloaded '='
-    if (!newstruct_equal(PythonInterpreter::id(), &tmp, value))
+    BOOLEAN newstruct_Assign_user(int, leftv, leftv); // declaring overloaded '='
+    if (!newstruct_Assign_user(PythonInterpreter::id(), &tmp, value))
       return PythonCastStatic<>(&tmp);
 

Singular/newstruct.cc

@@ -166 +166 @@
 
 // Used by newstruct_Assign for overloaded '='
-BOOLEAN newstruct_equal(int op, leftv l, leftv r)
+BOOLEAN newstruct_Assign_user(int op, leftv l, leftv r)
 {
   blackbox *ll=getBlackboxStuff(op);
@@ -222 +222 @@
 }
 
+static BOOLEAN newstruct_Assign_same(leftv l, leftv r)
+{
+  assume(l->Typ() == r->Typ());
+  if (l->Data()!=NULL)
+  {
+    lists n1=(lists)l->Data();
+    lClean_newstruct(n1);
+  }
+  lists n2=(lists)r->Data();
+  n2=lCopy_newstruct(n2);
+  r->CleanUp();
+  if (l->rtyp==IDHDL)
+  {
+    IDDATA((idhdl)l->data)=(char *)n2;
+  }
+  else
+  {
+    l->data=(void *)n2;
+  }
+  return FALSE;
+}
+
 BOOLEAN newstruct_Assign(leftv l, leftv r)
 {
+  assume(l->Typ() > MAX_TOK);
+  if (l->Typ()==r->Typ())
+  {
+    return newstruct_Assign_same(l,r);
+  }
+  // is there an overloading '=' ?
+  sleftv tmp;
+  if(!newstruct_Assign_user(l->Typ(), &tmp, r)) return newstruct_Assign(l, &tmp);
+  // not, try to find an equal type or parent newstruct
   if (r->Typ()>MAX_TOK)
   {
@@ -257 +288 @@
         if (! newstruct_Op1(l->Typ(), &tmp, r))  return newstruct_Assign(l, &tmp);
       }
-    }
-    if (l->Typ()==r->Typ())
-    {
-      if (l->Data()!=NULL)
-      {
-        lists n1=(lists)l->Data();
-        lClean_newstruct(n1);
-      }
-      lists n2=(lists)r->Data();
-      n2=lCopy_newstruct(n2);
-      r->CleanUp();
-      if (l->rtyp==IDHDL)
-      {
-        IDDATA((idhdl)l->data)=(char *)n2;
-      }
-      else
-      {
-        l->data=(void *)n2;
-      }
-      return FALSE;
-    }
-  }
-  else
-  {
-    assume(l->Typ() > MAX_TOK);
-    sleftv tmp;
-    if(!newstruct_equal(l->Typ(), &tmp, r)) return newstruct_Assign(l, &tmp);
+      if (l->Typ()==r->Typ())
+        return newstruct_Assign_same(l,r);
+    }
   }
   Werror("assign %s(%d) = %s(%d)",