Changeset ffde366 in git

Timestamp:

Jun 13, 2006, 12:21:01 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

92fab96123fabea4a561ea96ce147ddd6baa9dff

Parents:

7523a7be6875be53eb42a20b61a5e091af63d18a

Message:

*hannes: bigint <- number


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

Files:

• Singular/ipconv.cc (modified) (4 diffs)
• Singular/mpsr.h (modified) (2 diffs)
• kernel/longrat.h (modified) (2 diffs)

Singular/ipconv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipconv.cc,v 1.29 2006-05-29 16:10:50 Singular Exp $ */
+/* $Id: ipconv.cc,v 1.30 2006-06-13 10:21:00 Singular Exp $ */
 /*
 * ABSTRACT: automatic type conversions
@@ -18 +18 @@
 #include "numbers.h"
 #include "modulop.h"
+#include "longrat.h"
 #include "longalg.h"
 #include "matpol.h"
@@ -186 +187 @@
 }
 
+static void * iiN2BI(void *data)
+{
+  number n,i; i=(number)data;
+  if (rField_is_Zp())     n=nlInit((int)(long)data);
+  else if (rField_is_Q())
+  {
+    if ((SR_HDL(i)&SR_INT)==SR_INT) n=nlInit((int)SR_TO_INT(i));
+    else if (i->s==3)               n=nlCopy(i);
+    else { WerrorS("cannot convert to bigint"); n=nlInit(0); }
+  }
+  else { WerrorS("cannot convert to bigint"); n=nInit(0); }
+  return (void *)n;
+}
 static void * iiN2P(void *data)
 {
@@ -281 +295 @@
 //  number -> matrix
    { NUMBER_CMD,      MATRIX_CMD,     iiN2Ma  , NULL },
+//  number -> bigint
+   { NUMBER_CMD,      BIGINT_CMD,     iiN2P  , NULL },
 //  number -> ideal
 //  number -> vector

Singular/mpsr.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr.h,v 1.21 2005-07-28 17:25:25 Singular Exp $ */
+/* $Id: mpsr.h,v 1.22 2006-06-13 10:21:01 Singular Exp $ */
 /***************************************************************
  *
@@ -256 +256 @@
 #endif // MPSR_DEBUG
 
-// those defines are from longrat.cc
-// It would be nice if we could include them, but they are not defined
-// in a header file
-
-#define SR_HDL(A) ((long)(A))
-#define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))
-#define SR_TO_INT(SR)   (((long)SR) >> 2)
-
 union nf
 {

kernel/longrat.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.h,v 1.3 2006-05-02 16:25:17 Singular Exp $ */
+/* $Id: longrat.h,v 1.4 2006-06-13 10:21:01 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers
@@ -13 +13 @@
 
 typedef MP_INT lint;
+
+#define SR_HDL(A) ((long)(A))
 
 #define SR_INT    1L