Changeset 4ab28dc in git

Timestamp:

Feb 16, 2011, 7:46:51 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9f04ad074eb79dfc6f730e59b1ec34816c133461

Parents:

5c3bc3a6d0bf51749fcdb814cb5faa401681046d

Message:

better error testing: blackbox

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

File:

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

Singular/blackbox.cc

@@ -6 +6 @@
 
 //#define BLACKBOX_DEVEL 1
+#define MAX_BB_TYPES 256
 
-static blackbox* blackboxTable[100];
-static char *    blackboxName[100];
+static blackbox* blackboxTable[MAX_BB_TYPES];
+static char *    blackboxName[MAX_BB_TYPES];
 static int blackboxTableCnt=0;
 #define BLACKBOX_OFFSET (MAX_TOK+1)
@@ -78 +79 @@
 int setBlackboxStuff(blackbox *bb, const char *n)
 {
-  blackboxTable[blackboxTableCnt]=bb;
-  blackboxName[blackboxTableCnt]=omStrDup(n);
+  int where=-1;
+  if (MAX_BB_TYPES<=blackboxTableCnt)
+  {
+    // second try, find empty slot from removed bb:
+    for (int i=0;i<MAX_BB_TYPES;i++)
+    {
+      if (blackboxTable[i]==NULL) { where=i; break; }
+    }
+  }
+  else
+  {
+    where=blackboxTableCnt;
+    blackboxTableCnt++;
+  }
+  if (where==-1)
+  {
+    WerrorS("too many bb types defined");
+    return 0;
+  }
+  else
+  {
+    blackboxTable[where]=bb;
+    blackboxName[where]=omStrDup(n);
 #ifdef BLACKBOX_DEVEL
-  Print("define bb:name=%s:rt=%d (table:cnt=%d)\n",blackboxName[blackboxTableCnt],blackboxTableCnt+BLACKBOX_OFFSET,blackboxTableCnt);
+    Print("define bb:name=%s:rt=%d (table:cnt=%d)\n",blackboxName[where],where+BLACKBOX_OFFSET,where);
 #endif
-  if (bb->blackbox_destroy==NULL) bb->blackbox_destroy=blackbox_default_destroy;
-  if (bb->blackbox_String==NULL)  bb->blackbox_String=blackbox_default_String;
-  if (bb->blackbox_Print==NULL)   bb->blackbox_Print=blackbox_default_Print;
-  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=blackboxDefaultOp1;
-  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;
+    if (bb->blackbox_destroy==NULL) bb->blackbox_destroy=blackbox_default_destroy;
+    if (bb->blackbox_String==NULL)  bb->blackbox_String=blackbox_default_String;
+    if (bb->blackbox_Print==NULL)   bb->blackbox_Print=blackbox_default_Print;
+    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=blackboxDefaultOp1;
+    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;
+    return where+BLACKBOX_OFFSET;
+  }
 }
 void removeBlackboxStuff(const int rt)
 {
+  omfree(blackboxTable[rt-BLACKBOX_OFFSET]);
+  omfree(blackboxName[rt-BLACKBOX_OFFSET]);
   blackboxTable[rt-BLACKBOX_OFFSET]=NULL;
   blackboxName[rt-BLACKBOX_OFFSET]=NULL;