Changeset 9c83f2 in git

Timestamp:

Feb 4, 2011, 3:13:00 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

6131742d9c3d9355ca824df2aada696af30a31fd

Parents:

4581a96e8a3be34bc5a0c30e5cc4415cf45006fc

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-02-04 15:13:00+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:28+01:00

Message:

eati -> repoter
intvec.* -> misc

Files:

• kernel/febase.cc (modified) (1 diff)
• kernel/febase.h (modified) (1 diff)
• libpolys/misc/Makefile.am (modified) (1 diff)
• libpolys/misc/intvec.cc (moved) (moved from kernel/intvec.cc)
• libpolys/misc/intvec.h (moved) (moved from kernel/intvec.h) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (3 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/reporter/reporter.cc (modified) (1 diff)
• libpolys/reporter/reporter.h (modified) (1 diff)

kernel/febase.cc

@@ -1019 +1019 @@
 
 
-const char* eati(const char *s, int *i)
-{
-  int l=0;
-
-  if    (*s >= '0' && *s <= '9')
-  {
-    *i = 0;
-    while (*s >= '0' && *s <= '9')
-    {
-      *i *= 10;
-      *i += *s++ - '0';
-      l++;
-      if ((l>=MAX_INT_LEN)||((*i) <0))
-      {
-        s-=l;
-        Werror("`%s` greater than %d(max. integer representation)",
-                s,MAX_INT_VAL);
-        return s;
-      }
-    }
-  }
-  else *i = 1;
-  return s;
-}
 #else /* ! STANDALONE_PARSER */
 #include <stdio.h>

kernel/febase.h

@@ -244 +244 @@
 void    Warn(const char *fmt, ...);
 BOOLEAN contBuffer(feBufferTypes typ);
-const char *  eati(const char *s, int *i);
 BOOLEAN exitBuffer(feBufferTypes typ);
 BOOLEAN exitVoice();

libpolys/misc/Makefile.am

@@ -1 @@
-include_HEADERS=auxiliary.h mylimits.h
+include_HEADERS=auxiliary.h mylimits.h options.h
 

libpolys/misc/intvec.h

@@ -10 +10 @@
 #include <string.h>
 #include <omalloc/omalloc.h>
-#include <kernel/febase.h>
+#include <reporter/reporter.h>
 
 

libpolys/polys/monomials/p_polys.cc

@@ -19 +19 @@
 #include <coeffs/longrat.h>
 #include <misc/options.h>
+#include <misc/intvec.h>
 // #include <???/ideals.h>
 // #include <???/int64vec.h>
@@ -1871 +1872 @@
       h = nlInit(1, r->cf);
       p=ph;
+      Werror("longalg missing");
+      #if 0
       while (p!=NULL)
       { // each monom: coeff in Q_a
@@ -1934 +1937 @@
       }
       nlDelete(&h,r->algring->cf);
+      #endif
     }
   }

libpolys/polys/monomials/ring.cc

@@ -14 +14 @@
 #include <omalloc/omalloc.h>
 #include <misc/options.h>
+#include <misc/intvec.h>
 #include <polys/monomials/ring.h>
 #include <polys/monomials/p_polys.h>

libpolys/reporter/reporter.cc

@@ -375 +375 @@
 /* end extern "C" */
 }
+
+const char* eati(const char *s, int *i)
+{
+  int l=0;
+
+  if    (*s >= '0' && *s <= '9')
+  {
+    *i = 0;
+    while (*s >= '0' && *s <= '9')
+    {
+      *i *= 10;
+      *i += *s++ - '0';
+      l++;
+      if ((l>=MAX_INT_LEN)||((*i) <0))
+      {
+        s-=l;
+        Werror("`%s` greater than %d(max. integer representation)",
+                s,MAX_INT_VAL);
+        return s;
+      }
+    }
+  }
+  else *i = 1;
+  return s;
+}

libpolys/reporter/reporter.h

@@ -63 +63 @@
 void    Warn(const char *fmt, ...);
 
+const char *  eati(const char *s, int *i);
+
 #endif /* c++ only */