[parser] Fix number parsing in interval

leek-wars · Sep 6, 2023 · 172d89b · 172d89b
1 parent dadafb7
commit 172d89b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/leekscript/compiler/LexicalParser.java b/src/main/java/leekscript/compiler/LexicalParser.java
@@ -187,13 +187,13 @@ private boolean tryParseNumber(ErrorReporter error) throws LeekCompilerException
 			}
 
 			if (c == '.') {
-				if (stream.getSubStringSince(startingPoint).contains(".")) {
-					error.report(new AnalyzeError(new Token(TokenType.NOTHING, ".", aiFile, stream.getLineCounter(), stream.getCharCounter() + 1), AnalyzeErrorLevel.ERROR, Error.INVALID_CHAR));
+				// We don't eat the dot if it's followed by another dot
+				if (stream.peek(1) == '.') {
 					break;
 				}
 
-				// We don't eat the dot if it's not followed by another dot
-				if (stream.peek(1) == '.') {
+				if (stream.getSubStringSince(startingPoint).contains(".")) {
+					error.report(new AnalyzeError(new Token(TokenType.NOTHING, ".", aiFile, stream.getLineCounter(), stream.getCharCounter() + 1), AnalyzeErrorLevel.ERROR, Error.INVALID_CHAR));
 					break;
 				}
 

diff --git a/src/test/java/test/TestInterval.java b/src/test/java/test/TestInterval.java
@@ -9,7 +9,7 @@ public void run() throws Exception {
 		section("Interval.constructor()");
 		code("return [..]").equals("[..]");
 		code("return [1..2]").equals("[1..2]");
-		DISABLED_code("return [1.0..2.0]").equals("[1.0..2.0]");
+		code("return [1.0..2.0]").equals("[1.0..2.0]");
 		code_v1("return [1.0 .. 2.0]").equals("[1..2]");
 		code_v2_("return [1.0 .. 2.0]").equals("[1.0..2.0]");
 		code("return [-10..-2]").equals("[-10..-2]");