Changeset 4bebba in git

Timestamp:

May 10, 2007, 9:48:36 AM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

009d804796df43404d81c335304a5d0d04f0705f

Parents:

2a4de844a903a486ebd9eb9e66e636b0c391710c

Message:

New ring definition and flags in sip_ring


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

File:

• Singular/ipshell.cc (modified) (10 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.156 2007-05-03 13:52:25 wienand Exp $ */
+/* $Id: ipshell.cc,v 1.157 2007-05-10 07:48:36 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -554 +554 @@
 }
 
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RING2TOM_OLD
 // avoid to test the "special" char: -1, 0, 1, 2
 int Is2toM(int p)  /* brute force !!!! */
@@ -4366 +4366 @@
 {
   int ch;
-#if defined(HAVE_RING2TOM)|| defined(HAVE_RINGMODN)
-  int cring = 0;
+#ifdef HAVE_RINGS
+  int ringtype = 0;
+  unsigned long ringflaga = 0;
+  unsigned int ringflagb = 0;
 #endif
   int float_len=0;
@@ -4422 +4424 @@
     }
     ch = module;
-    cring = 2;
+    ringtype = 2;
+    ringflaga = module;
   }
 #endif
@@ -4429 +4432 @@
   && (strcmp(pn->name,"modpow")==0))
   {
-    long base = 0;
-    long exp = 0;
+    unsigned long base = 0;
+    unsigned int exp = 0;
     if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
     {
@@ -4437 +4440 @@
       if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
       {
-        exp = (unsigned long) pn->next->Data();
+        exp = (unsigned int) (unsigned long) pn->next->Data();
         pn=pn->next;
       }
@@ -4449 +4452 @@
     if (base == 2)
     {
-      cring = 1; // Use Z/2^ch
+      ringtype = 1; // Use Z/2^ch
+      ringflaga = exp;
       Print("Beta: using Z/2^%d", ch);
       PrintLn();
@@ -4455 +4459 @@
     else
     {
-      cring = base;
+      ringtype = 3;
+      ringflaga = base;
+      ringflagb = exp;
+      // ch = base**exp
       Werror("p^n not yet implemented");
       goto rInitError;
@@ -4483 +4490 @@
   */
   if ((ch!=-1)
-#if defined(HAVE_RING2TOM)|| defined(HAVE_RINGMODN)
-       && (cring == 0)
+#ifdef HAVE_RINGS
+       && (ringtype == 0)
 #endif
      )
@@ -4520 +4527 @@
   R = (ring) omAlloc0Bin(sip_sring_bin);
   R->ch = ch;
-#ifdef HAVE_RING2TOM
-  R->cring = cring;
+#ifdef HAVE_RINGS
+  R->ringtype = ringtype;
+  R->ringflaga = ringflaga;
+  R->ringflagb = ringflagb;
 #endif
   if (ch == -1)