Changeset b37b398 in git for Singular/ipshell.cc

Timestamp:

Oct 19, 2012, 6:36:03 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1bc7201c1a771fb5cc842ca4f475ba3ea91e6979

Parents:

d30a39922dc390f97b6cd257b2e7c55d483f4159237c4266ccdbbf8b6c6046b550e61cb1751b2b35

Message:

Merge pull request #191 from mmklee/factoryassert_sw

Factoryassert sw

File:

• Singular/ipshell.cc (modified) (7 diffs)

Singular/ipshell.cc

@@ -426 +426 @@
   BOOLEAN all = typ<0;
   BOOLEAN really_all=FALSE;
-  BOOLEAN do_packages=FALSE;
-
-  if ( typ == -1 ) do_packages=TRUE;
+
   if ( typ==0 )
   {
@@ -508 +506 @@
     if (ii < 32)
     {
-      test &= ~Sy_bit(ii);
+      si_opt_1 &= ~Sy_bit(ii);
     }
     else if (ii < 64)
     {
-      verbose &= ~Sy_bit(ii-32);
+      si_opt_2 &= ~Sy_bit(ii-32);
     }
     else
@@ -523 +521 @@
     {
       Warn("Gerhard, use the option command");
-      test |= Sy_bit(ii);
+      si_opt_1 |= Sy_bit(ii);
     }
     else if (Sy_bit(ii) & validOpts)
-      test |= Sy_bit(ii);
+      si_opt_1 |= Sy_bit(ii);
   }
   else if (i<64)
   {
     ii=i-32;
-    verbose |= Sy_bit(ii);
+    si_opt_2 |= Sy_bit(ii);
   }
   else
@@ -2530 +2528 @@
           {
             par_perm_size=rPar(orig_ring);
-            BITSET save_test=test;
 
 //            if ((orig_ring->minpoly != NULL) || (orig_ring->qideal != NULL))
@@ -2537 +2534 @@
 
             nSetChar(currRing->cf);
-            test=save_test;
           }
           else
@@ -5055 +5051 @@
   int float_len2=0;
   ring R = NULL;
-  BOOLEAN ffChar=FALSE;
+  //BOOLEAN ffChar=FALSE;
 
   /* ch -------------------------------------------------------*/
@@ -5251 +5247 @@
   else
   {
-    sleftv* p = pn;
     Werror("Wrong or unknown ground field specification");
 #ifndef NDEBUG
+    sleftv* p = pn;
     while (p != NULL)
     {