Changeset 84a6a7 in git

Timestamp:

May 29, 2006, 5:14:30 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7145030af0d072406bdbbd5f4cbd550cdea8ccba

Parents:

e9fe0516c17fbf29b282b51748cbc90f6e3a2ad2

Message:

*hannes: bigint prep (2)


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

Location:

Singular

Files:

• ipid.cc (modified) (4 diffs)
• subexpr.cc (modified) (12 diffs)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.73 2005-12-16 08:58:56 Singular Exp $ */
+/* $Id: ipid.cc,v 1.74 2006-05-29 15:14:29 Singular Exp $ */
 
 /*
@@ -18 +18 @@
 #include "febase.h"
 #include "numbers.h"
+#include "longrat.h"
 #include "polys.h"
 #include "ring.h"
@@ -248 +249 @@
         IDNUMBER(h) = nInit(0);
         break;
+      case BIGINT_CMD:
+        IDNUMBER(h) = nlInit(0);
+        break;
       case IDEAL_CMD:
       case MODUL_CMD:
@@ -614 +618 @@
     assume(r!=NULL);
     n_Delete(&IDNUMBER(h),r);
+  }
+  // bigint -------------------------------------------------------------
+  else if (IDTYP(h) == BIGINT_CMD)
+  {
+    nlDelete(&IDNUMBER(h),NULL);
   }
   // intvec / intmat  ---------------------------------------------------

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.93 2006-02-10 13:12:38 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.94 2006-05-29 15:14:30 Singular Exp $ */
 
 #include <stdlib.h>
@@ -29 +29 @@
 #include "ffields.h"
 #include "numbers.h"
+#include "longrat.h"
 #include "ipshell.h"
 #include "lists.h"
@@ -184 +185 @@
           }
         case NUMBER_CMD:
+        case BIGINT_CMD:
           s=String(d);
           if (s==NULL) return;
@@ -300 +302 @@
       case NUMBER_CMD:
         if (r!=NULL) n_Delete((number *)(&data),r);
+        break;
+      case BIGINT_CMD:
+        nlDelete((number *)(&data),r);
         break;
       case LIST_CMD:
@@ -457 +462 @@
     case NUMBER_CMD:
       return  (void *)nCopy((number)d);
+    case BIGINT_CMD:
+      return  (void *)nlCopy((number)d);
     case MAP_CMD:
       return  (void *)maCopy((map)d);
@@ -598 +605 @@
     if (name!=NULL) n=name;
     else n=sNoName;
-    switch (Typ())
+    int t=Typ();
+    switch (t /*Typ()*/)
     {
         case INT_CMD:
@@ -636 +644 @@
             char* ps = pString((poly) d);
             s = (char*) omAlloc(strlen(ps) + 10);
-            sprintf(s,"%s(%s)", (Typ() == POLY_CMD ? "poly" : "vector"), ps);
+            sprintf(s,"%s(%s)", (t /*Typ()*/ == POLY_CMD ? "poly" : "vector"), ps);
             return s;
           }
@@ -666 +674 @@
           s = StringAppendS((char*) (typed ? ")" : ""));
           return omStrDup(s);
+
+        case BIGINT_CMD:
+          {
+          StringSetS((char*) (typed ? "bigint(" : ""));
+          number nl=(number)d;
+          nlWrite(nl);
+          s = StringAppendS((char*) (typed ? ")" : ""));
+          return omStrDup(s);
+          }
 
         case MATRIX_CMD:
@@ -689 +706 @@
           {
             char* ns = (char*) omAlloc(strlen(s) + 10);
-            sprintf(ns, "%s(%s)", (Typ()==MODUL_CMD ? "module" : "ideal"), s);
+            sprintf(ns, "%s(%s)", (t/*Typ()*/==MODUL_CMD ? "module" : "ideal"), s);
             omCheckAddr(ns);
             return ns;
@@ -703 +720 @@
           {
             char* ns;
-            if (Typ() == INTMAT_CMD)
+            if (t/*Typ()*/ == INTMAT_CMD)
             {
               ns = (char*) omAlloc(strlen(s) + 40);
@@ -728 +745 @@
           {
             char* ns;
-            if (Typ() == QRING_CMD)
+            if (t/*Typ()*/ == QRING_CMD)
             {
               char* id = iiStringMatrix((matrix) ((ring) d)->qideal, dim);
@@ -1569 +1586 @@
 #endif
       break;
+    case BIGINT_CMD:
+#ifdef LDEBUG
+      nlTest((number)Data());
+#endif
+      break;
     case POLY_CMD:
       pTest((poly)Data());