Allow escaped double quotes in DBC strings

Author: ianrrees

src/parser/dbc/DbcTokens.cpp

@@ -84,19 +84,48 @@ bool DbcIdentifierToken::acceptsChar(QChar ch)
 
 
 DbcStringToken::DbcStringToken(int line, int column)
-  : DbcToken(line, column, dbc_tok_string)
+  : DbcToken(line, column, dbc_tok_string),
+  _done(false),
+  _escape(false)
 {
 }
 
+// Store string including quotes, as:
+//   "some string"
+// which may include '\'-escaped double quotes, leading to something like
+//   "some string is \"this\""
+// and '\' can be escaped as well
+//   "this is a valid \\ acceptable string"
 bool DbcStringToken::acceptsChar(QChar ch)
 {
-   if (_data.isEmpty()) {
-       return (ch=='"');
-   } else if (_data.length()<2) {
-       return true;
-   } else {
-       return !_data.endsWith('"');
-   }
+    if (_done) {
+        return false;
+    }
+
+    switch (_data.length()) {
+        // Start of string must be '"'
+        case 0:
+            return (ch == '"');
+        // Can't look to index -1, so accept anything
+        case 1:
+            _escape = (ch == '\\');
+            _done = (ch == '"');
+            return true;
+        // Accept anything until an unescaped '"'
+        default:
+            if (_escape) {
+                _escape = false;
+            } else {
+                if (ch == '\\') {
+                    _escape = true;
+                }
+                if (ch == '"') {
+                    _data.replace(QRegExp("\\\\(.)"), "\\1");
+                    _done = true;
+                }
+            }
+            return true;
+    }
 }
 
 

src/parser/dbc/DbcTokens.h

@@ -83,6 +83,9 @@ class DbcStringToken : public DbcToken {
 public:
     DbcStringToken(int line, int column);
     virtual bool acceptsChar(QChar ch);
+private:
+    bool _done;
+    bool _escape;
 };
 
 class DbcRegExpToken : public DbcToken {