Changeset f24733 in git for Singular/blackbox.cc

Timestamp:

Mar 15, 2011, 7:17:49 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

9e8da7ec659821d053dbf793a28c79fc2d851551

Parents:

5cdbfef15d0014847a35358d543945451f68ff41

Message:

MV: moved WrongOP to blackbox
FIX: dynamic modules must ONLY export 'mod_init'!

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

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

File:

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

Singular/blackbox.cc

@@ -42 +42 @@
   return NULL;
 }
+
+// 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)
 {
@@ -50 +70 @@
     return FALSE;
   }
-  if (op<127)
-    Werror("blackbox_Op1 of type %s(%d) for op '%c' not implemented",
-      getBlackboxName(r->Typ()),r->Typ(),op);
-  else
-    Werror("blackbox_Op1 of type %s(%d) for op %s(%d) not implemented",
-      getBlackboxName(r->Typ()),r->Typ(),Tok2Cmdname(op),op);
-  return TRUE;
+
+  return WrongOp("blackbox_Op1", op, r);
 }
+
 BOOLEAN blackboxDefaultOp2(int op,leftv l, leftv r1, leftv r2)
 {
-  if (op<127)
-    Werror("blackbox_Op2 of type %s(%d) for op '%c' not implemented",
-      getBlackboxName(r1->Typ()),r1->Typ(),op);
-  else
-    Werror("blackbox_Op2 of type %s(%d) for op %s(%d) not implemented",
-      getBlackboxName(r1->Typ()),r1->Typ(),Tok2Cmdname(op),op);
-  return TRUE;
+  return WrongOp("blackbox_Op2", op, r1);
 }
+
 BOOLEAN blackbox_default_Op3(int op,leftv l, leftv r1,leftv r2, leftv r3)
 {
-  if (op<127)
-    Werror("blackbox_Op3 of type %s(%d) for op '%c' not implemented",
-      getBlackboxName(r1->Typ()),r1->Typ(),op);
-  else
-    Werror("blackbox_Op3 of type %s(%d) for op %s(%d) not implemented",
-      getBlackboxName(r1->Typ()),r1->Typ(),Tok2Cmdname(op),op);
-  return TRUE;
+  return WrongOp("blackbox_Op3", op, r1);
 }
+
 BOOLEAN blackbox_default_OpM(int op,leftv l, leftv r)
 {
-  if (op<127)
-    Werror("blackbox_OpM of type %s(%d) for op '%c' not implemented",
-      getBlackboxName(r->Typ()),r->Typ(),op);
-  else
-    Werror("blackbox_OpM of type %s(%d) for op %s(%d) not implemented",
-      getBlackboxName(r->Typ()),r->Typ(),Tok2Cmdname(op),op);
-  return TRUE;
+  return WrongOp("blackbox_OpM", op, r);
 }