Changeset f630e4 in git for libpolys

Timestamp:

Mar 21, 2012, 7:02:30 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dd668fd21e0141dd6716d45d63f34e6ca84d230f

Parents:

1cbc287030d12dc1184a3649787c929f7edcf35f

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-21 19:02:30+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-23 16:06:34+01:00

Message:

set coeffs::nNULL if needed...

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (1 diff)
• numbers.cc (modified) (4 diffs)

libpolys/coeffs/coeffs.h

@@ -209 +209 @@
 #endif
 
-   number nNULL; /* the 0 as constant */
+   /// the 0 as constant, NULL by default
+   number nNULL; 
    int     char_flag;
    int     ref;

libpolys/coeffs/numbers.cc

@@ -47 +47 @@
 //static int characteristic = 0;
 extern int IsPrime(int p);
-
-/*0 implementation*/
-number nNULL; /* the 0 as constant */
 
 n_Procs_s *cf_root=NULL;
@@ -301 +298 @@
     if(n->cfWriteShort==NULL)
       n->cfWriteShort = n->cfWriteLong;
-    
-#ifndef NDEBUG
+
     assume(n->nCoeffIsEqual!=NULL);
-    if(n->cfKillChar==NULL) Warn("cfKillChar is NULL for coeff %d",t);
-                assume(n->cfSetChar!=NULL);
+    assume(n->cfSetChar!=NULL);
     assume(n->cfMult!=NULL);
     assume(n->cfSub!=NULL);
@@ -337 +332 @@
     assume(n->cfParameter!=NULL);
     assume(n->cfParDeg!=NULL);
-
-    if(n->cfWriteLong==NULL) Warn("cfWrite is NULL for coeff %d",t);
-    if(n->cfWriteShort==NULL) Warn("cfWriteShort is NULL for coeff %d",t);
-    
+     
     assume(n->cfRead!=NULL);
     assume(n->cfNormalize!=NULL);
@@ -365 +357 @@
 #endif
     assume(n->type==t);
-#endif
+     
+#ifndef NDEBUG
+    if(n->cfKillChar==NULL) Warn("cfKillChar is NULL for coeff %d",t);
+    if(n->cfWriteLong==NULL) Warn("cfWrite is NULL for coeff %d",t);
+    if(n->cfWriteShort==NULL) Warn("cfWriteShort is NULL for coeff %d",t);
+#endif
+     
+   if( n->nNULL == NULL )
+     n->nNULL = n_Init(0, n); // may still remain NULL
   }
   else