Changeset 83ce22 in git

Timestamp:

May 7, 2014, 7:21:51 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1c23171390ebbd253c562bcc46530bec64aa9145

Parents:

68e012cf1864608713cc7b357c6d18b738dc4cc4

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-05-07 19:21:51+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-05-07 19:22:55+02:00

Message:

chg: allow generic stuff (with type IDHDL etc) to be used with blackbox stuff

Location:

Singular

Files:

• blackbox.cc (modified) (3 diffs)
• blackbox.h (modified) (2 diffs)
• iparith.cc (modified) (5 diffs)

Singular/blackbox.cc

@@ -62 +62 @@
 }
 
-// Tok2Cmdname -> iiTwoOps
-BOOLEAN WrongOp(const char* cmd, int op, leftv bb)
-{
-  assume( bb->Typ() > MAX_TOK ); // it IS a blackbox type, right?!
-
-  if( op > 127 )
-    Werror("'%s' of type %s(%d) for op %s(%d) not implemented",
-           cmd,
-           getBlackboxName(bb->Typ()),bb->Typ(),
-           iiTwoOps(op), op);
-  else
-    Werror("'%s' of type %s(%d) for op '%c' not implemented",
-           cmd,
-           getBlackboxName(bb->Typ()), bb->Typ(),
-           op);
-
-  return TRUE;
-}
-
 BOOLEAN blackboxDefaultOp1(int op,leftv l, leftv r)
 {
@@ -97 +78 @@
   }
 
-  return WrongOp("blackbox_Op1", op, r);
+  return TRUE;
 }
 
 BOOLEAN blackboxDefaultOp2(int op,leftv /*l*/, leftv r1, leftv /*r2*/)
 {
-  return WrongOp("blackbox_Op2", op, r1);
+  return TRUE;
 }
 
 BOOLEAN blackbox_default_Op3(int op,leftv /*l*/, leftv r1,leftv /*r2*/, leftv /*r3*/)
 {
-  return WrongOp("blackbox_Op3", op, r1);
+  return TRUE;
 }
 
@@ -136 +117 @@
     return FALSE;
   }
-  return WrongOp("blackbox_OpM", op, args);
+  return TRUE;
 }
 

Singular/blackbox.h

@@ -31 +31 @@
   BOOLEAN (*blackbox_Assign)(leftv l, leftv r);
   /// interpreter: unary operations op(r), r(), ...
+  // convention for blackbox_Op1..blackbox_OpM:
+  //             return FALSE, if op was successfully performed
+  //             return TRUE (and an error message) for failure
+  //             return TRUE (and no error message) if not defined
   BOOLEAN (*blackbox_Op1)(int op,leftv l, leftv r);
   /// interpreter: binary operations: op(r1,r2), r1 op r2,...
@@ -78 +82 @@
 void printBlackboxTypes();
 
-/// Emit an "op not implemented" error message and return TRUE
-BOOLEAN WrongOp(const char* cmd, int op, leftv bb);
-
 #endif

Singular/iparith.cc

@@ -7834 +7834 @@
     int at=a->Typ();
     int bt=b->Typ();
+    // handling bb-objects ----------------------------------------------------
     if (at>MAX_TOK)
     {
       blackbox *bb=getBlackboxStuff(at);
-      if (bb!=NULL) return bb->blackbox_Op2(op,res,a,b);
+      if (bb!=NULL)
+      {
+        if (!bb->blackbox_Op2(op,res,a,b)) return FALSE;
+        if (errorreported) return TRUE;
+        // else: no op defined
+      }
       else          return TRUE;
     }
@@ -7843 +7849 @@
     {
       blackbox *bb=getBlackboxStuff(bt);
-      if (bb!=NULL) return bb->blackbox_Op2(op,res,a,b);
+      if (bb!=NULL)
+      {
+        if(!bb->blackbox_Op2(op,res,a,b)) return FALSE;
+        if (errorreported) return TRUE;
+        // else: no op defined
+      }
       else          return TRUE;
     }
@@ -8007 +8018 @@
 #endif
     int at=a->Typ();
+    // handling bb-objects ----------------------------------------------------
     if (at>MAX_TOK)
     {
       blackbox *bb=getBlackboxStuff(at);
-      if (bb!=NULL) return bb->blackbox_Op1(op,res,a);
+      if (bb!=NULL)
+      {
+        if(!bb->blackbox_Op1(op,res,a)) return FALSE;
+        if (errorreported) return TRUE;
+        // else: no op defined
+      }
       else          return TRUE;
     }
@@ -8176 +8193 @@
 #endif
     int at=a->Typ();
+    // handling bb-objects ----------------------------------------------
     if (at>MAX_TOK)
     {
       blackbox *bb=getBlackboxStuff(at);
-      if (bb!=NULL) return bb->blackbox_Op3(op,res,a,b,c);
+      if (bb!=NULL)
+      {
+        if(!bb->blackbox_Op3(op,res,a,b,c)) return FALSE;
+        if (errorreported) return TRUE;
+        // else: no op defined
+      }
       else          return TRUE;
+      if (errorreported) return TRUE;
     }
     int bt=b->Typ();
@@ -8398 +8422 @@
     {
       blackbox *bb=getBlackboxStuff(a->Typ());
-      if (bb!=NULL) return bb->blackbox_OpM(op,res,a);
+      if (bb!=NULL)
+      {
+        if(!bb->blackbox_OpM(op,res,a)) return FALSE;
+        if (errorreported) return TRUE;
+        // else: no op defined
+      }
       else          return TRUE;
     }