Avoid tokenizing literals with e followed by +/- as hexadecimals

Kingcom · Sep 22, 2019 · 31391b8 · 31391b8
1 parent 8189eae
commit 31391b8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Parser/Tokenizer.cpp b/Parser/Tokenizer.cpp
@@ -538,6 +538,7 @@ Token FileTokenizer::loadToken()
 		bool isValid = true;
 		bool foundPoint = false;
 		bool foundExp = false;
+		bool foundExpSign = false;
 		bool isHex = start+1 < currentLine.size() && currentLine[start] == '0' && towlower(currentLine[start+1]) == 'x';
 
 		while (end < currentLine.size() && (iswalnum(currentLine[end]) || currentLine[end] == '.'))
@@ -547,7 +548,7 @@ Token FileTokenizer::loadToken()
 				if (isHex || foundExp || foundPoint)
 					isValid = false;
 				foundPoint = true;
-			} else if (towlower(currentLine[end]) == 'h') {
+			} else if (towlower(currentLine[end]) == 'h' && !foundExpSign) {
 				isHex = true;
 			} else if (towlower(currentLine[end]) == 'e' && !isHex)
 			{
@@ -558,6 +559,7 @@ Token FileTokenizer::loadToken()
 					end++;
 					if (end+1 >= currentLine.size() || !iswalnum(currentLine[end+1]))
 						isValid = false;
+					foundExpSign = true;
 				}
 				foundExp = true;
 			}