Changeset 73a7ff in git

Timestamp:

May 30, 2006, 9:28:21 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

d45ad9b4fc43037b47292cb6d24fc9e6f9f539df

Parents:

79da9b20f112d01ae5c92f2e7576c6e09b756c2d

Message:

*hannes: more bigint


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

Location:

Singular

Files:

• iparith.cc (modified) (6 diffs)
• ipassign.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.399 2006-05-29 12:34:41 Singular Exp $ */
+/* $Id: iparith.cc,v 1.400 2006-05-30 07:28:20 Singular Exp $ */
 
 /*
@@ -639 +639 @@
   }
 }
+static BOOLEAN jjPOWER_BI(leftv res, leftv u, leftv v)
+{
+  int e=(int)(long)v->Data();
+  number n=(number)u->Data();
+  if (e>=0)
+  {
+    nlPower(n,e,(number*)&res->data);
+  }
+  else
+  {
+    WerrorS("exponent must be non-negative");
+    return TRUE;
+  }
+  if (u!=NULL) return jjOP_REST(res,u,v);
+  return FALSE;
+}
 static BOOLEAN jjPOWER_N(leftv res, leftv u, leftv v)
 {
   int e=(int)(long)v->Data();
-  number n=(number)u->CopyD(NUMBER_CMD);
+  number n=(number)u->Data();
+  int d=0;
   if (e<0)
   {
-    number m=nInvers(n);
-    nDelete(&n);
-    n=m;
+    n=nInvers(n);
     e=-e;
+    d=1;
   }
   nPower(n,e,(number*)&res->data);
-  nDelete(&n);
+  if (d) nDelete(&n);
   if (u!=NULL) return jjOP_REST(res,u,v);
   return FALSE;
@@ -2838 +2854 @@
 ,{jjMOD_N,     INTMOD_CMD,     NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
 ,{jjPOWER_I,   '^',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
+,{jjPOWER_BI,   '^',           BIGINT_CMD,     BIGINT_CMD, INT_CMD ALLOW_PLURAL}
 ,{jjPOWER_N,   '^',            NUMBER_CMD,     NUMBER_CMD, INT_CMD ALLOW_PLURAL}
 ,{jjPOWER_P,   '^',            POLY_CMD,       POLY_CMD,   INT_CMD ALLOW_PLURAL}
@@ -4413 +4430 @@
 static BOOLEAN jjnInt(leftv res, leftv u)
 {
-  number n=(number)u->CopyD(NUMBER_CMD);
+  number n=(number)u->Data();
   res->data=(char *)nInt(n);
-  nDelete(&n);
+  return FALSE;
+}
+static BOOLEAN jjnlInt(leftv res, leftv u)
+{
+  number n=(number)u->Data();
+  res->data=(char *)nlInt(n);
   return FALSE;
 }
@@ -4444 +4466 @@
 ,{jjBETTI,      BETTI_CMD,       INTMAT_CMD,     IDEAL_CMD      ALLOW_PLURAL}
 ,{jjBETTI,      BETTI_CMD,       INTMAT_CMD,     MODUL_CMD      ALLOW_PLURAL}
+,{jjDUMMY,      BIGINT_CMD,      BIGINT_CMD,     BIGINT_CMD     ALLOW_PLURAL}
 ,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     RING_CMD       ALLOW_PLURAL}
 ,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD      ALLOW_PLURAL}
@@ -4530 +4553 @@
 ,{jjINDEPSET,   INDEPSET_CMD,    INTVEC_CMD,     IDEAL_CMD      NO_PLURAL}
 ,{jjDUMMY,      INT_CMD,         INT_CMD,        INT_CMD        ALLOW_PLURAL}
+,{jjnlInt,      INT_CMD,         INT_CMD,        BIGINT_CMD     ALLOW_PLURAL}
 ,{jjnInt,       INT_CMD,         INT_CMD,        NUMBER_CMD     ALLOW_PLURAL}
 ,{jjP2I,        INT_CMD,         INT_CMD,        POLY_CMD       ALLOW_PLURAL}

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.81 2005-10-24 12:21:41 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.82 2006-05-30 07:28:21 Singular Exp $ */
 
 /*
@@ -26 +26 @@
 #include "ring.h"
 #include "subexpr.h"
+#include "lists.h"
 #include "numbers.h"
-#include "lists.h"
+//#include "modulop.h"
 #include "longalg.h"
 #include "stairc.h"
@@ -283 +284 @@
   if (res->data!=NULL) nDelete((number *)&res->data);
   nNormalize(p);
+  res->data=(void *)p;
+  jiAssignAttr(res,a);
+  return FALSE;
+}
+static BOOLEAN jiA_BIGINT(leftv res, leftv a, Subexpr e)
+{
+  number p=(number)a->CopyD(BIGINT_CMD);
+  if (res->data!=NULL) nlDelete((number *)&res->data,NULL);
   res->data=(void *)p;
   jiAssignAttr(res,a);
@@ -602 +611 @@
 ,{jiA_INTVEC,   INTMAT_CMD,     INTMAT_CMD }
 ,{jiA_NUMBER,   NUMBER_CMD,     NUMBER_CMD }
+,{jiA_BIGINT,   BIGINT_CMD,     BIGINT_CMD }
 ,{jiA_LIST_RES, LIST_CMD,       RESOLUTION_CMD }
 ,{jiA_LIST,     LIST_CMD,       LIST_CMD }