Changeset f5d2647 in git for Singular

Timestamp:

Dec 6, 2013, 2:59:37 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b38bc933606c0dd703e07f7d0d047120a3a62701

Parents:

42f2ad0e44454045e95a5dea3298675e39832506

Message:

fix: remove some LIBSINGULAR stuff, activate option(warn) for options

Location:

Singular

Files:

• iplib.cc (modified) (6 diffs)
• tesths.cc (modified) (2 diffs)

Singular/iplib.cc

@@ -298 +298 @@
   return NULL;
 }
-#ifndef LIBSINGULAR
+
 // see below:
 struct soptionStruct
@@ -308 +308 @@
 extern struct soptionStruct optionStruct[];
 extern struct soptionStruct verboseStruct[];
-#endif
+
 
 BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l)
 {
+  // see below:
+  BITSET save1=si_opt_1;
+  BITSET save2=si_opt_2;
   newBuffer( omStrDup(p /*pi->data.s.body*/), t /*BT_proc*/,
                pi, l );
-  #ifndef LIBSINGULAR
-  // see below:
-  BITSET save1=(test & ~TEST_RINGDEP_OPTS);
-  BITSET save2=verbose;
-  #endif
   BOOLEAN err=yyparse();
   if (sLastPrinted.rtyp!=0)
@@ -324 +322 @@
     sLastPrinted.CleanUp();
   }
-  #ifndef LIBSINGULAR
   // the access to optionStruct and verboseStruct do not work
   // on x86_64-Linux for pic-code
-  BITSET save11= ( test & ~TEST_RINGDEP_OPTS);
   if ((TEST_V_ALLWARN) &&
   (t==BT_proc) &&
-  ((save1!=save11)||(save2!=verbose)) &&
+  ((save1!=si_opt_1)||(save2!=si_opt_2)) &&
   (pi->libname!=NULL) && (pi->libname[0]!='\0'))
   {
@@ -340 +336 @@
     for (i=0; optionStruct[i].setval!=0; i++)
     {
-      if ((optionStruct[i].setval & save11)
+      if ((optionStruct[i].setval & si_opt_1)
       && (!(optionStruct[i].setval & save1)))
       {
           Print(" +%s",optionStruct[i].name);
       }
-      if (!(optionStruct[i].setval & save11)
+      if (!(optionStruct[i].setval & si_opt_1)
       && ((optionStruct[i].setval & save1)))
       {
@@ -353 +349 @@
     for (i=0; verboseStruct[i].setval!=0; i++)
     {
-      if ((verboseStruct[i].setval & verbose)
+      if ((verboseStruct[i].setval & si_opt_2)
       && (!(verboseStruct[i].setval & save2)))
       {
           Print(" +%s",verboseStruct[i].name);
       }
-      if (!(verboseStruct[i].setval & verbose)
+      if (!(verboseStruct[i].setval & si_opt_2)
       && ((verboseStruct[i].setval & save2)))
       {
@@ -366 +362 @@
     PrintLn();
   }
-  #endif
   return err;
 }

Singular/tesths.cc

@@ -53 +53 @@
 extern int siInit(char *);
 
-#if ! defined(LIBSINGULAR)
-
 int initializeGMP(){ return 1; }
 
@@ -236 +234 @@
   return 0;
 }
-#endif // not LIBSINGULAR
-
+