Changeset b8f3d2 in git

Timestamp:

Jul 14, 2006, 6:53:57 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a239a9779b8d405af74fa608d28473247c5dd510

Parents:

c8cb6eecf51c0f874cb455274377c7bd4fbf342b

Message:

*hannes: memory: return type int -> bigint


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

Files:

• Singular/iparith.cc (modified) (5 diffs)
• doc/reference.doc (modified) (previous)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.404 2006-06-30 16:07:54 Singular Exp $ */
+/* $Id: iparith.cc,v 1.405 2006-07-14 16:53:55 Singular Exp $ */
 
 /*
@@ -3692 +3692 @@
   return FALSE;
 }
+#if SIZEOF_LONG == 8
+static number jjBI2N(long d);
+#else
+#define jjBI2N(D) nlInit((int)D)
+#endif
 static BOOLEAN jjMEMORY(leftv res, leftv v)
 {
   omUpdateInfo();
+  long d;
   switch(((int)(long)v->Data()))
   {
   case 0:
-    res->data = (char *)om_Info.UsedBytes;
+    res->data=(char *)jjBI2N(om_Info.UsedBytes);
     break;
   case 1:
-    res->data = (char *)om_Info.CurrentBytesSystem;
+    res->data = (char *)jjBI2N(om_Info.CurrentBytesSystem);
     break;
   case 2:
-    res->data = (char *)om_Info.MaxBytesSystem;
+    res->data = (char *)jjBI2N(om_Info.MaxBytesSystem);
     break;
 
@@ -3712 +3718 @@
     omPrintBinStats(stdout);
     res->data = (char *)0;
+    res->rtyp = NONE;
   }
   return FALSE;
@@ -3717 +3724 @@
   return FALSE;
 }
+#if SIZEOF_LONG == 8
+static number jjBI2N(long d)
+{
+  if (d<((long)INT_MAX)) return nlInit((int)d);
+  else
+  {
+    number n=nlRInit(0);
+    mpz_set_si(&n->z,d);
+    return n;
+  }
+}
+#endif
 static BOOLEAN jjMONITOR1(leftv res, leftv v)
 {
@@ -4625 +4644 @@
 ,{jjDUMMY,      MATRIX_CMD,      MATRIX_CMD,     MATRIX_CMD     ALLOW_PLURAL}
 ,{jjidMaxIdeal, MAXID_CMD,       XS(IDEAL_CMD),  INT_CMD        ALLOW_PLURAL}
-,{jjMEMORY,     MEMORY_CMD,      INT_CMD,        INT_CMD        ALLOW_PLURAL}
+,{jjMEMORY,     MEMORY_CMD,      BIGINT_CMD,     INT_CMD        ALLOW_PLURAL}
 ,{jjidMinBase,  MINBASE_CMD,     XS(IDEAL_CMD),  IDEAL_CMD      NO_PLURAL}
 ,{jjidMinBase,  MINBASE_CMD,     XS(MODUL_CMD),  MODUL_CMD      NO_PLURAL}