Changeset 6572 for trunk/MagicSoft/Mars

Timestamp:

02/17/05 19:03:34 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mdata/MDataChain.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -195 +195 @@
     fTitle = rule;
 
-    fMember=ParseString(rule, 1);
+    fMember=ParseString(rule);
 }
 
@@ -213 +213 @@
 
     *fLog << inf << "Parsing rule... " << flush;
-    if (!(fMember=ParseString(rule, 1)))
+    if (!(fMember=ParseString(rule)))
     {
         *fLog << err << dbginf << "Parsing '" << rule << "' failed." << endl;
@@ -382 +382 @@
     txt.ReplaceAll("**", "^");
 
-    while (txt.First("--")>=0 || txt.First("++")>=0 ||
-           txt.First("+-")>=0 || txt.First("-+")>=0)
+    while (txt.Contains("--") || txt.Contains("++") ||
+           txt.Contains("+-") || txt.Contains("-+"))
     {
         txt.ReplaceAll("--", "+");
@@ -402 +402 @@
     if (low.Length()==0)
         return;
-
-    //cout << "--- " << Form("[%c]", op[0]) << " ---" << endl;
 
     int offset = 0;
@@ -447 +445 @@
         // Check if it contains operators,
         // otherwise we can simply skip it
-        static const TRegexp regexp("[%/*^+-]");
-        if (sub.Index(regexp)>0)
+        if (sub.First("%^/*+-")>=0)
         {
             test.Insert(offset+j,   ")");
@@ -893 +890 @@
     }
 
-    if (!(fMember=ParseString(rule, 1)))
+    if (!(fMember=ParseString(rule)))
     {
         *fLog << err << "MDataChain::ReadEnv - ERROR: Parsing '" << rule << "' failed." << endl;