Changeset 9c97cd4 in git for Singular/ipshell.cc

Timestamp:

Sep 12, 2013, 3:50:34 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

534bf97a4c2f4b22e8d36d3ab35606b3938e6a087627f67da8dc2c135f659c4e3f2ef25e3de4f00e

Parents:

56209f8653229a50b5d3c8ae9e5b129acee31d02

Message:

chg: Z/n can be defined via integer,n for bigint n

File:

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

Singular/ipshell.cc

@@ -1708 +1708 @@
   LL->Init(2);
     LL->m[0].rtyp=INT_CMD;
-    LL->m[0].data=(void *)si_max(R->cf->float_len,SHORT_REAL_LENGTH/2);
+    LL->m[0].data=(void *)(long)si_max(R->cf->float_len,SHORT_REAL_LENGTH/2);
     LL->m[1].rtyp=INT_CMD;
-    LL->m[1].data=(void *)si_max(R->cf->float_len2,SHORT_REAL_LENGTH);
+    LL->m[1].data=(void *)(long)si_max(R->cf->float_len2,SHORT_REAL_LENGTH);
   L->m[1].rtyp=LIST_CMD;
   L->m[1].data=(void *)LL;
@@ -1806 +1806 @@
     // char:
     Lc->m[0].rtyp=INT_CMD;
-    Lc->m[0].data=(void*)r->cf->m_nfCharQ;
+    Lc->m[0].data=(void*)(long)r->cf->m_nfCharQ;
     // var:
     lists Lv=(lists)omAlloc0Bin(slists_bin);
@@ -1841 +1841 @@
   {
     L->m[0].rtyp=INT_CMD;
-    L->m[0].data=(void *)r->cf->ch;
+    L->m[0].data=(void *)(long)r->cf->ch;
   }
   // ----------------------------------------
@@ -5177 +5177 @@
     modBase = (int_number) omAlloc(sizeof(mpz_t));
     mpz_init_set_si(modBase, 0);
-    if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
-    {
-      mpz_set_ui(modBase, (int)(long) pn->next->Data());
-      pn=pn->next;
-      if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
-      {
-        modExponent = (long) pn->next->Data();
+    if (pn->next!=NULL)
+    {
+      if (pn->next->Typ()==INT_CMD)
+      {
+        mpz_set_ui(modBase, (int)(long) pn->next->Data());
         pn=pn->next;
-      }
-      while ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
-      {
-        mpz_mul_ui(modBase, modBase, (int)(long) pn->next->Data());
-        pn=pn->next;
+        if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
+        {
+          modExponent = (long) pn->next->Data();
+          pn=pn->next;
+        }
+        while ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
+        {
+          mpz_mul_ui(modBase, modBase, (int)(long) pn->next->Data());
+          pn=pn->next;
+        }
+      }
+      else if (pn->next->Typ()==BIGINT_CMD)
+      {
+        number p=(number)pn->next->CopyD();
+        nlGMP(p,(number)modBase,coeffs_BIGINT);
+        nlDelete(&p,coeffs_BIGINT);
       }
     }