From 8db263e19b5bf81418dfb03bc4e183cb893b84ea Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 27 Dec 2020 20:55:01 -0700 Subject: [PATCH] fix EOF issues --- .../com/dfsek/terra/api/structures/parser/Parser.java | 4 +--- common/src/test/resources/test.tesf | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java b/common/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java index 706939bce..84de91448 100644 --- a/common/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java +++ b/common/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java @@ -152,9 +152,7 @@ public class Parser { List, Block>> elseIf = new GlueList<>(); - System.out.println(tokens.get()); - - while(tokens.get().getType().equals(Token.Type.ELSE)) { + while(tokens.hasNext() && tokens.get().getType().equals(Token.Type.ELSE)) { tokens.consume(); // Consume else. System.out.println("int: " + tokens.get()); if(tokens.get().getType().equals(Token.Type.IF_STATEMENT)) { diff --git a/common/src/test/resources/test.tesf b/common/src/test/resources/test.tesf index 028c121b9..8743834b1 100644 --- a/common/src/test/resources/test.tesf +++ b/common/src/test/resources/test.tesf @@ -54,10 +54,7 @@ if(false) { } -if(true && !(boolean && false) && true) { - num scopedVar = 2; - test("if statement" + 2 + stringVar, 1 + testVar + scopedVar); -} + // comment /* @@ -66,3 +63,7 @@ fsdfsd test("fdsgdf" + 2, 1 + testVar); +if(true && !(boolean && false) && true) { + num scopedVar = 2; + test("if statement" + 2 + stringVar, 1 + testVar + scopedVar); +} \ No newline at end of file