Changeset 3788 for trunk/MagicSoft/Mars/mdata

Timestamp:

04/21/04 15:38:08 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

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

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -45 +45 @@
 //   "MCameraLV.fPowerSupplyA.fVoltagePos5V"
 //
-// You can also use brackets:
+// You can also use parantheses:
 //   "HillasDource.fDist / (MHillas.fLength + MHillas.fWidth)"
 //
@@ -57 +57 @@
 // While a^b returns a to the power of b
 //
-// Warning: There is no priority rule build in. So better use brackets
+// Warning: There is no priority rule build in. So better use parantheses
 //   to get correct results. The rule is parsed/evaluated from the left
 //   to the right, which means:
@@ -158 +158 @@
 //  - The possibility to use other objects inheriting from MData
 //    is missing.
-//  - By automatic pre-adding brackets to the rule it would be possible
+//  - By automatic pre-adding parantheses to the rule it would be possible
 //    to implement priorities for operators.
 //
@@ -365 +365 @@
 }
 
+void MDataChain::SimplifyString(TString &txt) const
+{
+    while (txt.First("--")>=0 || txt.First("++")>=0 ||
+           txt.First("+-")>=0 || txt.First("-+")>=0)
+    {
+        txt.ReplaceAll("--", "+");
+        txt.ReplaceAll("++", "+");
+        txt.ReplaceAll("-+", "-");
+        txt.ReplaceAll("+-", "-");
+    }
+}
+
 // --------------------------------------------------------------------------
 //
@@ -371 +383 @@
 MData *MDataChain::ParseString(TString txt, Int_t level)
 {
+    if (level==0)
+        SimplifyString(txt);
+
     MData *member0=NULL;
 
@@ -387 +402 @@
             {
                 //
-                // Search for the corresponding bracket
-                //
-                Int_t first=GetBracket(txt, '(', ')');
-
+                // Search for the corresponding parantheses
+                //
+                const Int_t first=GetBracket(txt, '(', ')');
                 if (first==txt.Length())
                 {
@@ -400 +414 @@
 
                 //
-                // Make a copy of the 'interieur' and delete the substringä
+                // Make a copy of the 'interieur' and delete the substring
                 // including the brackets
                 //
@@ -462 +476 @@
             if (txt[0]!='-' && txt[0]!='+')
             {
-                *fLog << err << dbginf << "Syntax Error: First argument of symbol '";
-                *fLog << txt[0] << "' missing." << endl;
+                *fLog << err << dbginf << "Syntax Error: First argument of '";
+                *fLog << txt[0] << "' opartor missing." << endl;
                 if (member0)
                     delete member0;

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -44 +44 @@
     Int_t GetBracket(TString txt, char open, char close);
 
+    void   SimplifyString(TString &txt) const;
     MData *ParseString(TString txt, Int_t level);
     MData *ParseDataMember(TString txt);