Unverified Commit 7217a7ed by Rémi Verschelde Committed by GitHub

Merge pull request #39230 from ntfshard/expression_string_singlequote

Fix for Expression class: string inside an expression can't be single quoted
parents 786fc63f ec164b23
...@@ -896,6 +896,7 @@ Error Expression::_get_token(Token &r_token) { ...@@ -896,6 +896,7 @@ Error Expression::_get_token(Token &r_token) {
return OK; return OK;
} }
case '\'':
case '"': { case '"': {
String str; String str;
while (true) { while (true) {
...@@ -905,7 +906,8 @@ Error Expression::_get_token(Token &r_token) { ...@@ -905,7 +906,8 @@ Error Expression::_get_token(Token &r_token) {
_set_error("Unterminated String"); _set_error("Unterminated String");
r_token.type = TK_ERROR; r_token.type = TK_ERROR;
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} else if (ch == '"') { } else if (ch == cchar) {
// cchar contain a corresponding quote symbol
break; break;
} else if (ch == '\\') { } else if (ch == '\\') {
//escaped characters... //escaped characters...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment