Changeset 1465 for trunk/MagicSoft/Mars/mdata

Timestamp:

08/01/02 09:31:18 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataChain.cc (modified) (7 diffs)
• MDataChain.h (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -162 +162 @@
 {
     int l = txt.Length();
-    for (int i = 0; i<l; i++)
-        if (!isalnum(txt[i]) && txt[i]!='.' && txt[i]!='-')
+    for (int i=0; i<l; i++)
+    {
+        if (!isalnum(txt[i]) && txt[i]!='.' &&
+            ((txt[i]!='-' && txt[i]!='+') || i!=0))
             return i;
+    }
 
     return l;
@@ -210 +213 @@
     if (txt=="sgn")   return kESgn;
     if (txt[0]=='-')  return kENegative;
+    if (txt[0]=='+')  return kEPositive;
 
     return kENoop;
@@ -324 +328 @@
         case '8':
         case '9':
-            if (txt[0]!='-' || isdigit(txt[1]) || txt[1]=='.')
+            if ((txt[0]!='-' && txt[0]!='+') || isdigit(txt[1]) || txt[1]=='.')
             {
                 char *end;
@@ -360 +364 @@
             txt = txt.Strip(TString::kBoth);
 
-            if (txt.IsNull() || txt[0]!='(')
+            if ((txt.IsNull() || txt[0]!='(') && text[0]!='-' && text[0]!='+')
             {
                 newmember = new MDataMember(text.Data());
@@ -376 +380 @@
 
             Int_t first = GetBracket(txt);
-            TString sub = op==kENegative ? text.Remove(0,1) + txt : txt(1, first-1);
+            TString sub = op==kENegative || op==kEPositive ? text.Remove(0,1) + txt : txt(1, first-1);
             txt.Remove(0, first+1);
 
@@ -435 +439 @@
     case kESgn:      return val<0 ? -1 : 1;
     case kENegative: return -val;
+    case kEPositive: return val;
     case kENoop:     return val;
     }
@@ -466 +471 @@
     case kESgn:      *fLog << "sgn"   << flush; break;
     case kENegative: *fLog << "-" << flush; break;
+    case kEPositive: *fLog << "+" << flush; break;
     case kENoop:
         break;

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -37 +37 @@
         kEExp,
         kESgn,
+        kEPositive,
         kENegative
     } OperatorType_t;