Changeset a4c74f in git

Timestamp:

Jul 16, 1999, 6:07:22 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

86050ee275fe1a82d0ab4c97fb6fa4560231a142

Parents:

cedc3f5ddbba05d8f7f30511c0afe931d1b91fd5

Message:

* hanens: optimized int-reading


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

Location:

Singular

Files:

• febase.cc (modified) (2 diffs)
• ffields.cc (modified) (2 diffs)
• grammar.y (modified) (3 diffs)
• modulop.cc (modified) (2 diffs)
• scanner.l (modified) (2 diffs)
• shortfl.cc (modified) (2 diffs)
• syz1.cc (modified) (7 diffs)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.74 1999-07-06 15:32:43 Singular Exp $ */
+/* $Id: febase.cc,v 1.75 1999-07-16 16:07:17 Singular Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -1194 +1194 @@
       *i += *s++ - '0';
       l++;
-      if ((l>MAX_INT_LEN)||((*i) <0))
+      if ((l>=MAX_INT_LEN)||((*i) <0))
       {
         s-=l;
         Werror("`%s` greater than %d(max. integer representation)",
-                s,INT_MAX);
+                s,MAX_INT_VAL);
         return s;
       }

Singular/ffields.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.cc,v 1.19 1999-05-10 15:10:48 Singular Exp $ */
+/* $Id: ffields.cc,v 1.20 1999-07-16 16:07:18 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -487 +487 @@
       *i *= 10;
       *i += *s++ - '0';
-      if (*i > (INT_MAX / 10)) *i = *i % nfCharP;
+      if (*i > (MAX_INT_VAL / 10)) *i = *i % nfCharP;
     }
     while (*s >= '0' && *s <= '9');

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.63 1999-07-14 13:16:00 Singular Exp $ */
+/* $Id: grammar.y,v 1.64 1999-07-16 16:07:19 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -506 +506 @@
             if (l >= MAX_INT_LEN)
             {
-              char tmp[100];
+              char tmp[MAX_INT_LEN+5];
               sprintf(tmp,"%d",i);
               if (strcmp(tmp,$1)!=0)
@@ -513 +513 @@
                 {
                   Werror("`%s` greater than %d(max. integer representation)"
-                         ,$1,INT_MAX);
+                         ,$1,MAX_INT_VAL);
                   YYERROR;
                 }

Singular/modulop.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: modulop.cc,v 1.10 1999-05-10 15:10:50 Singular Exp $ */
+/* $Id: modulop.cc,v 1.11 1999-07-16 16:07:20 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo p (<=32003)
@@ -175 +175 @@
       (*i) *= 10;
       (*i) += *s++ - '0';
-      if ((*i) >= (INT_MAX / 10)) (*i) = (*i) % npPrimeM;
+      if ((*i) >= (MAX_INT_VAL / 10)) (*i) = (*i) % npPrimeM;
     }
     while (((*s) >= '0') && ((*s) <= '9'));

Singular/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.18 1999-07-09 14:58:29 Singular Exp $ */
+/* $Id: scanner.l,v 1.19 1999-07-16 16:07:21 Singular Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -257 +257 @@
 {integer}                {
                            lvalp->name = (char *)yytext;
-                           if ((currRing!=NULL)
-                           && (strlen(lvalp->name)>MAX_INT_LEN))
-                           {
-                             lvalp->name = mstrdup((char *)yytext);
-                             return RINGVAR;
-                           }
-                           else
-                             return INT_CONST;
+                           return INT_CONST;
                          }
 {integer}\/{integer}     {

Singular/shortfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: shortfl.cc,v 1.9 1999-06-28 16:06:31 Singular Exp $ */
+/* $Id: shortfl.cc,v 1.10 1999-07-16 16:07:21 Singular Exp $ */
 
 /*
@@ -55 +55 @@
   int i;
   float r = nf(n).F();
-  if (((float)INT_MIN <= r) || ((float)INT_MAX >= r))
+  if (((float)INT_MIN <= r) || ((float)MAX_INT_VAL >= r))
     i = (int)r;
   else

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.37 1999-06-07 15:46:02 obachman Exp $ */
+/* $Id: syz1.cc,v 1.38 1999-07-16 16:07:22 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -303 +303 @@
   {
     i=1;
-    j = -INT_MAX;
+    j = -MAX_INT_VAL;
     int *ip=binomials+pGetExp(p,1);
     loop
@@ -607 +607 @@
 #endif
 {
-  int i2=-INT_MAX;
+  int i2=-MAX_INT_VAL;
   int i1;
   int j;
@@ -659 +659 @@
           pAddExp(tm2,1, pGetExp(m,1));
           int *ip=binomials+pGetExp(tm2,1);
-          i2=-INT_MAX;
+          i2=-MAX_INT_VAL;
           loop
           {
@@ -737 +737 @@
             pAddExp(tm2,1, pGetExp(m,1));
             int *ip=binomials+pGetExp(tm2,1);
-            i2=-INT_MAX;
+            i2=-MAX_INT_VAL;
             loop
             {
@@ -2781 +2781 @@
 {
 #ifdef __MWERKS__
-  const double m=(double)INT_MAX;
+  const double m=(double)MAX_INT_VAL;
   double t=1.0;
   unsigned int h_d=1;
@@ -2798 +2798 @@
   long long t=1, h_d=1;
   long long h_n=1+pVariables;
-  while ((t=((t*h_n)/h_d))<INT_MAX)
+  while ((t=((t*h_n)/h_d))<MAX_INT_VAL)
   {
     h_d++;