Changeset 10275 for trunk

Timestamp:

03/30/11 16:00:15 (14 years ago)

Author:

tbretz

Message:

Implemented that all identical previous history entries are removed from the history by default.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/Readline.cc

@@ -470 +470 @@
 //
 //! Adds the given string to the history buffer of readline's history by
-//! calling add_history. If skip is set to true str will be compared
-//! with the last line added to the history and only be added if it difers.
+//! calling add_history. 
 //!
 //! @param str
@@ -478 +477 @@
 //!
 //! @param skip
-//!    If skip is true do not add a new entry if it is identical to
-//!    the last one.
-//
-void Readline::AddToHistory(const string &str, bool skip)
-{
-    if (skip && fLastLine==str)
+//!    If skip is 1 and str matches the last added entry in the history,
+//!    the entry is skipped. If skip==2, all entries matching str are
+//!    removed from the history before the new entry is added as last one.
+//!    <skip==2 is the default>
+//
+void Readline::AddToHistory(const string &str, int skip)
+{
+    if (skip==1 && fLastLine==str)
         return;
 
@@ -489 +490 @@
         return;
 
+    while (skip==2)
+    {
+        int p = history_search_pos(str.c_str(), 0, 0);
+        if (p<0)
+            break;
+
+        delete remove_history(p);
+    }
+
     add_history(str.c_str());
     fLastLine = str;
 }
 
+// --------------------------------------------------------------------------
+//
+//! @returns
+//!     a string containing [{fLine}]
+//
 string Readline::GetLinePrompt() const
 {

trunk/FACT++/src/Readline.h

@@ -71 +71 @@
     std::string GetName() const { return fName; }
 
-    void AddToHistory(const std::string &str, bool skip=true);
+    void AddToHistory(const std::string &str, int skip=2);
     static bool ClearHistory();
     std::vector<const char*> GetHistory() const;