Changeset 14365 for trunk/FACT++/src/tools.cc

Timestamp:

08/14/12 12:25:14 (12 years ago)

Author:

tbretz

Message:

Made sure that the Uncomment does not remove the escape characters; allow single and double hypen as escape character.

File:

• trunk/FACT++/src/tools.cc (modified) (3 diffs)

trunk/FACT++/src/tools.cc

@@ -227 +227 @@
 //!   one entry then for this entry the euqal sign was missing.
 //!
+#include <iostream>
 map<string,string> Tools::Split(string &opt, bool allow)
 {
@@ -234 +235 @@
     const string data(opt);
 
-    const tokenizer<separator> tok(data, separator('\\', ' ', '\"'));
+    const tokenizer<separator> tok(data, separator("\\", " ", "\"'"));
 
     auto it=tok.begin();
@@ -287 +288 @@
     typedef escaped_list_separator<char> separator;
 
-    return *tokenizer<separator>(opt, separator('\\', '#', '\"')).begin();
-}
+    const auto it = tokenizer<separator>(opt, separator('\\', '#', '\"')).begin();
+
+    const int charPos = it.base() - opt.begin();
+
+    return charPos<1 ? "" : opt.substr(0, opt[charPos-1]=='#' ? charPos-1 : charPos);
+}