changeset 1020:9c00e7944bf2

Merge
author Chris Cannam
date Thu, 27 Nov 2014 17:51:21 +0000
parents a73c44ae5acb (diff) 4a2c150ecd67 (current diff)
children 1888ca033a84
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/base/StringBits.cpp	Thu Nov 20 16:18:31 2014 +0000
+++ b/base/StringBits.cpp	Thu Nov 27 17:51:21 2014 +0000
@@ -83,14 +83,14 @@
 	    switch (mode) {
 	    case sep: mode = q1; break;
 	    case unq: case q2: tok += c; break;
-	    case q1: mode = sep; tokens << tok; tok = ""; break;
+	    case q1: mode = unq; break;
 	    }
 
 	} else if (c == '"') {
 	    switch (mode) {
 	    case sep: mode = q2; break;
 	    case unq: case q1: tok += c; break;
-	    case q2: mode = sep; tokens << tok; tok = ""; break;
+	    case q2: mode = unq; break;
 	    }
 
 	} else if (c == separator || (separator == ' ' && c.isSpace())) {