Changeset 13668 for trunk/FACT++

Timestamp:

05/12/12 12:35:03 (13 years ago)

Author:

tbretz

Message:

Added a hint for the command line arguments to the explanation of .x; added argument-replacement to Execute; set section label to -2 if script done and to 0 if script is executing; added argument parsing to .x

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/Readline.cc

@@ -71 +71 @@
 
 Readline *Readline::This   =  0;
-int       Readline::fLabel = -1;
+int       Readline::fLabel = -2;
 
 // --------------------------------------------------------------------------
@@ -952 +952 @@
     fprintf(rl_outstream, "   .! command   Execute a shell command\n");
     fprintf(rl_outstream, "   .w n         Sleep n milliseconds\n");
-    fprintf(rl_outstream, "   .x filename  Execute a script of commands\n");
-    fprintf(rl_outstream, "   .x file:N    Execute a script of commands, start at label N\n");
+    fprintf(rl_outstream, "   .x file ..   Execute a script of commands (+optional argumnets)\n");
+    fprintf(rl_outstream, "   .x file:N .. Execute a script of commands, start at label N\n");
     fprintf(rl_outstream, "   .j N         Forward jump to label N\n");
     fprintf(rl_outstream, "   : N          Defines a label\n");
@@ -1046 +1046 @@
     if (str.substr(0, 3)==".x ")
     {
-         Execute(str.substr(3));
+        string opt(str.substr(3));
+
+        map<string,string> data = Tools::Split(opt);
+        if (data.size()==0)
+            return false;
+
+        /*
+            if (fData.size()==0)
+                // File name missing ...
+            else
+                // "Equal sign missing in argument '"+data.begin()->first+"'"
+         */
+
+         Execute(opt, data);
          return true;
     }
@@ -1219 +1232 @@
 //!    Filename of file to read
 //!
+//! @param args
+//!    Arguments to be passed to the script. A search and replace
+//!    will be done for ${arg}
+//!
 //! @returns
 //!    -1 if the file couldn't be read and the number of commands for which
 //!    Process() was callled otherwise
 //!
-int Readline::Execute(const string &fname)
-{
+int Readline::Execute(const string &fname, const map<string,string> &args)
+{
+    // this could do the same:
+    //    rl_instream = fopen(str.c_str(), "r");
+
     if (IsStopped())
         return 0;
@@ -1242 +1262 @@
     ifstream fin(name.c_str());
     if (!fin)
+    {
+        SetSection(-2);
         return -1;
+    }
 
     fCommandLog << "# " << Time() << " - " << name << " (START";
@@ -1248 +1271 @@
         fCommandLog << ':' << fLabel;
     fCommandLog << ")" << endl;
+
+    SetSection(0);
 
     int rc = 0;
@@ -1266 +1291 @@
         }
 
+        // find and replace arguments
+        for (auto it=args.begin(); it!=args.end(); it++)
+        {
+            const string find = "${"+it->first+"}";
+            for (size_t pos=0; (pos=buffer.find(find, pos))!=string::npos; pos+=find.length())
+                buffer.replace(pos, find.size(), it->second);
+        }
+
+        // process line
         ProcessLine(buffer);
     }
 
     fLabel = -1;
-    SetSection(-1);
+    SetSection(-2);
 
     fCommandLog << "# " << Time() << " - " << name << " (FINISHED)" << endl;

trunk/FACT++/src/Readline.h

@@ -2 +2 @@
 #define FACT_Readline
 
+#include <map>
 #include <string>
 #include <vector>
@@ -95 +96 @@
     static  void Stop();
     virtual bool ExecuteShellCommand(const std::string &cmd);
-    int          Execute(const std::string &fname);
+    int          Execute(const std::string &fname, const std::map<std::string,std::string> &args=std::map<std::string,std::string>());
     bool         IsStopped() const;
     void         ProcessLine(const std::string &str);
@@ -125 +126 @@
     int GetRows() const;
 
+    static Readline *Instance() { return This; }
 };
 

trunk/FACT++/src/ReadlineColor.cc

@@ -160 +160 @@
     out << kBold << "   .! command   " << kReset << "Execute a shell command\n";
     out << kBold << "   .w n         " << kReset << "Sleep n milliseconds\n";
-    out << kBold << "   .x filename  " << kReset << "Execute a script of commands\n";
+    out << kBold << "   .x filename  " << kReset << "Execute a script of commands (+optional arguments)\n";
     out << kBold << "   .x file:N    " << kReset << "Execute a script of commands, start at label N\n";
     out << kBold << "   .j N         " << kReset << "Forward jump to label N\n";