Changeset 13713 for trunk/FACT++

Timestamp:

05/14/12 13:41:13 (13 years ago)

Author:

tbretz

Message:

Added Uncomment function to tools used to strip off inline comments.

Location:

trunk/FACT++/src

Files:

• Readline.cc (modified) (1 diff)
• tools.cc (modified) (1 diff)
• tools.h (modified) (1 diff)

trunk/FACT++/src/Readline.cc

@@ -1166 +1166 @@
 //
 //! Process a single line. All lines are added to the history, but only
-//! accepted lines are written to the command log. Inthis case fLine is
+//! accepted lines are written to the command log. In this case fLine is
 //! increased by one.
+//! Comment (starting with #) are removed from the command-line. A # can be
+//! escaped with quotation marks "#"
 //
 void Readline::ProcessLine(const string &str)
 {
-    const bool rc = PreProcess(str);
-
-    AddToHistory(str);
-
-    if (rc)
-        return;
-
-    fLine++;
+    const string cmd = Tools::Uncomment(str);
+
+    if (!cmd.empty())
+    {
+        const bool rc = PreProcess(cmd);
+
+        AddToHistory(cmd);
+
+        if (rc)
+            return;
+
+        fLine++;
+    }
 
     fCommandLog << str << endl;

trunk/FACT++/src/tools.cc

@@ -192 +192 @@
     return rc;
 }
+
+// --------------------------------------------------------------------------
+//
+//! Returns the string with a comment (introduced by a #) stripped. The
+//! comment mark can be escaped by either \# or "#"
+//!
+string Tools::Uncomment(const string &opt)
+{
+    using namespace boost;
+    typedef escaped_list_separator<char> separator;
+
+    return *tokenizer<separator>(opt, separator('\\', '#', '\"')).begin();
+}

trunk/FACT++/src/tools.h

@@ -14 +14 @@
 
     std::map<std::string,std::string> Split(std::string &);
+    std::string Uncomment(const std::string &opt);
 }