Changeset eff324 in git for Singular

Timestamp:

Aug 1, 2012, 11:04:39 PM (12 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

632c3a619d605d6b049c3f7f82a323ea8113e34b

Parents:

ed47aab1ca04dedabc7c40435071af5af05f4c3a

Message:

chg: disclosuring fewer of newstruct

Location:

Singular

Files:

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

Singular/newstruct.cc

@@ -613 +613 @@
    return NULL;
 }
-
-newstruct_desc newstructDesc()
+newstruct_desc newstructFromString(const char *s)
 {
   newstruct_desc res=(newstruct_desc)omAlloc0(sizeof(*res));
   res->size=0;
-  return res;
-}
-
-newstruct_desc newstructFromString(const char *s)
-{
-  return scanNewstructFromString(s, newstructDesc());
-}
-
+
+  return scanNewstructFromString(s,res);
+}
 newstruct_desc newstructChildFromString(const char *parent, const char *s)
 {
@@ -670 +664 @@
   blackbox *bb=getBlackboxStuff(id);
   newstruct_desc desc=(newstruct_desc)bb->data;
+  if (desc == NULL)
+  {
+    desc=(newstruct_desc)omAlloc0(sizeof(*desc));
+    desc->size=0;
+    bb->data = (void*)desc;
+  }
+
   newstruct_proc p=(newstruct_proc)omAlloc(sizeof(*p));
   p->next=desc->procs; desc->procs=p;

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

@@ -652 +652 @@
   b->blackbox_Op3     = pyobject_Op3;
   b->blackbox_OpM     = pyobject_OpM;
-  b->data = newstructDesc();
 
   PythonInterpreter::init(setBlackboxStuff(b,"pyobject"));