Changeset 9935 for trunk/Mars

Timestamp:

09/22/10 09:15:27 (14 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:

• Changelog (modified) (1 diff)
• mfbase/MF.cc (modified) (3 diffs)

trunk/Mars/Changelog

@@ -35 +35 @@
    * mbase/MContinue.cc:
      - no need to call MTask::GetFilter(), GetFilter() is enough
+
+   * mfbase/MF.cc:
+     - accept = as a conditional sign
+     - make sure the return code of the evaluated filter is corectly returned
 
 

trunk/Mars/mfbase/MF.cc

@@ -530 +530 @@
         const Int_t fg = rule.First('>');
         const Int_t fl = rule.First('<');
-
-        if (fg<0 && fl<0)
+        const Int_t fe = rule.First('=');
+
+        if (fg<0 && fl<0 && fe<0)
         {
             MFilter *f = (MFilter*)GetNewObject(rule, MFilter::Class());
@@ -567 +568 @@
     }
 
-    if (fF->ReadEnv(env, prefix, print)==kERROR)
-        return kERROR;
-
     // This is a workaround, because MFilter::ReadEnv and fF->ReadEnv
     // might check for "Inverted" in this case both gets inverted
@@ -578 +576 @@
             SetInverted(kFALSE);*/
 
-    return kTRUE;
-}
+    return fF->ReadEnv(env, prefix, print);
+}