Changeset ed47aab in git for Singular/newstruct.cc

Timestamp:

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

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

eff32475b39858b9ea00d1f210285e77a6d485d1

Parents:

3d69257fe19a1e388e6e33fc7381ea50cf3041cb

Message:

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

File:

• Singular/newstruct.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)
 {