Changeset 13731

Timestamp:

05/15/12 08:42:32 (13 years ago)

Author:

tbretz

Message:

Fixed a problem with the label interpretation; added a storage variable for the script name

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/Readline.cc

@@ -70 +70 @@
 using namespace std;
 
-Readline *Readline::This   =  0;
-int       Readline::fLabel = -3;
+Readline   *Readline::This   =  0;
+int         Readline::fLabel = -3;
+std::string Readline::fScript;
 
 // --------------------------------------------------------------------------
@@ -1005 +1006 @@
     if (str[0]==':')
     {
-        const int section = atoi(str.substr(1).c_str());
-        SetSection(section);
-
-        if (fLabel!=section)
+        try
+        {
+            const int section = stoi(str.substr(1));
+            SetSection(section);
+
+            if (fLabel!=section)
+                return true;
+        }
+        catch (const logic_error &e)
+        {
+            fCommandLog << "# ERROR - Inavlid label '" << str.substr(1) << "'" << endl;
+            fLabel = -2;
             return true;
+        }
 
         fLabel=-1;
@@ -1256 +1266 @@
         return 0;
 
+    string name = Tools::Trim(fname);
+    fScript = name;
+
     SetSection(-2);
     fLabel = -1;
-
-    string name = Tools::Trim(fname);
 
     const size_t p = name.find_last_of(':');

trunk/FACT++/src/Readline.h

@@ -28 +28 @@
     int fLine;
     static int fLabel;
+    static std::string fScript;
 
     // Static member function which are used to adapt readline to ncurses
@@ -102 +103 @@
     static  int  GetLabel() { return fLabel; }
 
+    static std::string GetScript() { return fScript; }
+
     int GetLine() const { return fLine; }
     virtual std::string GetLinePrompt() const;