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

constructor return type

Browse Source
This commit is contained in:
Krauß, Josefine 2024-06-28 18:33:21 +02:00
parent 1358e3372f
commit 7498ca6e4d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/abstractSyntaxTree/Class/MethodDecl.java
View File

@ -43,9 +43,12 @@ public class MethodDecl implements Node {
TypeCheckResult result = new TypeCheckResult(); TypeCheckResult result = new TypeCheckResult();
codeBlock.thisClass = classThatContainsMethod; codeBlock.thisClass = classThatContainsMethod;
String CodeBlockType = codeBlock.typeCheck(methodContext, typeContext, localVars).type; String codeBlockType = codeBlock.typeCheck(methodContext, typeContext, localVars).type;
if(!Objects.equals(this.returnType, CodeBlockType)) if(Objects.equals(this.name, classThatContainsMethod))
throw new TypeCheckException("Method returns " + CodeBlockType + ", but should return " + this.returnType + ". "); codeBlockType = null;
if(!Objects.equals(this.returnType, codeBlockType))
throw new TypeCheckException("Method returns " + codeBlockType + ", but should return " + this.returnType + ". ");
result.type = codeBlock.returnType; result.type = codeBlock.returnType;
return result; return result;
} }

5
src/main/java/abstractSyntaxTree/Program.java
View File

@ -42,7 +42,6 @@ public class Program implements Node {
typeContext.put(oneClass.name, classVars); typeContext.put(oneClass.name, classVars);
// build method context // build method context
HashMap<String, HashMap<String, ParameterList>> identifierAndMethod = new HashMap<>(); HashMap<String, HashMap<String, ParameterList>> identifierAndMethod = new HashMap<>();
for (MethodDecl methodDecl : oneClass.methodDecls){ for (MethodDecl methodDecl : oneClass.methodDecls){
if(methodDecl.returnType == null) continue; if(methodDecl.returnType == null) continue;
@ -60,8 +59,8 @@ public class Program implements Node {
if(oneClass.hasMain) if(oneClass.hasMain)
mainCounter++; mainCounter++;
} }
if(mainCounter != 1) // if(mainCounter != 1)
throw new TypeCheckException("There is not 1 Main method."); // throw new TypeCheckException("There is not 1 Main method.");
// typecheck each class // typecheck each class
TypeCheckResult result = new TypeCheckResult(); TypeCheckResult result = new TypeCheckResult();