Changeset d09118 in git for factory/cf_char.cc

Timestamp:

Aug 18, 2008, 12:36:24 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

9539de640ccfecf479ba6edae20d859c36821801

Parents:

6b55c7daa25948ba8f1c11c48911c50daca86b98

Message:

*hannes: limits for char.


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

File:

• factory/cf_char.cc (modified) (2 diffs)

factory/cf_char.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_char.cc,v 1.7 2002-03-08 10:31:45 Singular Exp $ */
+/* $Id: cf_char.cc,v 1.8 2008-08-18 10:36:24 Singular Exp $ */
 
 #include <config.h>
@@ -25 +25 @@
 void setCharacteristic( int c )
 {
-    if ( c == 0 ) {
-        theDegree = 0;
-        CFFactory::settype( IntegerDomain );
-        theCharacteristic = 0;
+    if ( c == 0 )
+    {
+        theDegree = 0;
+        CFFactory::settype( IntegerDomain );
+        theCharacteristic = 0;
     }
-    else {
-        theDegree = 1;
-        CFFactory::settype( FiniteFieldDomain );
-        theCharacteristic = c;
-        ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
-        ff_setprime( c );
-        resetFPT();
+    else
+    {
+        theDegree = 1;
+        CFFactory::settype( FiniteFieldDomain );
+        theCharacteristic = c;
+        ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
+#ifdef SINGULAR
+        extern int errorreported;
+        void    WerrorS(const char *s);
+        if (!errorreported && (c > 536870909)) WerrorS("characteristic too large(max is 2^29)");
+#endif
+        ff_setprime( c );
+        resetFPT();
     }
 }