From 5b96233c3449baa18e4005d879b673e7fd7b169a Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Fri, 18 Oct 2019 11:58:34 +0200 Subject: Remove duplicate valid value check in gdscript_tokenizer.cpp. --- modules/gdscript/gdscript_tokenizer.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'modules/gdscript') 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; -- cgit v1.2.3