Changeset 14613

Timestamp:

11/13/12 17:35:11 (12 years ago)

Author:

tbretz

Message:

Unescape 'C' formated text.

File:

• trunk/FACT++/src/Converter.cc (modified) (2 diffs)

trunk/FACT++/src/Converter.cc

@@ -73 +73 @@
 
 #include <boost/regex.hpp>
-
-#include "Readline.h"
+#include <boost/tokenizer.hpp>
+
+#include "tools.h"
 #include "WindowLog.h"
 
@@ -325 +326 @@
 string Converter::GetStringEol(stringstream &line) const
 {
-    // Remove leading whitespaces
-    while (line.peek()==' ')
-        line.get();
-
     line >> noskipws;
 
     const istream_iterator<char> eol; // end-of-line iterator
-    const string s(istream_iterator<char>(line), eol);
-    return s + '\0';
+    const string text(istream_iterator<char>(line), eol);
+
+    string str = Tools::Trim(text);
+    if (str.length()>=2)
+    {
+        const char b = str[0];
+        const char e = str[str.length()-1];
+
+        if ((b=='\"' && e=='\"') || (b=='\'' && e=='\''))
+        {
+            typedef boost::escaped_list_separator<char> separator;
+            const boost::tokenizer<separator> tok(str, separator("\\", " ", "\"'"));
+
+            str = *tok.begin();
+        }
+    }
+
+    return str + '\0';
 }