method parameters

This commit is contained in:
Krauß, Josefine 2024-05-31 10:59:06 +02:00
parent ab19751146
commit 9d86ab3a9f
10 changed files with 98 additions and 49 deletions

View File

@ -27,9 +27,21 @@ public class Compiler {
public static void main(String[] args) throws Exception{
Path filePath = Paths.get("NichtHaskell/src/main/java/Input.java");
Path filePath = Paths.get("src/main/java/Input.java");
// todo remove this debug info
Path absolutePath = filePath.toAbsolutePath();
System.out.println("Full path: " + absolutePath);
String content;
try {
content = Files.readString(filePath);
}catch (java.nio.file.NoSuchFileException e){
System.out.println("File not found");
return;
}
String content = Files.readString(filePath);
System.out.println("--- print content ---");
System.out.println(content);
@ -91,16 +103,7 @@ public class Compiler {
// System.out.println(refType.name);
// }
abstractSyntaxTree.classes.get(1).methodDecls.get(0).codeBlock.returnType = "int";
List<IStatement> statementsList = abstractSyntaxTree.classes.get(1).methodDecls.get(0).codeBlock.statements;
statementsList.remove(0);
statementsList.add(new LocalVarDecl("int", "localInt"));
statementsList.add(new LocalVarDecl("bool", "localBool"));
statementsList.add(new LocalVarDecl("char", "localChar"));
statementsList.add(new AssignStatementExpression("=", new LocalVarIdentifier("localInt"), new UnaryExpression("", new IntDatatype())));
statementsList.add(new AssignStatementExpression("=", new InstVarExpression(abstractSyntaxTree.classes.get(1), "instVarBool"), new UnaryExpression("instVarBool", new BoolDatatype())));
abstractSyntaxTree.classes.get(1).methodDecls.get(0).codeBlock.statements.add(new ReturnStatement(new UnaryExpression("", new IntDatatype())));
abstractSyntaxTree.typeCheck();
abstractSyntaxTree.codeGen();

View File

@ -6,6 +6,10 @@ class Example {
}
class Example2 {
boolean instVarBool;
int m(int n){return 1;}
int m(int n){
while(instVarBool){
return n;
}
return -1;
}
}

View File

@ -75,7 +75,7 @@ public class MethodDecl implements Node {
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", descriptor, false);
mv.visitCode();
codeBlock.codeGen(mv, localVars);
//codeBlock.codeGen(mv, localVars);
mv.visitInsn(Opcodes.RETURN);
//automatically computed max stack and max locals
@ -87,7 +87,7 @@ public class MethodDecl implements Node {
MethodVisitor mv = cw.visitMethod(access, name, "([Ljava/lang/String;)V", null, null);
mv.visitCode();
codeBlock.codeGen(mv, localVars);
//codeBlock.codeGen(mv, localVars);
mv.visitInsn(Opcodes.RETURN);
mv.visitMaxs(0, 0);
@ -97,7 +97,7 @@ public class MethodDecl implements Node {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, name, getMethodDescriptor(methodContext), null, null);
mv.visitCode();
codeBlock.codeGen(mv, localVars);
//codeBlock.codeGen(mv, localVars);
// We have to check the return type to get the return opcode
// For methods which return an actual value, the return opcode is created in the method body to ensure the

View File

@ -36,6 +36,30 @@ public class BlockStatement extends AbstractType implements IStatement {
for (IStatement statement : statements) {
TypeCheckResult typeOfCurrentStatement = statement.typeCheck(methodContext, typeContext, localVars);
if (typeOfCurrentStatement.type.contains(",")) {
// else if has 2 returns, all code paths must retrun a value.
String[] substrings = typeOfCurrentStatement.type.split(",");
String firstType = substrings[0];
String secondType = substrings[1];
if(!firstType.equals(this.returnType) || !firstType.equals(this.returnType)){
if(!firstType.equals("void")){
throw new Exception("TypeCeck Exception: if paths return wrong type");
}
if(!secondType.equals("void")){
throw new Exception("TypeCeck Exception: else paths return wrong type");
}
boolean firstIsVoid = firstType.equals("void");
if(!firstIsVoid){
typeOfCurrentStatement.type = firstType;
}else{
typeOfCurrentStatement.type = secondType;
}
}
}
if (!typeOfCurrentStatement.type.equals(this.returnType)) {
if (!typeOfCurrentStatement.type.equals("void"))
throw new Exception("TypeCheck Exception: Block returns the wrong type.");

View File

@ -9,6 +9,7 @@ import org.objectweb.asm.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Objects;
public class IfElseStatement extends AbstractType implements IStatement{
IExpression condition;
@ -26,11 +27,11 @@ public class IfElseStatement extends AbstractType implements IStatement{
public TypeCheckResult typeCheck(HashMap<String, HashMap<String, HashMap<String, ParameterList>>> methodContext, HashMap<String, HashMap<String, String>> typeContext, HashMap<String, String> localVars) throws Exception {
TypeCheckResult result = new TypeCheckResult();
//TypeCheckResult conditionType = condition.typeCheck();
TypeCheckResult conditionType = condition.typeCheck(methodContext, typeContext, localVars);
// if (!conditionType.equals("bool")) {
// throw new IllegalArgumentException("should be boolean");
// }
if (!conditionType.equals("bool")) {
throw new IllegalArgumentException("should be boolean");
}
TypeCheckResult ifStatementType = ifStatement.typeCheck(methodContext, typeContext, localVars);
TypeCheckResult elseStatementType = elseStatement.typeCheck(methodContext, typeContext, localVars);
@ -38,11 +39,17 @@ public class IfElseStatement extends AbstractType implements IStatement{
if (!ifStatementType.equals(elseStatementType)) {
throw new IllegalArgumentException("if and else have different types");
}
result.type = elseStatementType.type;
if(ifStatementType.type != "void" && elseStatementType.type != "void"){
if(Objects.equals(ifStatementType.type, elseStatementType.type)){
throw new Exception("TypeCeck Exception: If and else return different not-void types");
}
}
result.type = ifStatementType.type + "," + elseStatementType.type;
return result;
}
@Override
public void codeGen(MethodVisitor mv, LinkedHashMap<String, String> localVars, HashMap<String, HashMap<String, String>> typeContext) throws Exception {

View File

@ -25,11 +25,11 @@ public class IfStatement extends AbstractType implements IStatement{
public TypeCheckResult typeCheck(HashMap<String, HashMap<String, HashMap<String, ParameterList>>> methodContext, HashMap<String, HashMap<String, String>> typeContext, HashMap<String, String> localVars) throws Exception {
TypeCheckResult result = new TypeCheckResult();
//TypeCheckResult conditionType = condition.typeCheck();
TypeCheckResult conditionType = condition.typeCheck(methodContext, typeContext, localVars);
// if (!conditionType.equals("bool")) {
// throw new Exception("TypeCheck Exception: Condition of If-Statement should be bool.");
// }
if (!conditionType.equals("bool")) {
throw new Exception("TypeCheck Exception: Condition of If-Statement should be bool.");
}
TypeCheckResult ifStatementType = ifStatement.typeCheck(methodContext, typeContext, localVars);
result.type = ifStatementType.type;

View File

@ -23,15 +23,18 @@ public class WhileStatement extends AbstractType implements IStatement {
public TypeCheckResult typeCheck(HashMap<String, HashMap<String, HashMap<String, ParameterList>>> methodContext, HashMap<String, HashMap<String, String>> typeContext, HashMap<String, String> localVars) throws Exception {
TypeCheckResult result = new TypeCheckResult();
// TypeCheckResult conditionType = condition.typeCheck();
//
// if (!conditionType.equals("bool")) {
// throw new IllegalArgumentException("Expected boolean");
// }
// check condition
TypeCheckResult conditionType = condition.typeCheck(methodContext, typeContext, localVars);
if (!conditionType.equals("bool")) {
throw new IllegalArgumentException("Expected boolean");
}
// check code block
TypeCheckResult statementType = statement.typeCheck(methodContext, typeContext, localVars);
// set result
result.type = statementType.type;
setTypeCheckResult(result);
return result;
}

View File

@ -12,6 +12,7 @@ import org.objectweb.asm.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Objects;
public class AssignStatementExpression extends AbstractType implements IExpression, IStatement {
public String operator;
@ -19,7 +20,7 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
public IExpression right;
private InstVarExpression instVar;
public AssignStatementExpression(String operator, IExpression leftExpression, IExpression rightExpression){
public AssignStatementExpression(String operator, IExpression leftExpression, IExpression rightExpression) {
this.operator = operator;
this.left = leftExpression;
this.right = rightExpression;
@ -37,7 +38,7 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
LocalVarIdentifier localVarIdentifier = (LocalVarIdentifier) left;
String identifier = localVarIdentifier.getIdentifier();
leftType.type = localVars.get(identifier);
}else{
} else {
leftType = left.typeCheck(methodContext, typeContext, localVars);
}
TypeCheckResult rightType = right.typeCheck(methodContext, typeContext, localVars);
@ -51,12 +52,10 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
}
@Override
public void codeGen(MethodVisitor mv, HashMap<String, String> localVars) throws Exception {
if (left instanceof VarRefExpression varRef) {
public void codeGen(MethodVisitor mv, LinkedHashMap<String, String> localVars, HashMap<String, HashMap<String, String>> typeContext) throws Exception {
}
}
public TypeCheckResult typeCheck() throws Exception {
return null;
@ -77,15 +76,15 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
//Get the index of the local variable
int index = -1;
int counter = 0;
for (String key : localVars.keySet()){
if (key.equals(varName)){
for (String key : localVars.keySet()) {
if (key.equals(varName)) {
index = counter;
break;
}
counter++;
}
if (index == -1){
if (index == -1) {
throw new Exception("Variable " + varName + " not found");
}
@ -100,7 +99,7 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
break;
}
} else if (left instanceof InstVarExpression){
} else if (left instanceof InstVarExpression) {
instVar = (InstVarExpression) left;
// Load "this" onto the stack
@ -116,4 +115,5 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
// //mv.visitFieldInsn(Opcodes.PUTFIELD, instVar.className, instVar.varName, instVar.type);
// }
}
}
}

View File

@ -51,6 +51,11 @@ public class MethodCallStatementExpression extends AbstractType implements IExpr
return null;
}
@Override
public void codeGen(MethodVisitor mv, LinkedHashMap<String, String> localVars, HashMap<String, HashMap<String, String>> typeContext) throws Exception {
}
//Errors occur due to the change in parameter in the RefType class
// I need the methodContext here to get the method descriptor
@ -66,10 +71,10 @@ public class MethodCallStatementExpression extends AbstractType implements IExpr
for (MethodDecl methodDecl : methodDecls) {
if (methodDecl.name.equals(methodName)) {
//Get the method descriptor
descriptor = methodDecl.getMethodDescriptor(methodContext);
// descriptor = methodDecl.getMethodDescriptor(methodContext);
}
}
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, classThatHasTheMethodIfNotThis.name, methodName, descriptor, false);
// mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, classThatHasTheMethodIfNotThis.name, methodName, descriptor, false);
} else {
// Load this onto the stack
@ -86,9 +91,9 @@ public class MethodCallStatementExpression extends AbstractType implements IExpr
for (MethodDecl methodDecl : methodDecls) {
if (methodDecl.name.equals(methodName)) {
//Get the method descriptor
descriptor = methodDecl.getMethodDescriptor(methodContext);
// descriptor = methodDecl.getMethodDescriptor(methodContext);
}
}
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, thisClass.name, methodName, descriptor, false);
// mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, thisClass.name, methodName, descriptor, false);
}
}

View File

@ -8,6 +8,7 @@ import abstractSyntaxTree.Statement.IStatement;
import org.objectweb.asm.MethodVisitor;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
public class NewStatementExpression extends AbstractType implements IExpression, IStatement {
@ -19,12 +20,14 @@ public class NewStatementExpression extends AbstractType implements IExpression,
}
@Override
public void codeGen(MethodVisitor mv, HashMap<String, String> localVars) throws Exception {
public void codeGen(MethodVisitor mv, LinkedHashMap<String, String> localVars, HashMap<String, HashMap<String, String>> typeContext) throws Exception {
}
@Override
public void codeGen(MethodVisitor mv) throws Exception {
throw new Exception("CodeGen not implemented for NewStatementExpression");
public void codeGen(MethodVisitor mv, HashMap<String, HashMap<String, String>> typeContext, LinkedHashMap<String, String> localVars) throws Exception {
}
}