Changeset 06fdbe in git

Timestamp:

Feb 8, 2011, 9:29:43 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

96f136b5a3809e74245ac73936bcd8d05b3bffa3

Parents:

b8b9d550f371bf36491c0f1ae03f9d48027b7695

Message:

typeof for blackbox

git-svn-id: file:///usr/local/Singular/svn/trunk@13829 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• bigintm.cc (modified) (1 diff)
• blackbox.cc (modified) (2 diffs)
• blackbox.h (modified) (1 diff)

Singular/bigintm.cc

@@ -30 +30 @@
   b->blackbox_Copy=bigintm_Copy;
   b->blackbox_Assign=bigintm_Assign;
-  //b->blackbox_Op1=blackbox_default_Op1;
+  //b->blackbox_Op1=blackboxDefaultOp1;
   b->blackbox_Op2=bigintm_Op2;
   //b->blackbox_Op3=blackbox_default_Op3;

Singular/blackbox.cc

@@ -41 +41 @@
   return NULL;
 }
-BOOLEAN blackbox_default_Op1(int op,leftv l, leftv r)
+BOOLEAN blackboxDefaultOp1(int op,leftv l, leftv r)
 {
+  if (op==TYPEOF_CMD)
+  {
+    l->data=omStrDup(getBlackboxName(r->Typ()));
+    l->rtyp=STRING_CMD;
+    return FALSE;
+  }
   Werror("blackbox_Op1 of type %s(%d) for op %s(%d) not implemented",
      getBlackboxName(r->Typ()),r->Typ(),Tok2Cmdname(op),op);
@@ -78 +84 @@
   if (bb->blackbox_Init==NULL)    bb->blackbox_Init=blackbox_default_Init;
   if (bb->blackbox_Copy==NULL)    bb->blackbox_Copy=blackbox_default_Copy;
-  if (bb->blackbox_Op1==NULL)     bb->blackbox_Op1=blackbox_default_Op1;
+  if (bb->blackbox_Op1==NULL)     bb->blackbox_Op1=blackboxDefaultOp1;
   if (bb->blackbox_Op2==NULL)     bb->blackbox_Op2=blackbox_default_Op2;
   if (bb->blackbox_Op3==NULL)     bb->blackbox_Op3=blackbox_default_Op3;

Singular/blackbox.h

@@ -36 +36 @@
   void *data;
 } ;
+/// default procedure blackboxDefaultOp1, to be called as "default:" branch
+BOOLEAN blackboxDefaultOp1(int op,leftv l, leftv r);
 
 /// return the structure to the type given by t