Remove hardcoded part

kiip1 · Mar 2, 2023 · 709f470 · 709f470
1 parent f325a1a
commit 709f470
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/sklectern-core/src/main/java/nl/kiipdevelopment/sklectern/parser/ScriptParserImpl.java b/sklectern-core/src/main/java/nl/kiipdevelopment/sklectern/parser/ScriptParserImpl.java
@@ -123,12 +123,11 @@ else if (peek().type() == TokenType.MACRO) {
         }
 
         private @NotNull ASTStructureEntry<?> entry() {
-            final String key = element(List.of(TokenType.COLON)).visit(null);
-            final ASTNode node = element(List.of(TokenType.END));
+            final ASTNode key = element(List.of(TokenType.COLON));
+            final boolean statementList = ifEat(TokenType.END);
 
-            if (key.equals("trigger"))
-                return new ASTStructureEntry<>(key, statementList());
-            return new ASTStructureEntry<>(key, node);
+            if (statementList) return new ASTStructureEntry<>(key, statementList());
+            else return new ASTStructureEntry<>(key, element(List.of(TokenType.END)));
         }
 
         private @NotNull ASTStatementList statementList() {