mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 14:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move statement end handling to parseExpression

Browse Source
This commit is contained in:
Astrash
2023-07-23 19:17:08 +10:00
parent 76728fe593
commit 802bce40c8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java
+2 -4
View File
@@ -139,9 +139,7 @@ public class Parser {
return block; return block;
} else { } else {
SourcePosition position = tokenizer.current().getPosition(); SourcePosition position = tokenizer.current().getPosition();
Block block = new Block(Collections.singletonList(parseExpression(tokenizer, controlStructure, scopeBuilder)), position); return new Block(Collections.singletonList(parseExpression(tokenizer, controlStructure, scopeBuilder)), position);
ParserUtil.ensureType(tokenizer.consume(), Token.Type.STATEMENT_END);
return block;
} }
} }
@@ -345,7 +343,6 @@ public class Parser {
if(expression != Function.NULL) { if(expression != Function.NULL) {
expressions.add(expression); expressions.add(expression);
} }
if(tokenizer.hasNext() && !token.isControlStructure()) ParserUtil.ensureType(tokenizer.consume(), Token.Type.STATEMENT_END);
} }
return new Block(expressions, first.getPosition()); return new Block(expressions, first.getPosition());
} }
@@ -381,6 +378,7 @@ public class Parser {
case FAIL -> new FailKeyword(tokenizer.consume().getPosition()); case FAIL -> new FailKeyword(tokenizer.consume().getPosition());
default -> throw new UnsupportedOperationException("Unexpected token " + token.getType() + ": " + token.getPosition()); default -> throw new UnsupportedOperationException("Unexpected token " + token.getType() + ": " + token.getPosition());
}; };
if(!token.isControlStructure()) ParserUtil.ensureType(tokenizer.consume(), Token.Type.STATEMENT_END);
return expression; return expression;
} }