Changeset b7e0a0 in git

Timestamp:

Feb 4, 2013, 4:13:27 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

72de5f54f47f1606cf29342d26eea5c7ca054155

Parents:

39e070d960bd0ab6d36b34b34c868cd1085371e5

Message:

add: string(b) for blackbox type b in the default methods'(Singular/blackbox.cc)

from master

File:

• Singular/blackbox.cc (modified) (2 diffs)

Singular/blackbox.cc

@@ -24 +24 @@
 void blackbox_default_destroy(blackbox  *b, void *d)
 {
-  Werror("missing blackbox_destroy");
+  WerrorS("missing blackbox_destroy");
 }
 char *blackbox_default_String(blackbox *b,void *d)
 {
-  Werror("missing blackbox_String");
+  WerrorS("missing blackbox_String");
   return omStrDup("");
 }
 void *blackbox_default_Copy(blackbox *b,void *d)
 {
-  Werror("missing blackbox_Copy");
+  WerrorS("missing blackbox_Copy");
   return NULL;
 }
@@ -104 +104 @@
     res->rtyp=LIST_CMD;
     return jjLIST_PL(res,args);
+  }
+  else if(op==STRING_CMD)
+  {
+    blackbox *b=getBlackboxStuff(args->Typ());
+    res->data=b->blackbox_String(b,args->Data());
+    res->rtyp=STRING_CMD;
+    args=args->next;
+    if(args!=NULL)
+    {
+      sleftv res2;
+      int ret=iiExprArithM(&res2,args,op);
+      if (ret) return TRUE;
+      char *s2=(char*)omAlloc(strlen((char*)res->data)+strlen((char*)res2.data)+1);
+      sprintf(s2,"%s%s",(char*)res->data,(char*)res2.data);
+      omFree(res2.data);
+      omFree(res->data);
+      res->data=s2;
+    }
+    return FALSE;
   }
   return WrongOp("blackbox_OpM", op, args);