Explorar o código

Merge pull request #39230 from ntfshard/expression_string_singlequote

Fix for Expression class: string inside an expression can't be single quoted
Rémi Verschelde %!s(int64=5) %!d(string=hai) anos
pai
achega
7217a7edbd
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      core/math/expression.cpp

+ 3 - 1
core/math/expression.cpp

@@ -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) {
 						_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...