Changeset 115639 in git

Timestamp:

Mar 1, 2011, 6:21:05 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

b521f3698286cefec0d2866b873155439fcc9619

Parents:

2c470d08ccdc9d28a3c5007e5cc99fe10e6d522c

Message:

ADD: call bigintm_setup using system("bigintm_setup"); (due to extra.cc)
ADD: bigintm_setup should better return BOOLEAN
ADD: better development prints for blackbox objects
ADD: save static type (bigintm) ID

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

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

Location:

Singular

Files:

• bigintm.cc (modified) (7 diffs)
• bigintm.h (modified) (1 diff)
• blackbox.cc (modified) (4 diffs)
• extra.cc (modified) (3 diffs)

Singular/bigintm.cc

@@ -8 +8 @@
 #include <Singular/bigintm.h>
 
-// as this is only a demo,
-// we do not included compiled code:
-#if 0
-char * bigintm_String(blackbox *b, void *d);
-void * bigintm_Copy(blackbox*b, void *d);
-BOOLEAN bigintm_Assign(leftv l, leftv r);
-BOOLEAN bigintm_Op2(int op, leftv res, leftv a1, leftv a2);
-BOOLEAN bigintm_OpM(int op, leftv res, leftv args);
-void bigintm_destroy(blackbox *b, void *d);
 
-void bigintm_setup()
-{
-  blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
-  // all undefined entries will be set to default in setBlackboxStuff
-  // the default Print is quite usefule,
-  // all other are simply error messages
-  b->blackbox_destroy=bigintm_destroy;
-  b->blackbox_String=bigintm_String;
-  //b->blackbox_Print=blackbox_default_Print;
-  //b->blackbox_Init=blackbox_default_Init;
-  b->blackbox_Copy=bigintm_Copy;
-  b->blackbox_Assign=bigintm_Assign;
-  //b->blackbox_Op1=blackboxDefaultOp1;
-  b->blackbox_Op2=bigintm_Op2;
-  //b->blackbox_Op3=blackbox_default_Op3;
-  b->blackbox_OpM=bigintm_OpM;
-  int rt=setBlackboxStuff(b,"bigintm");
-  Print("create type %d (bigintm)\n",rt); 
-}
+#define HAVE_BIGINTM 1
 
-char * bigintm_String(blackbox *b, void *d)
+#ifdef HAVE_BIGINTM
+static int bigintm_type_id = -1;
+#endif
+
+
+#ifdef HAVE_BIGINTM
+static char * bigintm_String(blackbox *b, void *d)
 { if (d==NULL) return omStrDup("oo");
    else
@@ -47 +26 @@
     }
 }
-void * bigintm_Copy(blackbox*b, void *d)
+static void * bigintm_Copy(blackbox*b, void *d)
 {  number n=(number)d; return nlCopy(n); }
 
-BOOLEAN bigintm_Assign(leftv l, leftv r)
+static BOOLEAN bigintm_Assign(leftv l, leftv r)
 {
+  assume( l->Typ() == bigintm_type_id );
+  
   blackbox *ll=getBlackboxStuff(l->Typ());
+  
   if (r->Typ()>MAX_TOK)
   {
-    blackbox *rr=getBlackboxStuff(r->Typ());
-    if (l->Typ()==r->Typ())
+    if (bigintm_type_id == r->Typ())
     {
+      blackbox *rr=getBlackboxStuff(r->Typ());
+      
       if (l->Data()!=NULL) { number n1=(number)l->Data(); nlDelete(&n1,NULL); }
       number n2=(number)r->CopyD();
@@ -72 +55 @@
     else
     {
-      Werror("assign %d = %d",l->Typ(),r->Typ());
+      Werror("bigintm_Assign: assign %s (%d) = %s (%d)",
+             getBlackboxName(l->Typ()), l->Typ(),
+             getBlackboxName(r->Typ()), r->Typ());
       return TRUE;
     }
@@ -94 +79 @@
   return TRUE;
 }
-BOOLEAN bigintm_OpM(int op, leftv res, leftv args);
+static BOOLEAN bigintm_OpM(int op, leftv res, leftv args);
 
 
-BOOLEAN bigintm_Op2(int op, leftv res, leftv a1, leftv a2)
+static BOOLEAN bigintm_Op2(int op, leftv res, leftv a1, leftv a2)
 {
   // interpreter: a1 is ist bigintm
+  assume( a1->Typ() == bigintm_type_id );
+  
   blackbox *a=getBlackboxStuff(a1->Typ());
   number n1=(number)a1->Data(); 
@@ -124 +111 @@
       return TRUE;
     }
+    default:
+      Werror("bigintm_Op2: op %d not implemented for type %s (%d)", op, getBlackboxName(a1->Typ()), a1->Typ());
+      break;
   }
   return blackboxDefaultOp2(op,res,a1,a2);
 }
 // BOOLEAN opM(int op, leftv res, leftv args)
-BOOLEAN bigintm_OpM(int op, leftv res, leftv args)
+static BOOLEAN bigintm_OpM(int op, leftv res, leftv args)
 {
   // interpreter: args->1. arg is ist bigintm
+  assume( args->Typ() == bigintm_type_id );
   blackbox *a=getBlackboxStuff(args->Typ());
   switch(op)
@@ -141 +132 @@
     }
     default:
-      Werror("op %d not implemented for type %d",op,args->Typ());
+      Werror("bigintm_OpM: op %d not implemented for type %s (%d)", op, getBlackboxName(args->Typ()), args->Typ());
       break;
   }
   return TRUE;
 }
-void bigintm_destroy(blackbox *b, void *d)
+static void bigintm_destroy(blackbox *b, void *d)
 {
   if (d!=NULL)
@@ -154 +145 @@
   }
 }
+
 #endif
+
+
+
+
+// this is only a demo
+BOOLEAN bigintm_setup()
+{
+#ifndef HAVE_BIGINTM
+  Werror("bigintm_setup: Sorry BIGINTM was not compiled in!");
+  return TRUE; // ok, TRUE = error!
+#else
+
+  if( bigintm_type_id == -1 )
+  {
+    blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
+    // all undefined entries will be set to default in setBlackboxStuff
+    // the default Print is quite usefule,
+    // all other are simply error messages
+    b->blackbox_destroy=bigintm_destroy;
+    b->blackbox_String=bigintm_String;
+    //b->blackbox_Print=blackbox_default_Print;
+    //b->blackbox_Init=blackbox_default_Init;
+    b->blackbox_Copy=bigintm_Copy;
+    b->blackbox_Assign=bigintm_Assign;
+    //b->blackbox_Op1=blackboxDefaultOp1;
+    b->blackbox_Op2=bigintm_Op2;
+    //b->blackbox_Op3=blackbox_default_Op3;
+    b->blackbox_OpM=bigintm_OpM;
+
+    bigintm_type_id = setBlackboxStuff(b,"bigintm");
+
+    Print("bigintm_setup: create type %d (%s)",bigintm_type_id, getBlackboxName(bigintm_type_id));
+    PrintLn();
+
+    return FALSE; // ok, TRUE = error!
+  } else
+  {
+    Werror("bigintm_setup: Sorry should NOT be run twice!");
+    return TRUE; // ok, TRUE = error!
+  }
+
+#endif
+}
+
+
+

Singular/bigintm.h

@@ -2 +2 @@
 #define BIGINTM_H
 
-void bigintm_setup();
+BOOLEAN bigintm_setup();
 
 #endif

Singular/blackbox.cc

@@ -5 +5 @@
 #include <Singular/blackbox.h>
 
-//#define BLACKBOX_DEVEL 1
 #define MAX_BB_TYPES 256
+// #define BLACKBOX_DEVEL 1
 
 static blackbox* blackboxTable[MAX_BB_TYPES];
@@ -103 +103 @@
     blackboxName[where]=omStrDup(n);
 #ifdef BLACKBOX_DEVEL
-    Print("define bb:name=%s:rt=%d (table:cnt=%d)\n",blackboxName[where],where+BLACKBOX_OFFSET,where);
+  Print("setBlackboxStuff: 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;
@@ -138 +138 @@
     {
 #ifdef BLACKBOX_DEVEL
-      Print("found bb:%s:%d (table:%d)\n",n,i+BLACKBOX_OFFSET,i);
+      Print("blackboxIsCmd: found bb:%s:%d (table:%d)\n",n,i+BLACKBOX_OFFSET,i);
 #endif
       tok=i+BLACKBOX_OFFSET;
@@ -152 +152 @@
   {
     if (blackboxName[i]!=NULL)
-      Print("type %d: %s\n",i,blackboxName[i]);
+      Print("printBlackboxTypes: blackbox-type %d: %s\n",i,blackboxName[i]);
   }
 }

Singular/extra.cc

@@ -162 +162 @@
 //#endif /* not HAVE_DYNAMIC_LOADING */
 
+#include <Singular/bigintm.h>
+
 #ifdef ix86_Win
 //#include <Python.h>
@@ -175 +177 @@
 #ifdef ix86_Win  /* PySingular initialized? */
 static int PyInitialized = 0;
+#endif
+
+#if SIZEOF_LONG == 8
+static number jjLONG2N(long d)
+{
+  int i=(int)d;
+  if ((long)i == d)
+  {
+    return nlInit(i, NULL);
+  }
+  else
+  {
+#if !defined(OM_NDEBUG) && !defined(NDEBUG)
+    omCheckBin(rnumber_bin);
+#endif
+    number z=(number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+    z->debug=123456;
+#endif
+    z->s=3;
+    mpz_init_set_si(z->z,d);
+    return z;
+  }
+}
+#else
+#define jjLONG2N(D) nlInit((int)D, NULL)
 #endif
 
@@ -3878 +3906 @@
     printBlackboxTypes();
     return FALSE;
-  }
-  else
+  } else
+/*==================== init the bigintm (a sample blackbox) type =========*/
+  if(strcmp(sys_cmd,"bigintm_setup") == 0)
+  {
+    return bigintm_setup();
+  } else
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );