Changeset f5d2647 in git for Singular/iplib.cc


Ignore:
Timestamp:
Dec 6, 2013, 2:59:37 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cbf866d4f8c3861325311c042cb2033c053453b2')
Children:
b38bc933606c0dd703e07f7d0d047120a3a62701
Parents:
42f2ad0e44454045e95a5dea3298675e39832506
Message:
fix: remove some LIBSINGULAR stuff, activate option(warn) for options
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/iplib.cc

    r42f2ad rf5d2647  
    298298  return NULL;
    299299}
    300 #ifndef LIBSINGULAR
     300
    301301// see below:
    302302struct soptionStruct
     
    308308extern struct soptionStruct optionStruct[];
    309309extern struct soptionStruct verboseStruct[];
    310 #endif
     310
    311311
    312312BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l)
    313313{
     314  // see below:
     315  BITSET save1=si_opt_1;
     316  BITSET save2=si_opt_2;
    314317  newBuffer( omStrDup(p /*pi->data.s.body*/), t /*BT_proc*/,
    315318               pi, l );
    316   #ifndef LIBSINGULAR
    317   // see below:
    318   BITSET save1=(test & ~TEST_RINGDEP_OPTS);
    319   BITSET save2=verbose;
    320   #endif
    321319  BOOLEAN err=yyparse();
    322320  if (sLastPrinted.rtyp!=0)
     
    324322    sLastPrinted.CleanUp();
    325323  }
    326   #ifndef LIBSINGULAR
    327324  // the access to optionStruct and verboseStruct do not work
    328325  // on x86_64-Linux for pic-code
    329   BITSET save11= ( test & ~TEST_RINGDEP_OPTS);
    330326  if ((TEST_V_ALLWARN) &&
    331327  (t==BT_proc) &&
    332   ((save1!=save11)||(save2!=verbose)) &&
     328  ((save1!=si_opt_1)||(save2!=si_opt_2)) &&
    333329  (pi->libname!=NULL) && (pi->libname[0]!='\0'))
    334330  {
     
    340336    for (i=0; optionStruct[i].setval!=0; i++)
    341337    {
    342       if ((optionStruct[i].setval & save11)
     338      if ((optionStruct[i].setval & si_opt_1)
    343339      && (!(optionStruct[i].setval & save1)))
    344340      {
    345341          Print(" +%s",optionStruct[i].name);
    346342      }
    347       if (!(optionStruct[i].setval & save11)
     343      if (!(optionStruct[i].setval & si_opt_1)
    348344      && ((optionStruct[i].setval & save1)))
    349345      {
     
    353349    for (i=0; verboseStruct[i].setval!=0; i++)
    354350    {
    355       if ((verboseStruct[i].setval & verbose)
     351      if ((verboseStruct[i].setval & si_opt_2)
    356352      && (!(verboseStruct[i].setval & save2)))
    357353      {
    358354          Print(" +%s",verboseStruct[i].name);
    359355      }
    360       if (!(verboseStruct[i].setval & verbose)
     356      if (!(verboseStruct[i].setval & si_opt_2)
    361357      && ((verboseStruct[i].setval & save2)))
    362358      {
     
    366362    PrintLn();
    367363  }
    368   #endif
    369364  return err;
    370365}
Note: See TracChangeset for help on using the changeset viewer.