Changeset 7447d8 in git for kernel/ffields.cc

Timestamp:

Jul 27, 2005, 5:48:29 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0b5a8b964a0f8ffcf71b80e540492fabe3f379ce

Parents:

7adb161bdb6d1b153d8380ad71f162acf6914d8f

Message:

*hannes: gcc 4 and 64bit


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

File:

• kernel/ffields.cc (modified) (18 diffs)

kernel/ffields.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.cc,v 1.2 2005-07-27 09:46:20 Singular Exp $ */
+/* $Id: ffields.cc,v 1.3 2005-07-27 15:48:28 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -123 +123 @@
 BOOLEAN nfDBTest (number a, char *f, int l)
 {
-  if (((int)a<0) || ((int)a>nfCharQ))
-  {
-    Print("wrong %d in %s:%d\n",(int)a,f,l);
+  if (((long)a<0L) || ((long)a>(long)nfCharQ))
+  {
+    Print("wrong %d in %s:%d\n",(int)((long)a),f,l);
     return FALSE;
   }
@@ -163 +163 @@
   nfTest(b);
 #endif
-  if (((int)a == nfCharQ) || ((int)b == nfCharQ))
+  if (((long)a == (long)nfCharQ) || ((long)b == (long)nfCharQ))
     return (number)nfCharQ;
   /*else*/
-  int i=(int)a+(int)b;
+  int i=(int)((long)a+(long)b);
   if (i>=nfCharQ1) i-=nfCharQ1;
 #ifdef LDEBUG
@@ -213 +213 @@
   nfTest(n);
 #endif
-  if(nfCharQ == (int)n) return -1;
-  return (int)n;
+  if((long)nfCharQ == (long)n) return -1;
+  return (int)((long)n);
 }
 
@@ -236 +236 @@
   nfTest(b);
 #endif
-  if (nfCharQ == (int)a) return b;
-  if (nfCharQ == (int)b) return a;
-  int zb,zab,r;
-  if ((int)a >= (int)b)
-  {
-    zb = (int)b;
-    zab = (int)a-(int)b;
+  if ((long)nfCharQ == (long)a) return b;
+  if ((long)nfCharQ == (long)b) return a;
+  long zb,zab,r;
+  if ((long)a >= (long)b)
+  {
+    zb = (long)b;
+    zab = (long)a-(long)b;
   }
   else
   {
-    zb = (int)a;
-    zab = (int)b-(int)a;
+    zb = (long)a;
+    zab = (long)b-(long)a;
   }
 #ifdef LDEBUG
   nfTest((number)zab);
 #endif
-  if (nfPlus1Table[zab]==nfCharQ) r=nfCharQ; /*if z^(a-b)+1 =0*/
+  if (nfPlus1Table[zab]==nfCharQ) r=(long)nfCharQ; /*if z^(a-b)+1 =0*/
   else
   {
-    r= zb+nfPlus1Table[zab];
-    if(r>=nfCharQ1) r-=nfCharQ1;
+    r= zb+(long)nfPlus1Table[zab];
+    if(r>=(long)nfCharQ1) r-=(long)nfCharQ1;
   }
 #ifdef LDEBUG
@@ -281 +281 @@
   nfTest(a);
 #endif
-  return nfCharQ == (int)a;
+  return (long)nfCharQ == (long)a;
 }
 
@@ -292 +292 @@
   nfTest(a);
 #endif
-  return 0 == (int)a;
+  return 0L == (long)a;
 }
 
@@ -303 +303 @@
   nfTest(a);
 #endif
-  if (0 == (int)a) return FALSE; /* special handling of char 2*/
-  return nfM1 == (int)a;
+  if (0L == (long)a) return FALSE; /* special handling of char 2*/
+  return (long)nfM1 == (long)a;
 }
 
@@ -315 +315 @@
   nfTest(b);
 #endif
-  if ((int)b==nfCharQ)
+  if ((long)b==(long)nfCharQ)
   {
     WerrorS("div. by 0");
-    return (number)nfCharQ;
-  }
-#ifdef LDEBUG
-  nfTest(a);
-#endif
-  if ((int)a==nfCharQ)
-    return (number)nfCharQ;
+    return (number)((long)nfCharQ);
+  }
+#ifdef LDEBUG
+  nfTest(a);
+#endif
+  if ((long)a==(long)nfCharQ)
+    return (number)((long)nfCharQ);
   /*else*/
-  int s = (int)a - (int)b;
-  if (s < 0)
-    s += nfCharQ1;
+  long s = (long)a - (long)b;
+  if (s < 0L)
+    s += (long)nfCharQ1;
 #ifdef LDEBUG
   nfTest((number)s);
@@ -343 +343 @@
   nfTest(c);
 #endif
-  if ((int)c==nfCharQ)
+  if ((long)c==(long)nfCharQ)
   {
     WerrorS("div. 1/0");
-    return (number)nfCharQ;
-  }
-#ifdef LDEBUG
-  nfTest(((number)(nfCharQ1-(int)c)));
-#endif
-  return (number)(nfCharQ1-(int)c);
+    return (number)((long)nfCharQ);
+  }
+#ifdef LDEBUG
+  nfTest(((number)((long)nfCharQ1-(long)c)));
+#endif
+  return (number)((long)nfCharQ1-(long)c);
 }
 
@@ -363 +363 @@
   nfTest(c);
 #endif
-  if (nfCharQ == (int)c) return c;
-  int i=(int)c+nfM1;
-  if (i>=nfCharQ1) i-=nfCharQ1;
+  if ((long)nfCharQ == (long)c) return c;
+  long i=(long)c+(long)nfM1;
+  if (i>=(long)nfCharQ1) i-=(long)nfCharQ1;
 #ifdef LDEBUG
   nfTest((number)i);
@@ -381 +381 @@
   nfTest(b);
 #endif
-  return (int)a != (int)b;
+  return (long)a != (long)b;
 }
 
@@ -393 +393 @@
   nfTest(b);
 #endif
-  return (int)a == (int)b;
+  return (long)a == (long)b;
 }
 
@@ -404 +404 @@
   nfTest(a);
 #endif
-  if ((int)a==nfCharQ)  StringAppendS("0");
-  else if ((int)a==0)   StringAppendS("1");
+  if ((long)a==(long)nfCharQ)  StringAppendS("0");
+  else if ((long)a==0L)   StringAppendS("1");
   else if (nfIsMOne(a))   StringAppendS("-1");
   else
   {
     StringAppendS(nfParameter);
-    if ((int)a!=1)
+    if ((long)a!=1L)
     {
       if(currRing->ShortOut==0)  StringAppendS("^");
-      StringAppend("%d",(int)a);
+      StringAppend("%d",(int)((long)a));
     }
   }
@@ -427 +427 @@
 #endif
   char *s;
-  if (((int)a==nfCharQ) || ((int)a==0)) return NULL;
-  else if ((int)a==1)
+  if (((long)a==(long)nfCharQ) || ((long)a==0L)) return NULL;
+  else if ((long)a==1L)
   {
     return omStrDup(nfParameter);
@@ -435 +435 @@
   {
     s=(char *)omAlloc(4+strlen(nfParameter));
-    sprintf(s,"%s%d",nfParameter,(int)a);
+    sprintf(s,"%s%d",nfParameter,(int)((long)a));
   }
   return s;
@@ -450 +450 @@
   {
     //*result=nfInit(1);
-    *result = (number)0;
+    *result = (number)0L;
   }
   else if (i==1)
@@ -688 +688 @@
 number nfMapP(number c)
 {
-  return nfInit((int)c);
+  return nfInit((int)((long)c));
 }