comparison base/StringBits.cpp @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 6a94bb528e9d
children a73c44ae5acb
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
103 } else if (c == '\\') { 103 } else if (c == '\\') {
104 if (++i < s.length()) { 104 if (++i < s.length()) {
105 c = s[i]; 105 c = s[i];
106 switch (mode) { 106 switch (mode) {
107 case sep: mode = unq; tok += c; break; 107 case sep: mode = unq; tok += c; break;
108 default: tok += c; break; 108 case unq: case q1: case q2: tok += c; break;
109 } 109 }
110 } 110 }
111 111
112 } else { 112 } else {
113 switch (mode) { 113 switch (mode) {
114 case sep: mode = unq; tok += c; break; 114 case sep: mode = unq; tok += c; break;
115 default: tok += c; break; 115 case unq: case q1: case q2: tok += c; break;
116 } 116 }
117 } 117 }
118 } 118 }
119 119
120 if (tok != "" || mode != sep) tokens << tok; 120 if (tok != "" || mode != sep) tokens << tok;