Changeset 65eb96f in git

Timestamp:

Nov 11, 2011, 5:52:53 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9875202a2c72496bbc39676b4ca272ba4da36c09

Parents:

e6c3d1d6650b98221c24b2534d58726bcbded950

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-11-11 17:52:53+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-01-18 16:15:04+01:00

Message:

fix #383

leads to changes in
dmod.lib,finvar.lib,involut.lib,primdec.lib,sheafcoh.lib
still to be fixed: modstd.lib,primitiv.lib,hnoether.lib,zeroset.lib

Location:

Singular

Files:

• LIB/dmod.lib (modified) (2 diffs)
• LIB/finvar.lib (modified) (1 diff)
• iplib.cc (modified) (1 diff)

Singular/LIB/dmod.lib

@@ -1721 +1721 @@
   dbprint(ppl-1, @R4);
   ideal K4 = imap(@R2,K2);
+  intvec saveopt=option(get);
   option(redSB);
   dbprint(ppl,"// -3-2- the final cosmetic std");
@@ -1731 +1732 @@
   ideal LD = K4;
   export LD;
+  option(set,saveopt);
   return(@R4);
 }

Singular/LIB/finvar.lib

@@ -6462 +6462 @@
   int dgb=degBound;
   degBound = 0;
+  intvec saveopt=option(get);
   option(redSB);
   ideal sP = groebner(ideal(P));

Singular/iplib.cc

@@ -298 +298 @@
   newBuffer( omStrDup(p /*pi->data.s.body*/), t /*BT_proc*/,
                pi, l );
+  int save1=(si_opt_1 & ~TEST_RINGDEP_OPTS);
+  int save2=si_opt_2;
   BOOLEAN err=yyparse();
   if (sLastPrinted.rtyp!=0)
   {
     sLastPrinted.CleanUp();
+  }
+  int save11= ( si_opt_1 & ~TEST_RINGDEP_OPTS);
+  if ((TEST_V_ALLWARN) &&
+  (t==BT_proc) &&
+  ((save1!=save11)||(save2!=si_opt_2)) &&
+  (pi->libname!=NULL) && (pi->libname[0]!='\0'))
+  {
+    struct soptionStruct
+    {
+      const char * name;
+      unsigned   setval;
+      unsigned   resetval;
+    };
+    extern struct soptionStruct optionStruct[];
+    extern struct soptionStruct verboseStruct[];
+    Warn("option changed in proc %s from %s",pi->procname,pi->libname);
+    int i;
+    for (i=0; optionStruct[i].setval!=0; i++)
+    {
+      if ((optionStruct[i].setval & save11)
+      && (!(optionStruct[i].setval & save1)))
+      {
+          Print(" +%s",optionStruct[i].name);
+      }
+      if (!(optionStruct[i].setval & save11)
+      && ((optionStruct[i].setval & save1)))
+      {
+          Print(" -%s",optionStruct[i].name);
+      }
+    }
+    for (i=0; verboseStruct[i].setval!=0; i++)
+    {
+      if ((verboseStruct[i].setval & si_opt_2)
+      && (!(verboseStruct[i].setval & save2)))
+      {
+          Print(" +%s",verboseStruct[i].name);
+      }
+      if (!(verboseStruct[i].setval & si_opt_2)
+      && ((verboseStruct[i].setval & save2)))
+      {
+          Print(" -%s",verboseStruct[i].name);
+      }
+    }
+    PrintLn();
+  //  PrintS(p);
   }
   return err;