nitrix/klang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove NYI errors, check if a struct is defined if the declared type is not primitive

Browse Source
This commit is contained in:
nitrix
2020-02-04 19:48:38 +01:00
parent 6981c288e6
commit 233894fbcf
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java
View File

@@ -195,8 +195,8 @@ public class ContextAnalysis extends KlangBaseVisitor<Node> {
int col = ctx.start.getCharPositionInLine();
Type declaredType = Type.getByName(ctx.type_annotation().type().getText());
if (!declaredType.isPrimitiveType()) {
String error = "Using a struct as a type for a variable is not yet implemented";
if (!declaredType.isPrimitiveType() && !this.structs.contains(declaredType.getName())) {
String error = "Type " + declaredType.getName() + " not defined.";
throw new RuntimeException(Helper.getErrorPrefix(line, col) + error);
}
@@ -682,8 +682,8 @@ public class ContextAnalysis extends KlangBaseVisitor<Node> {
Type returnType = Type.getByName(ctx.returnType.type().getText());
this.currentDeclaredReturnType = returnType;
if (!returnType.isPrimitiveType()) {
String error = "Using a struct as the return type of a function is not yet implemented";
if (!returnType.isPrimitiveType() && !this.structs.contains(returnType.getName())) {
String error = "Type " + returnType.getName() + " not defined.";
throw new RuntimeException(Helper.getErrorPrefix(line, col) + error);
}
@@ -726,11 +726,10 @@ public class ContextAnalysis extends KlangBaseVisitor<Node> {
String name = ctx.IDENT().getText();
int line = ctx.start.getLine();
int col = ctx.start.getCharPositionInLine();
Type type = Type.getByName(ctx.type_annotation().type().getText());
if (!type.isPrimitiveType()) {
String error = "Using a struct as a parameter is not yet implemented";
if (!type.isPrimitiveType() && !this.structs.contains(type.getName())) {
String error = "Type " + type.getName() + " not defined.";
throw new RuntimeException(Helper.getErrorPrefix(line, col) + error);
}