Changeset ed47aab in git

Timestamp:

Aug 1, 2012, 11:02:34 PM (12 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

eff32475b39858b9ea00d1f210285e77a6d485d1

Parents:

3d69257fe19a1e388e6e33fc7381ea50cf3041cb

Message:

new: newstruct_desc can be utilized by non-newstruc custom types

Location:

Singular

Files:

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

Singular/newstruct.cc

@@ -158 +158 @@
           l->rtyp=r->Typ();
         }
+      }
+      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);
       }
     }
@@ -607 +613 @@
    return NULL;
 }
-newstruct_desc newstructFromString(const char *s)
+
+newstruct_desc newstructDesc()
 {
   newstruct_desc res=(newstruct_desc)omAlloc0(sizeof(*res));
   res->size=0;
-
-  return scanNewstructFromString(s,res);
-}
+  return res;
+}
+
+newstruct_desc newstructFromString(const char *s)
+{
+  return scanNewstructFromString(s, newstructDesc());
+}
+
 newstruct_desc newstructChildFromString(const char *parent, const char *s)
 {

Singular/newstruct.h

@@ -5 +5 @@
 
 void newstruct_setup(const char * name, newstruct_desc d);
+newstruct_desc newstructDesc();
 newstruct_desc newstructFromString(const char *s);
 newstruct_desc newstructChildFromString(const char *p, const char *s);
 BOOLEAN newstruct_set_proc(const char *name,const char *func,int args, procinfov p);
 void newstructShow(newstruct_desc d);
-
 #endif

Singular/pyobject.cc

@@ -521 +521 @@
   }
 
+  if (op > MAX_TOK)       // custom types
+  {
+    BOOLEAN newstruct_Op1(int, leftv, leftv);
+    if (! newstruct_Op1(op, res, head) ) return FALSE;
+  }
+
   return PythonCastStatic<>(head)(op).assign_to(res);
 }
@@ -646 +652 @@
   b->blackbox_Op3     = pyobject_Op3;
   b->blackbox_OpM     = pyobject_OpM;
+  b->data = newstructDesc();
 
   PythonInterpreter::init(setBlackboxStuff(b,"pyobject"));