Changeset 10308

Timestamp:

04/07/11 15:45:13 (14 years ago)

Author:

tbretz

Message:

Added the RedirectionWrapper member function; made the comparison for auto-completion case insensitive.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/Readline.cc

@@ -169 +169 @@
 
     // Trim Both leading and trailing spaces
-    const size_t start = str.find_first_not_of(" "); // Find the first character position after excluding leading blank spaces
-    const size_t end   = str.find_last_not_of(" ");  // Find the first character position from reverse af
+    const size_t start = str.find_first_not_of(' '); // Find the first character position after excluding leading blank spaces
+    const size_t end   = str.find_last_not_of(' ');  // Find the first character position from reverse af
 
     // if all spaces or empty return an empty string
     if (string::npos==start || string::npos==end)
-        return "";
+        return string();
 
     return str.substr(start, end-start+1);
+}
+
+// --------------------------------------------------------------------------
+//
+//! This wraps the given readline function such that the output can be
+//! redirected from thr rl_outstream to the given C++ ostream.
+//!
+//! @param ostream
+//!    The stream to which the output should be redirected.
+//!
+//! @param function
+//!    Takes a function of type bool(*)() as argument
+//!
+//! @returns
+//!    The return value of the function
+//
+bool Readline::RedirectionWrapper(ostream &out, bool (*function)())
+{
+    FILE *save = SetStreamOut(tmpfile());
+    const bool rc = function();
+    FILE *file = SetStreamOut(save);
+
+    const bool empty = ftell(file)==0;
+
+    rewind(file);
+
+    if (empty)
+    {
+        out << " <empty>" << endl;
+        fclose(file);
+        return rc;
+    }
+
+    while (1)
+    {
+        const int c = getc(file);
+        if (feof(file))
+            break;
+        out << (char)c;
+    }
+    out << endl;
+
+    fclose(file);
+
+    return rc;
 }
 
@@ -333 +378 @@
 char *Readline::Compare(const string &str, const string &txt)
 {
-    return str.substr(0, txt.length())==txt ? strndup(str.c_str(), str.length()) : 0;
+    /*return strncmp(str.c_str(), txt.c_str(), txt.length())==0 ? */
+    return strncasecmp(str.c_str(), txt.c_str(), txt.length())==0 ?
+        strndup(str.c_str(), str.length()) : 0;
 }
 
@@ -814 +861 @@
 {
     HIST_ENTRY **next = history_list();
+
+    if (!next)
+        return true;
 
     for (; *next; next++)

trunk/FACT++/src/Readline.h

@@ -9 +9 @@
 public:
     static std::string TrimSpaces(const char *buf);
+    static bool RedirectionWrapper(std::ostream &out, bool (*function)());
 
 protected: