Changeset 13771

Timestamp:

05/18/12 10:07:21 (12 years ago)

Author:

tbretz

Message:

Implemented the possibility to print errors form readline; added .gt, .lt and .eq commmands.

Location:

trunk/FACT++/src

Files:

• Console.cc (modified) (2 diffs)
• Console.h (modified) (2 diffs)
• Readline.cc (modified) (4 diffs)
• Readline.h (modified) (4 diffs)
• ReadlineColor.cc (modified) (1 diff)

trunk/FACT++/src/Console.cc

@@ -48 +48 @@
     fLogO.Display();
     fLogI.Display();
+}
+
+void Console::PrintReadlineError(const std::string &str)
+{
+    fLogI << kRed << str << endl;
 }
 
@@ -216 +221 @@
 }
 
+void ConsoleStream::PrintReadlineError(const std::string &str)
+{
+    fLogO << kRed << str << endl;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/FACT++/src/Console.h

@@ -9 +9 @@
 private:
     WindowLog fLogO;
+
+    void PrintReadlineError(const std::string &str);
 
 public:
@@ -34 +36 @@
 
     bool fContinous;
+
+    void PrintReadlineError(const std::string &str);
+
 public:
     Console(const char *name);

trunk/FACT++/src/Readline.cc

@@ -956 +956 @@
     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, "   .lt f0 f1 N  If float f0 lower than float f1, jump to label N\n");
+    fprintf(rl_outstream, "   .gt f0 f1 N  If float f0 greater than float f1, jump to label N\n");
+    fprintf(rl_outstream, "   .eq i0 i1 N  If int i0 equal int i1, jump to label N\n");
     fprintf(rl_outstream, "   : N          Defines a label (N=number)\n");
     fprintf(rl_outstream, "   # comment    Ignored\n");
@@ -1061 +1064 @@
         map<string,string> data = Tools::Split(opt);
         if (opt.size()==0)
-            return false;
-
-        /*
-            if (fData.size()==0)
-                // File name missing ...
+        {
+            if (data.size()==0)
+                PrintReadlineError("Filename missing.");
             else
-                // "Equal sign missing in argument '"+data.begin()->first+"'"
-         */
-
-         Execute(opt, data);
-         return true;
+                PrintReadlineError("Equal sign missing in argument '"+data.begin()->first+"'");
+
+            return true;
+        }
+
+        Execute(opt, data);
+        return true;
     }
 
@@ -1079 +1082 @@
          return true;
     }
+
+    if (str.substr(0, 4)==".gt ")
+    {
+        istringstream in(str.substr(4));
+
+        float v0, v1;
+        int label;
+
+        in >> v0 >> v1 >> label;
+        if (in.fail())
+        {
+            PrintReadlineError("Couldn't parse '"+str+"'");
+            fLabel = -2;
+            return true;
+        }
+
+        if (v0 > v1)
+            fLabel = label;
+
+        return true;
+    }
+
+    if (str.substr(0, 4)==".lt ")
+    {
+        istringstream in(str.substr(4));
+
+        float v0, v1;
+        int label;
+
+        in >> v0 >> v1 >> label;
+        if (in.fail())
+        {
+            PrintReadlineError("Couldn't parse '"+str+"'");
+            fLabel = -2;
+            return true;
+        }
+
+        if (v0 < v1)
+           fLabel = label;
+
+        return true;
+    }
+
+    if (str.substr(0, 4)==".eq ")
+    {
+        istringstream in(str.substr(4));
+
+        int v0, v1, label;
+
+        in >> v0 >> v1 >> label;
+        if (in.fail())
+        {
+            PrintReadlineError("Couldn't parse '"+str+"'");
+            fLabel = -2;
+            return true;
+        }
+
+        if (v0==v1)
+            fLabel = label;
+
+        return true;
+    }
+
 
     // ----------- Readline static -------------
@@ -1354 +1420 @@
     return rl_done==1 && rl_pending_input==4;
 };
+
+void Readline::PrintReadlineError(const std::string &str)
+{
+    fprintf(rl_outstream, "%s\n", str.c_str());
+}

trunk/FACT++/src/Readline.h

@@ -30 +30 @@
     static std::string fScript;
 
-    // Static member function which are used to adapt readline to ncurses
+    /// Static member function which are used to adapt readline to ncurses
     static int    rl_ncurses_getc(FILE *);
     static int    rl_ncurses_startup();
@@ -41 +41 @@
 
 protected:
-    // The non static implementations of the callback funtions above
+    /// The non static implementations of the callback funtions above
     virtual int  Getc(FILE *);
     virtual void Startup();
@@ -49 +49 @@
     virtual void CompletionDisplay(char **matches, int num, int max);
 
-    // Functions dealing with auto completion
+    /// Functions dealing with auto completion
     virtual char *Complete(const char* text, int state);
     virtual char **Completion(const char *text, int start, int end);
@@ -58 +58 @@
     char **Complete(const std::vector<std::string> &v, const char *text);
 
+    ///
     virtual void SetSection(int) { }
+    virtual void PrintReadlineError(const std::string &str);
 
 public:

trunk/FACT++/src/ReadlineColor.cc

@@ -163 +163 @@
     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";
+    out << kBold << "   .lt f0 f1 N  " << kReset << "If float f0 lower than float f1, jump to label N\n";
+    out << kBold << "   .gt f0 f1 N  " << kReset << "If float f0 greater than float f1, jump to label N\n";
+    out << kBold << "   .eq i0 i1 N  " << kReset << "If int i0 equal int i1, jump to label N\n";
     out << kBold << "   : N          " << kReset << "Defines a label (N=number)\n";
     out << kBold << "   # comment    " << kReset << "Ignored\n";