summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorntfs.hard <ntfs.hard@gmail.com>2020-06-02 02:02:01 +0300
committerntfs.hard <ntfs.hard@gmail.com>2020-06-02 13:44:53 +0300
commitec164b2301034b3aa0fee4e4b93170404a2e4d98 (patch)
treef9b181790b8dfb10e0558a9a269754721b1181eb
parent34ef9a51200978f9c552999969279fc4d6dba31b (diff)
Fix for Expression class: inner string can be single quoted
-rw-r--r--core/math/expression.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/math/expression.cpp b/core/math/expression.cpp
index db3bf2f830..6421606ca2 100644
--- a/core/math/expression.cpp
+++ b/core/math/expression.cpp
@@ -896,6 +896,7 @@ Error Expression::_get_token(Token &r_token) {
return OK;
}
+ case '\'':
case '"': {
String str;
while (true) {
@@ -905,7 +906,8 @@ Error Expression::_get_token(Token &r_token) {
_set_error("Unterminated String");
r_token.type = TK_ERROR;
return ERR_PARSE_ERROR;
- } else if (ch == '"') {
+ } else if (ch == cchar) {
+ // cchar contain a corresponding quote symbol
break;
} else if (ch == '\\') {
//escaped characters...