Changeset 11048 for trunk

Timestamp:

06/16/11 23:05:19 (13 years ago)

Author:

tbretz

Message:

Added 'quit' to execute; added IsStopped to check for the 'quit' in Execute

Location:

trunk/FACT++/src

Files:

• Readline.cc (modified) (3 diffs)
• Readline.h (modified) (1 diff)

trunk/FACT++/src/Readline.cc

@@ -1117 +1117 @@
 int Readline::Execute(const string &fname)
 {
+    if (IsStopped())
+        return 0;
+
     int rc = 0;
 
@@ -1134 +1137 @@
             continue;
 
-        if (buffer[0]=='#')
-            continue;
-
         rc++;
+
+        if (buffer=="quit" || buffer==".q")
+        {
+            Stop();
+            break;
+        }
 
         if (Process(buffer))
@@ -1163 +1169 @@
     rl_pending_input = 4; // EOT (end of transmission, ctrl-d)
 }
+
+bool Readline::IsStopped() const
+{
+    return rl_done==1 && rl_pending_input==4;
+};

trunk/FACT++/src/Readline.h

@@ -90 +90 @@
     virtual void Run(const char *prompt=0);
     static  void Stop();
-    int      Execute(const std::string &fname);
+    int          Execute(const std::string &fname);
+    bool         IsStopped() const;
 
     int GetLine() const { return fLine; }