Changeset 7f7b2a in git

Timestamp:

Sep 7, 2010, 2:41:38 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

1cce476261db2ed619587e1afbc7252f6a5f79da

Parents:

1b078e7ee8f4659359c8f3e8fdbfdd1134099749

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-09-07 14:41:38+02:00

git-committer:

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

Message:

more debuggin messages for errors while initing/assumes
fixed long-long error on Mac OS X.

Location:

coeffs

Files:

• Makefile.in (modified) (1 diff)
• config.h.in (modified) (1 diff)
• ffields.cc (modified) (3 diffs)
• modulop.h (modified) (1 diff)

coeffs/Makefile.in

@@ -86 +86 @@
 
 CCG             = ${CC}
-CXXG            = ${CXX} -Wextra -Wall -pedantic -fdiagnostics-show-option
+CXXG            = ${CXX} -Wextra -Wall -pedantic -fdiagnostics-show-option -Wno-long-long
 OBJSG1 := $(CXXSOURCES:.cc=.og)
 

coeffs/config.h.in

@@ -5 +5 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wlong-long"

coeffs/ffields.cc

@@ -130 +130 @@
 BOOLEAN nfDBTest (number a, const char *f, const int l, const coeffs r)
 {
+  assume( r->m_nfPlus1Table != NULL );
   if (((long)a<0L) || ((long)a>(long)r->m_nfCharQ))
   {
@@ -186 +187 @@
 number nfInit (int i, const coeffs r)
 {
+  assume( r->m_nfPlus1Table != NULL );
   // Hmm .. this is just to prevent initialization
   // from nfInitChar to go into an infinite loop
@@ -861 +863 @@
   if( (p->GFDegree * check) > sixteenlog2 )
   {
-    Werror("illegal size");
+    Werror("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
+    return; // EXCEPTION? OR RETURN AN ERROR!???
+  }
+
+  int c = pow (p->GFChar, p->GFDegree);
+
+  nfReadTable(c, r);
+  
+  if( r->m_nfPlus1Table == NULL )
+  {
+    Werror("Sorry: cannot init lookup table!");
     return;
   }
-
-  int c = pow (p->GFChar, p->GFDegree);
-
-  nfReadTable(c, r);
-
+  
+  
   assume (r -> m_nfCharQ > 0);
 
   r->ch = r->m_nfCharP; 
-
-}
-
+  assume( r->m_nfPlus1Table != NULL );
+
+}

coeffs/modulop.h

@@ -169 +169 @@
 
 #ifdef NV_OPS
+#pragma GCC diagnostic ignored "-Wlong-long"
 static inline number nvMultM(number a, number b, const coeffs r)
 {