summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2019-10-18 11:58:34 +0200
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2019-10-18 11:58:34 +0200
commit5b96233c3449baa18e4005d879b673e7fd7b169a (patch)
treee994fbed39a4b3d20fb97b01d53ef478b6b289e4 /modules
parent119bf237209414a49879fba40459f22315ab1467 (diff)
Remove duplicate valid value check in gdscript_tokenizer.cpp.
Diffstat (limited to 'modules')
-rw-r--r--modules/gdscript/gdscript_tokenizer.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index 8b20b0ff48..4730e9b6bc 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -849,12 +849,8 @@ void GDScriptTokenizerText::_advance() {
_make_error("Unterminated String");
return;
}
- if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) {
- _make_error("Malformed hex constant in string");
- return;
- }
- CharType v;
+ CharType v = 0;
if (c >= '0' && c <= '9') {
v = c - '0';
} else if (c >= 'a' && c <= 'f') {
@@ -864,8 +860,8 @@ void GDScriptTokenizerText::_advance() {
v = c - 'A';
v += 10;
} else {
- ERR_PRINT("BUG");
- v = 0;
+ _make_error("Malformed hex constant in string");
+ return;
}
res <<= 4;