Changeset f24733 in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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

Files:

• Singular/blackbox.cc (modified) (2 diffs)
• Singular/blackbox.h (modified) (1 diff)
• dyn_modules/bigintm/bigintm.cc (modified) (6 diffs)
• dyn_modules/bigintm/mod_main.cc (modified) (5 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);
 }
 

Singular/blackbox.h

@@ -62 +62 @@
 void printBlackboxTypes();
 
+/// Emit an "op not implemented" error message and return TRUE
+BOOLEAN WrongOp(const char* cmd, int op, leftv bb);
+
 #endif

dyn_modules/bigintm/bigintm.cc

@@ -15 +15 @@
 
 #define HAVE_BIGINTM 1
+
+namespace
+{
 
 #ifdef HAVE_BIGINTM
@@ -85 +88 @@
 }
 
-// Tok2Cmdname
-static inline 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);
-
-}
-
 BOOLEAN bigintm_Op1(int op,leftv l, leftv r)
 {
@@ -118 +104 @@
   if( op=='(' ) // <bigintm>  VAR();
   {
-    Werror("bigintm_Op1: What du you mean by '<bigintm>()'?!");
+    Werror("bigintm_Op1: What do you mean by '<bigintm>()'?!");
     return TRUE;  
   }
 
-  WrongOp("bigintm_Op1", op, r);
   return blackboxDefaultOp1(op, l, r);
 }
@@ -159 +144 @@
 
       Werror("bigintm_Op2: Op: '+': Sorry unsupported 2nd argument-type: %s in", Tok2Cmdname(a2->Typ()));
-      WrongOp("bigintm_Op2", op, a1);
-      return TRUE;
+      return WrongOp("bigintm_Op2", op, a1);
     }
 
@@ -286 +270 @@
     case '(' : // <bigintm>  VAR(b,...);
     {
-      Werror("bigintm_OpM: What du you mean by '<bigintm>(...)'?!");
+      Werror("bigintm_OpM: What do you mean by '<bigintm>(...)'?!");
       return TRUE;  
     }
@@ -308 +292 @@
 #endif
 
-
-
+};
 
 // this is only a demo

dyn_modules/bigintm/mod_main.cc

@@ -15 +15 @@
 #include "bigintm.h"
 
+namespace
+{
 
 static inline void NoReturn(leftv& res)
@@ -24 +26 @@
 
 /// listing all blackbox types (debug stuff)
-BOOLEAN printBlackboxTypes0(leftv __res, leftv __v)
+static BOOLEAN printBlackboxTypes0(leftv __res, leftv __v)
 {
   NoReturn(__res);
@@ -32 +34 @@
 
 /// init the bigintm (a sample blackbox) type
-BOOLEAN bigintm_setup0(leftv __res, leftv __v)
+static BOOLEAN bigintm_setup0(leftv __res, leftv __v)
 {
   NoReturn(__res);
@@ -41 +43 @@
 
 /// init the bigintm (a sample blackbox) type
-BOOLEAN print_load_counter(leftv __res, leftv __v)
+static BOOLEAN print_load_counter(leftv __res, leftv __v)
 {
   Print("print_load_counter: load counter: %ld", load_counter);
@@ -51 +53 @@
   return FALSE;
 }
+
+};