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

Make error handler only handle compilation exceptions

Browse Source
This commit is contained in:
Astrash
2023-10-27 14:21:50 +11:00
parent ff031df903
commit c3909ca1e0
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/ErrorHandler.java
View File

@@ -1,19 +1,21 @@
package com.dfsek.terra.addons.terrascript.v2;
import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
import java.util.ArrayList;
import java.util.List;
public class ErrorHandler {
private final List<Exception> exceptions = new ArrayList<>();
private final List<CompilationException> exceptions = new ArrayList<>();
public void add(Exception e) {
public void add(CompilationException e) {
exceptions.add(e);
}
public void throwAny() throws Exception {
for(Exception e : exceptions) {
public void throwAny() throws CompilationException {
for(CompilationException e : exceptions) {
throw e;
}
}

11
common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/InvalidArgumentsException.java Normal file
View File

@@ -0,0 +1,11 @@
package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
public class InvalidArgumentsException extends CompilationException {
public InvalidArgumentsException(String message, SourcePosition position) {
super(message, position);
}
}

11
common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/InvalidCalleeException.java Normal file
View File

@@ -0,0 +1,11 @@
package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
public class InvalidCalleeException extends CompilationException {
public InvalidCalleeException(String message, SourcePosition position) {
super(message, position);
}
}

5
common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/TypeChecker.java
View File

@@ -17,6 +17,7 @@ import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Void;
import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr;
import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt;
import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidArgumentsException;
import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidCalleeException;
import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidFunctionDeclarationException;
import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidTypeException;
@@ -62,7 +63,7 @@ public class TypeChecker implements Visitor<TypedExpr>, Stmt.Visitor<TypedStmt>
if(leftType.typeOf(Type.STRING) || rightType.typeOf(Type.STRING)) {
yield Type.STRING;
}
errorHandler.add(new RuntimeException("Addition operands must be either both of type '" + Type.NUMBER + "', or one of type '" + Type.STRING + "'"));
errorHandler.add(new InvalidTypeException("Addition operands must be either both of type '" + Type.NUMBER + "', or one of type '" + Type.STRING + "'", expr.position));
yield Type.VOID;
}
case SUBTRACT, MULTIPLY, DIVIDE, MODULO -> {
@@ -114,7 +115,7 @@ public class TypeChecker implements Visitor<TypedExpr>, Stmt.Visitor<TypedStmt>
List<Type> parameters = functionType.getParameters();
if(arguments.size() != parameters.size())
errorHandler.add(new ParseException(
errorHandler.add(new InvalidArgumentsException(
"Provided " + arguments.size() + " arguments to function call, expected " + parameters.size() + " arguments", expr.position));
for(int i = 0; i < parameters.size(); i++) {