Changeset 13899

Timestamp:

05/26/12 10:47:21 (13 years ago)

Author:

tbretz

Message:

Made the script depth static to be able to access it from dimctrl; added it to the command-log

Location:

trunk/FACT++/src

Files:

• Readline.cc (modified) (6 diffs)
• Readline.h (modified) (2 diffs)

trunk/FACT++/src/Readline.cc

@@ -72 +72 @@
 Readline   *Readline::This   =  0;
 bool        Readline::fStopScript = false;
+int         Readline::fScriptDepth = 0;
 std::string Readline::fScript;
 
@@ -98 +99 @@
 //
 Readline::Readline(const char *prgname) :
-    fMaxLines(500), fLine(0), fScriptDepth(0), fCompletion(0)
+    fMaxLines(500), fLine(0), fLabel(-1), fCompletion(0)
 {
     if (This)
@@ -1019 +1020 @@
         catch (const logic_error &e)
         {
-            fCommandLog << "# ERROR - Inavlid label '" << str.substr(1) << "'" << endl;
+            fCommandLog << "# ERROR[" << fScriptDepth << "] - Inavlid label '" << str.substr(1) << "'" << endl;
             fLabel = -2;
             return true;
@@ -1030 +1031 @@
     if (fLabel>=0)
     {
-        fCommandLog << "# SKIP[" << fLabel << "]: " << str << endl;
+        fCommandLog << "# SKIP[" << fScriptDepth << "]: " << fLabel << " - " << str << endl;
         return true;
     }
@@ -1358 +1359 @@
     }
 
-    fCommandLog << "# " << Time() << " - " << name << " (START";
+    if (fScriptDepth++==0)
+        fStopScript = false;
+
+    fCommandLog << "# " << Time() << " - " << name << " (START[" << fScriptDepth<< "]";
     if (fLabel>=0)
         fCommandLog << ':' << fLabel;
     fCommandLog << ")" << endl;
-
-    if (fScriptDepth++==0)
-        fStopScript = false;
 
     fSection = -1;
@@ -1402 +1403 @@
     SetSection(-3);
 
+    fCommandLog << "# " << Time() << " - " << name << " (FINISHED[" << fScriptDepth<< "])" << endl;
+
     if (--fScriptDepth==0)
         fStopScript = false;
-
-    fCommandLog << "# " << Time() << " - " << name << " (FINISHED)" << endl;
 
     return rc;

trunk/FACT++/src/Readline.h

@@ -29 +29 @@
     int fSection;
     int fLabel;
-    int fScriptDepth;
+    static int  fScriptDepth;
     static bool fStopScript;
     static std::string fScript;
@@ -108 +108 @@
     static void  StopScript() { fStopScript = true; }
     static bool  IsScriptStopped() { return fStopScript; }
+    static int   GetScriptDepth() { return fScriptDepth; }
 
     static std::string GetScript() { return fScript; }