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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
StefanZ3 2024-05-31 11:05:31 +02:00
commit 3953bbe549
8 changed files with 72 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/Compiler.java
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();

8
src/main/java/Input.java
View File

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

24
src/main/java/abstractSyntaxTree/Statement/BlockStatement.java
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.");

19
src/main/java/abstractSyntaxTree/Statement/IfElseStatement.java
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 {

8
src/main/java/abstractSyntaxTree/Statement/IfStatement.java
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;

13
src/main/java/abstractSyntaxTree/Statement/WhileStatement.java
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;
}

2
src/main/java/abstractSyntaxTree/StatementExpression/AssignStatementExpression.java
View File

@ -112,4 +112,4 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
}
*/
}
}
}

2
src/main/java/abstractSyntaxTree/StatementExpression/NewStatementExpression.java
View File

@ -28,4 +28,6 @@ public class NewStatementExpression extends AbstractType implements IExpression,
public void codeGen(MethodVisitor mv, HashMap<String, HashMap<String, String>> typeContext, LinkedHashMap<String, String> localVars) throws Exception {
}
}