Changeset 6572
- Timestamp:
- 02/17/05 19:03:34 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mdata/MDataChain.cc
r6569 r6572 195 195 fTitle = rule; 196 196 197 fMember=ParseString(rule , 1);197 fMember=ParseString(rule); 198 198 } 199 199 … … 213 213 214 214 *fLog << inf << "Parsing rule... " << flush; 215 if (!(fMember=ParseString(rule , 1)))215 if (!(fMember=ParseString(rule))) 216 216 { 217 217 *fLog << err << dbginf << "Parsing '" << rule << "' failed." << endl; … … 382 382 txt.ReplaceAll("**", "^"); 383 383 384 while (txt. First("--")>=0 || txt.First("++")>=0||385 txt. First("+-")>=0 || txt.First("-+")>=0)384 while (txt.Contains("--") || txt.Contains("++") || 385 txt.Contains("+-") || txt.Contains("-+")) 386 386 { 387 387 txt.ReplaceAll("--", "+"); … … 402 402 if (low.Length()==0) 403 403 return; 404 405 //cout << "--- " << Form("[%c]", op[0]) << " ---" << endl;406 404 407 405 int offset = 0; … … 447 445 // Check if it contains operators, 448 446 // otherwise we can simply skip it 449 static const TRegexp regexp("[%/*^+-]"); 450 if (sub.Index(regexp)>0) 447 if (sub.First("%^/*+-")>=0) 451 448 { 452 449 test.Insert(offset+j, ")"); … … 893 890 } 894 891 895 if (!(fMember=ParseString(rule , 1)))892 if (!(fMember=ParseString(rule))) 896 893 { 897 894 *fLog << err << "MDataChain::ReadEnv - ERROR: Parsing '" << rule << "' failed." << endl;
Note:
See TracChangeset
for help on using the changeset viewer.