Changeset c728c0 in git

Timestamp:

Feb 9, 2011, 7:54:23 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

76b37cc99585766333fcee968b6b6dad3541da2c

Parents:

091193e7e2364864e1fb2c03057d6e8181254316

Message:

check for blackbox

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

Location:

Singular

Files:

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

Singular/bigintm.cc

@@ -124 +124 @@
       return TRUE;
     }
-    default:
-      Werror("op %d not implemented for type %d",op,a1->Typ());
-      break;
   }
-  return TRUE;
+  return blackboxDefaultOp2(op,res,a1,a2);
 }
 // BOOLEAN opM(int op, leftv res, leftv args)

Singular/blackbox.cc

@@ -53 +53 @@
   return TRUE;
 }
-BOOLEAN blackbox_default_Op2(int op,leftv l, leftv r1, leftv r2)
+BOOLEAN blackboxDefaultOp2(int op,leftv l, leftv r1, leftv r2)
 {
   Werror("blackbox_Op2 of type %s(%d) for op %s(%d) not implemented",
@@ -72 +72 @@
 }
 
+BOOLEAN blackbox_default_Check(blackbox *b, void *d)
+{
+  return FALSE;
+}
 int setBlackboxStuff(blackbox *bb, const char *n)
 {
@@ -85 +89 @@
   if (bb->blackbox_Copy==NULL)    bb->blackbox_Copy=blackbox_default_Copy;
   if (bb->blackbox_Op1==NULL)     bb->blackbox_Op1=blackboxDefaultOp1;
-  if (bb->blackbox_Op2==NULL)     bb->blackbox_Op2=blackbox_default_Op2;
+  if (bb->blackbox_Op2==NULL)     bb->blackbox_Op2=blackboxDefaultOp2;
   if (bb->blackbox_Op3==NULL)     bb->blackbox_Op3=blackbox_default_Op3;
   if (bb->blackbox_OpM==NULL)     bb->blackbox_OpM=blackbox_default_OpM;
+  if (bb->blackbox_Check==NULL)   bb->blackbox_Check=blackbox_default_Check;
   blackboxTableCnt++;
   return blackboxTableCnt+BLACKBOX_OFFSET-1;

Singular/blackbox.h

@@ -33 +33 @@
   /// interpreter: operations with undefined number of operands
   BOOLEAN (*blackbox_OpM)(int op,leftv l, leftv r);
+  /// check internal structure
+  BOOLEAN (*blackbox_Check)(blackbox *b,void *d);
   /// additional type info
   void *data;
@@ -40 +42 @@
 /// default procedure blackboxDefaultOp1, to be called as "default:" branch
 BOOLEAN blackboxDefaultOp1(int op,leftv l, leftv r);
+/// default procedure blackboxDefaultOp2, to be called as "default:" branch
+BOOLEAN blackboxDefaultOp2(int op,leftv l, leftv r1, leftv r2);
 
 /// return the structure to the type given by t