Changeset 9935


Ignore:
Timestamp:
Sep 22, 2010, 9:15:27 AM (10 years ago)
Author:
tbretz
Message:
Accept = as conditional sign and make sure that the return code of ReadEnv of the contained filter is correctly propagated in MF
Location:
trunk/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/Changelog

    r9934 r9935  
    3535   * mbase/MContinue.cc:
    3636     - no need to call MTask::GetFilter(), GetFilter() is enough
     37
     38   * mfbase/MF.cc:
     39     - accept = as a conditional sign
     40     - make sure the return code of the evaluated filter is corectly returned
    3741
    3842
  • trunk/Mars/mfbase/MF.cc

    r8171 r9935  
    530530        const Int_t fg = rule.First('>');
    531531        const Int_t fl = rule.First('<');
    532 
    533         if (fg<0 && fl<0)
     532        const Int_t fe = rule.First('=');
     533
     534        if (fg<0 && fl<0 && fe<0)
    534535        {
    535536            MFilter *f = (MFilter*)GetNewObject(rule, MFilter::Class());
     
    567568    }
    568569
    569     if (fF->ReadEnv(env, prefix, print)==kERROR)
    570         return kERROR;
    571 
    572570    // This is a workaround, because MFilter::ReadEnv and fF->ReadEnv
    573571    // might check for "Inverted" in this case both gets inverted
     
    578576            SetInverted(kFALSE);*/
    579577
    580     return kTRUE;
    581 }
     578    return fF->ReadEnv(env, prefix, print);
     579}
Note: See TracChangeset for help on using the changeset viewer.