Changeset a527a41 in git

Timestamp:

Jul 9, 2018, 2:39:53 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

43fa86cc32c42433e618d6c2978915bf8a580e66

Parents:

ac754db5ea554de8a6115ff7e914fb77dc57c434

Message:

move *Eati/*EatLong to numbers.cc

Location:

libpolys/coeffs

Files:

• ffields.cc (modified) (1 diff)
• flintcf_Q.cc (modified) (3 diffs)
• longrat0.cc (modified) (3 diffs)
• modulop.cc (modified) (1 diff)
• numbers.cc (modified) (1 diff)
• numbers.h (modified) (1 diff)

libpolys/coeffs/ffields.cc

@@ -499 +499 @@
 * read an integer (with reduction mod p)
 */
-static const char* nfEati(const char *s, int *i, const coeffs r)
-{
-  if (*s >= '0' && *s <= '9')
-  {
-    *i = 0;
-    do
-    {
-      *i *= 10;
-      *i += *s++ - '0';
-      if (*i > (MAX_INT_VAL / 10)) *i = *i % r->m_nfCharP;
-    }
-    while (*s >= '0' && *s <= '9');
-    if (*i >= r->m_nfCharP) *i = *i % r->m_nfCharP;
-  }
-  else *i = 1;
-  return s;
+static inline const char* nfEati(const char *s, int *i, const coeffs r)
+{
+  return nEati((char *)s,i,r->m_nfCharP);
 }
 

libpolys/coeffs/flintcf_Q.cc

@@ -44 +44 @@
   return s;
 }
-
-static const char* Eati(const char *s, int *i)
-{
-
-  if (((*s) >= '0') && ((*s) <= '9'))
-  {
-    unsigned long ii=0L;
-    do
-    {
-      ii *= 10;
-      ii += *s++ - '0';
-    }
-    while (((*s) >= '0') && ((*s) <= '9'));
-    *i=(int)ii;
-  }
-  else (*i) = 1;
-  return s;
-}
-
-
 
 static void CoeffWrite(const coeffs r, BOOLEAN details)
@@ -303 +283 @@
 // we only read "monomials" (i.e. [-][digits][parameter]),
 // everythings else (+,*,^,()) is left to the singular interpreter
-  const char *s=st;
+  char *s=(char *)st;
   *a=(number)omAlloc(sizeof(fmpq_poly_t));
   fmpq_poly_init((fmpq_poly_ptr)(*a));
@@ -329 +309 @@
     {
       int i=1;
-      s=Eati(s,&i);
+      s=nEati(s,&i,0);
       if (i!=1)
       {

libpolys/coeffs/longrat0.cc

@@ -28 +28 @@
 
 /*2
-* extracts a long integer from s, returns the rest
-*/
-const char * nlEatLong(char *s, mpz_ptr i)
-{
-  const char * start=s;
-
-  while (*s >= '0' && *s <= '9') s++;
-  if (*s=='\0')
-  {
-    mpz_set_str(i,start,10);
-  }
-  else
-  {
-    char c=*s;
-    *s='\0';
-    mpz_set_str(i,start,10);
-    *s=c;
-  }
-  return s;
-}
-
-/*2
 * extracts the number a from s, returns the rest
 */
@@ -68 +46 @@
     mpz_ptr n=(*a)->n;
     mpz_init(z);
-    s = nlEatLong((char *)s, z);
+    s = nEatLong((char *)s, z);
     if (*s == '/')
     {
@@ -74 +52 @@
       (*a)->s = 0;
       s++;
-      s = nlEatLong((char *)s, n);
+      s = nEatLong((char *)s, n);
       if (mpz_cmp_si(n,0L)==0)
       {

libpolys/coeffs/modulop.cc

@@ -264 +264 @@
 #endif
 
-static const char* npEati(const char *s, int *i, const coeffs r)
-{
-  if (((*s) >= '0') && ((*s) <= '9'))
-  {
-    unsigned long ii=0L;
-    do
-    {
-      ii *= 10;
-      ii += *s++ - '0';
-      if (ii >= (MAX_INT_VAL / 10)) ii = ii % r->ch;
-    }
-    while (((*s) >= '0') && ((*s) <= '9'));
-    if (ii >= (unsigned long)r->ch) ii = ii % r->ch;
-    *i=(int)ii;
-  }
-  else (*i) = 1;
-  return s;
+static inline const char* npEati(const char *s, int *i, const coeffs r)
+{
+  return nEati((char *)s,i,r->ch);
 }
 

libpolys/coeffs/numbers.cc

@@ -598 +598 @@
 CanonicalForm n_convSingNFactoryN( number n, BOOLEAN setChar, const coeffs r )
 { STATISTIC(n_convSingNFactoryN); assume(r != NULL); assume(r->convSingNFactoryN != NULL); return r->convSingNFactoryN(n, setChar, r); }
+
+
+char* nEati(char *s, int *i, int m)
+{
+
+  if (((*s) >= '0') && ((*s) <= '9'))
+  {
+    unsigned long ii=0L;
+    do
+    {
+      ii *= 10;
+      ii += *s++ - '0';
+      if ((m!=0) && (ii>m)) ii=ii%m;
+    }
+    while (((*s) >= '0') && ((*s) <= '9'));
+    if ((m!=0) && (ii>m)) ii=ii%m;
+    *i=(int)ii;
+  }
+  else (*i) = 1;
+  return s;
+}
+
+/// extracts a long integer from s, returns the rest
+char * nEatLong(char *s, mpz_ptr i)
+{
+  const char * start=s;
+
+  while (*s >= '0' && *s <= '9') s++;
+  if (*s=='\0')
+  {
+    mpz_set_str(i,start,10);
+  }
+  else
+  {
+    char c=*s;
+    *s='\0';
+    mpz_set_str(i,start,10);
+    *s=c;
+  }
+  return s;
+}
+

libpolys/coeffs/numbers.h

@@ -105 +105 @@
 // void ndClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, number& d, const coeffs r);
 
+/// helper routine: read an int from a string (mod m), return a pointer to the rest
+char* nEati(char *s, int *i, int m);
+
+/// extracts a long integer from s, returns the rest
+char * nEatLong(char *s, mpz_ptr i);
 #endif