i22022/NichtHaskell
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: i22022:c44ed5446d0059a3bfc6f1265460ff88eca882a6
Branches Tags
i22022:master
..
compare: i22022:6f9791455d83e442d698966f0d13f49a74634bb9
Branches Tags
i22022:master

2 Commits
c44ed5446d ... 6f9791455d

Author SHA1 Message Date
Krauß, Josefine
6f9791455d Merge remote-tracking branch 'origin/master' 2024-06-18 10:08:25 +02:00
Krauß, Josefine
0f76b1fdae small change due to "not" as block return 2024-06-18 10:08:14 +02:00
1 changed files with 33 additions and 37 deletions
Show Stats Expand all files Collapse all files

22
src/main/java/abstractSyntaxTree/Statement/BlockStatement.java
View File

@ -38,16 +38,7 @@ public class BlockStatement extends AbstractType implements IStatement {
for (IStatement statement : statements) { for (IStatement statement : statements) {
System.out.println(statement.getClass()); //todo remove
// todo remove later if there are no null statement any more
if (statement != null) {
TypeCheckResult typeOfCurrentStatement = statement.typeCheck(methodContext, typeContext, localVars); TypeCheckResult typeOfCurrentStatement = statement.typeCheck(methodContext, typeContext, localVars);
if(this.returnType == "not" && statement instanceof ReturnStatement){
ReturnStatement returnStatement = (ReturnStatement) statement;
this.returnType = returnStatement.getTypeCheckResult().type;
}
if(statement instanceof LocalVarDecl){ if(statement instanceof LocalVarDecl){
LocalVarDecl localVarDecl = (LocalVarDecl) statement; LocalVarDecl localVarDecl = (LocalVarDecl) statement;
localVars.put(localVarDecl.identifier, localVarDecl.type); localVars.put(localVarDecl.identifier, localVarDecl.type);
@ -77,12 +68,17 @@ public class BlockStatement extends AbstractType implements IStatement {
} }
} }
if (!typeOfCurrentStatement.type.equals(this.returnType)) {
if (!typeOfCurrentStatement.type.equals("void")) if(typeOfCurrentStatement.type.equals("void"))
continue;
// set return of block if not known yet
if(this.returnType.equals("not"))
this.returnType = typeOfCurrentStatement.type;
if (!typeOfCurrentStatement.type.equals(this.returnType))
throw new Exception("TypeCheck Exception: Block returns the wrong type."); throw new Exception("TypeCheck Exception: Block returns the wrong type.");
} }
}
}
result.type = this.returnType; result.type = this.returnType;
// todo check if the block returns the needed return type in every case // todo check if the block returns the needed return type in every case
// todo ignore unreachable statements? // todo ignore unreachable statements?