Changeset 13649

Timestamp:

05/11/12 19:53:19 (13 years ago)

Author:

tbretz

Message:

Made fLabel static to allow it being set rom dimctrl; added a virtual function to signal the current label.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/Readline.cc

@@ -70 +70 @@
 using namespace std;
 
-Readline *Readline::This = 0;
+Readline *Readline::This   =  0;
+int       Readline::fLabel = -1;
 
 // --------------------------------------------------------------------------
@@ -96 +97 @@
 //
 Readline::Readline(const char *prgname) :
-    fMaxLines(500), fLine(0), fLabel(-1), fCompletion(0)
+    fMaxLines(500), fLine(0), fCompletion(0)
 {
     if (This)
@@ -1003 +1004 @@
     if (str[0]==':')
     {
-        if (fLabel!=atoi(str.substr(1).c_str()))
+        const int section = atoi(str.substr(1).c_str());
+        SetSection(section);
+
+        if (fLabel!=section)
             return true;
 
@@ -1216 +1220 @@
 //!
 //! @returns
-//!    -1 if the file couldn't be read and the number of command for which
+//!    -1 if the file couldn't be read and the number of commands for which
 //!    Process() was callled otherwise
 //!
@@ -1224 +1228 @@
         return 0;
 
+    SetSection(-1);
     fLabel = -1;
 
@@ -1265 +1270 @@
 
     fLabel = -1;
+    SetSection(-1);
 
     fCommandLog << "# " << Time() << " - " << name << " (FINISHED)" << endl;

trunk/FACT++/src/Readline.h

@@ -26 +26 @@
 
     int fLine;
-    int fLabel;
+    static int fLabel;
 
     // Static member function which are used to adapt readline to ncurses
@@ -56 +56 @@
     char **Complete(const std::vector<std::string> &v, const char *text);
 
-    void SetLabel(int l) { fLabel = l; }
+    virtual void SetSection(int) { }
 
 public:
@@ -98 +98 @@
     bool         IsStopped() const;
     void         ProcessLine(const std::string &str);
+    static  void SetLabel(int l) { fLabel = l; }
 
     int GetLine() const { return fLine; }