Changeset 6572


Ignore:
Timestamp:
02/17/05 19:03:34 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mdata/MDataChain.cc

    r6569 r6572  
    195195    fTitle = rule;
    196196
    197     fMember=ParseString(rule, 1);
     197    fMember=ParseString(rule);
    198198}
    199199
     
    213213
    214214    *fLog << inf << "Parsing rule... " << flush;
    215     if (!(fMember=ParseString(rule, 1)))
     215    if (!(fMember=ParseString(rule)))
    216216    {
    217217        *fLog << err << dbginf << "Parsing '" << rule << "' failed." << endl;
     
    382382    txt.ReplaceAll("**", "^");
    383383
    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("-+"))
    386386    {
    387387        txt.ReplaceAll("--", "+");
     
    402402    if (low.Length()==0)
    403403        return;
    404 
    405     //cout << "--- " << Form("[%c]", op[0]) << " ---" << endl;
    406404
    407405    int offset = 0;
     
    447445        // Check if it contains operators,
    448446        // otherwise we can simply skip it
    449         static const TRegexp regexp("[%/*^+-]");
    450         if (sub.Index(regexp)>0)
     447        if (sub.First("%^/*+-")>=0)
    451448        {
    452449            test.Insert(offset+j,   ")");
     
    893890    }
    894891
    895     if (!(fMember=ParseString(rule, 1)))
     892    if (!(fMember=ParseString(rule)))
    896893    {
    897894        *fLog << err << "MDataChain::ReadEnv - ERROR: Parsing '" << rule << "' failed." << endl;
Note: See TracChangeset for help on using the changeset viewer.