i22006/Compilerbau2024AbsolutNichtHaskell
i22006/Compilerbau2024AbsolutNichtHaskell
2
0
Fork 0
mirror of https://github.com/JonathanFleischmann/CompilerULTIMATE.git synced 2024-12-27 08:38:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored typed classes

Browse Source
This commit is contained in:
ahmad 2024-05-15 18:50:43 +02:00
parent 0215d38aa1
commit 5fe0098062
12 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/maishai/typedast/typedclass/TypedBlock.java
View File

@ -103,12 +103,12 @@ public class TypedBlock implements TypedNode {
Type chekType = null;
for (TypedStatement stmt : stmts) {
stmt.typeCheck(typedProgram);
if(stmt instanceof TypedReturn returnStmt) {
if (stmt instanceof TypedReturn returnStmt) {
chekType = returnStmt.getType();
}
}
if(chekType == null) {
if (chekType == null) {
chekType = Type.VOID;
}
type = chekType;

4
src/main/java/de/maishai/typedast/typedclass/TypedBoolLiteral.java
View File

@ -32,9 +32,9 @@ public class TypedBoolLiteral implements TypedExpression {
@Override
public void codeGen(MethodContext ctx) {
if(value){
if (value) {
ctx.getMv().visitInsn(Opcodes.ICONST_1);
}else{
} else {
ctx.getMv().visitInsn(Opcodes.ICONST_0);
}
}

4
src/main/java/de/maishai/typedast/typedclass/TypedBreak.java
View File

@ -10,10 +10,6 @@ import lombok.Data;
public class TypedBreak implements TypedStatement {
private Type type = Type.VOID;
public TypedBreak convertToTypedBreak(TypedClass clas, Break unTypedBreak) {
return this;
}
@Override
public Type typeCheck(TypedProgram typedProgram) {
return type;

1
src/main/java/de/maishai/typedast/typedclass/TypedClass.java
View File

@ -125,6 +125,7 @@ public class TypedClass implements TypedNode {
}
return false;
}
public Type getMethodType(String methodName) {
for (TypedMethod m : typedMethods) {
if (m.getName().equals(methodName)) {

1
src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java
View File

@ -66,6 +66,7 @@ public class TypedConstructor implements TypedNode {
throw new RuntimeException("Parameter " + paraName + " already exists");
}
}
public void convertToBlock(TypedProgram typedProgram, Constructor unTypedConstructor) {
this.typedBlock = new TypedBlock(typedProgram, unTypedConstructor.block());
typeCheck(typedProgram);

2
src/main/java/de/maishai/typedast/typedclass/TypedDeclaration.java
View File

@ -29,7 +29,7 @@ public final class TypedDeclaration implements TypedNode {
@Override
public Type typeCheck(TypedProgram typedProgram) {
if(type.getReference() != null && !typedProgram.getCurrentClass().getClassName().equals(type.getReference())) {
if (type.getReference() != null && !typedProgram.getCurrentClass().getClassName().equals(type.getReference())) {
if (!typedProgram.isTypedClassPresent(type.getReference())) {
throw new RuntimeException("Type " + type.getReference() + " not found");
}

9
src/main/java/de/maishai/typedast/typedclass/TypedFieldVarAccess.java
View File

@ -39,11 +39,12 @@ public class TypedFieldVarAccess implements TypedExpression {
return type;
}
}
private Type checkFieldOrMethodType(TypedProgram typedProgram) {
if (typedProgram.getCurrentClass().isThereField(name)) {
type = typedProgram.getCurrentClass().getFieldType(name);
return type;
} else if(typedProgram.getCurrentClass().isMethodOfCurrentClass(name)) {
} else if (typedProgram.getCurrentClass().isMethodOfCurrentClass(name)) {
type = typedProgram.getCurrentClass().getMethodType(name);
return type;
} else if (recursiveOwnerChain instanceof TypedFieldVarAccess typedFieldVarAccess) {
@ -53,6 +54,7 @@ public class TypedFieldVarAccess implements TypedExpression {
throw new RuntimeException("Field " + name + " not declared");
}
}
private Type checkVariableType(TypedProgram typedProgram) {
if (typedProgram.getCurrentClass().isCurrentConstructorPresent()) {
return checkConstructorVariableType(typedProgram);
@ -88,10 +90,9 @@ public class TypedFieldVarAccess implements TypedExpression {
private Type checkFieldOrMethodOrRecursiveType(TypedProgram typedProgram) {
if (typedProgram.getCurrentClass().isThereField(name)) {
type = typedProgram.getCurrentClass().getFieldType(name);
}else if(typedProgram.getCurrentClass().isMethodOfCurrentClass(name)) {
} else if (typedProgram.getCurrentClass().isMethodOfCurrentClass(name)) {
type = typedProgram.getCurrentClass().getMethodType(name);
}
else if (recursiveOwnerChain instanceof TypedFieldVarAccess typedFieldVarAccess) {
} else if (recursiveOwnerChain instanceof TypedFieldVarAccess typedFieldVarAccess) {
type = typedProgram.getCurrentClass().getFieldType(typedFieldVarAccess.getName());
} else {
throw new RuntimeException("Variable " + name + " not declared");

1
src/main/java/de/maishai/typedast/typedclass/TypedMethod.java
View File

@ -40,6 +40,7 @@ public class TypedMethod implements TypedNode {
}, () -> {
});
}
public void checkIfParameterExists(String parameterName) {
if (typedParameters.stream().anyMatch(parameter -> parameter.getParaName().equals(parameterName))) {
throw new RuntimeException("Parameter " + parameterName + " already exists");

4
src/main/java/de/maishai/typedast/typedclass/TypedNew.java
View File

@ -29,8 +29,8 @@ public class TypedNew implements TypedExpression, TypedStatement {
@Override
public Type typeCheck(TypedProgram typedProgram) {
if(typedProgram.isTypedClassPresent(type.getReference())){
return Type.REFERENCE(type.getReference());
if (typedProgram.isTypedClassPresent(type.getReference())) {
return Type.REFERENCE(type.getReference());
}
for (var constructor : typedProgram.getCurrentClass().getTypedConstructors()) {

5
src/main/java/de/maishai/typedast/typedclass/TypedProgram.java
View File

@ -19,7 +19,7 @@ public class TypedProgram {
public void startConversion(Program program) {
for(var clas : program.classes()){
for (var clas : program.classes()) {
typedClasses.add(new TypedClass(clas));
}
@ -32,7 +32,7 @@ public class TypedProgram {
}
int i = 0;
for(var clas : program.classes()){
for (var clas : program.classes()) {
enterCurrentClass(typedClasses.get(i));
typedClasses.get(i).covertBlocksOfConstructorsAndMethods(this, clas);
exitCurrentClass();
@ -43,6 +43,7 @@ public class TypedProgram {
public TypedClass getTypedClass(String className) {
return typedClasses.stream().filter(clas -> clas.getClassName().equals(className)).findFirst().get();
}
public boolean isTypedClassPresent(String className) {
return typedClasses.stream().anyMatch(clas -> clas.getClassName().equals(className));
}

4
src/main/java/de/maishai/typedast/typedclass/TypedReturn.java
View File

@ -21,9 +21,9 @@ public class TypedReturn implements TypedStatement {
public void convertToTypedReturn(TypedProgram typedProgram, Return unTypedReturn) {
ret = convertExpression(typedProgram, unTypedReturn.ret());
if(ret == null){
if (ret == null) {
type = Type.VOID;
}else{
} else {
type = ret.getType();
}
}

4
src/main/java/de/maishai/typedast/typedclass/TypedUnary.java
View File

@ -47,11 +47,11 @@ public class TypedUnary implements TypedExpression {
@Override
public void codeGen(MethodContext ctx) {
right.codeGen(ctx);
if(op == UnaryOperator.NOT){
if (op == UnaryOperator.NOT) {
ctx.getMv().visitInsn(Opcodes.ICONST_1);
ctx.getMv().visitInsn(Opcodes.IXOR);
}
if(op == UnaryOperator.SUB){
if (op == UnaryOperator.SUB) {
ctx.getMv().visitInsn(Opcodes.INEG);
}
}