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

Compare commits

base: i22022:aa8a647fa1bbfa9fc9355c1ebf10dfe7e66a8f13
Branches Tags
i22022:master
...
compare: i22022:aed7af7c681184016ecfd9d71a9f6d4cdf83b943
Branches Tags
i22022:master

2 Commits
aa8a647fa1 ... aed7af7c68

Author SHA1 Message Date
Krauß, Josefine
aed7af7c68 Merge remote-tracking branch 'origin/master' 2024-07-04 18:11:18 +02:00
Krauß, Josefine
3a8b9ea9cd missing thisclass 2024-07-04 18:11:02 +02:00
3 changed files with 10 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
pom.xml
View File

@ -26,6 +26,7 @@
<mainClass>Compiler</mainClass>
</manifest>
</archive>
<finalName>NichtHaskellCompiler</finalName>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>

7
src/main/java/abstractSyntaxTree/Expression/BinaryExpression.java
View File

@ -15,8 +15,9 @@ import java.util.Objects;
public class BinaryExpression extends AbstractType implements IExpression{
public String operator;
public IExpression left; // This needs TypeCheckResult
public IExpression left;
public IExpression right;
public String thisClass;
public BinaryExpression(String operator, IExpression left, IExpression right) {
this.operator = operator;
@ -28,6 +29,10 @@ public class BinaryExpression extends AbstractType implements IExpression{
public TypeCheckResult typeCheck(HashMap<String, HashMap<String, HashMap<String, ParameterList>>> methodContext, HashMap<String, HashMap<String, String>> typeContext, HashMap<String, String> localVars) throws TypeCheckException {
TypeCheckResult result = new TypeCheckResult();
if(left instanceof LocalVarIdentifier localVarIdentifier)
localVarIdentifier.thisClass = this.thisClass;
if(right instanceof LocalVarIdentifier localVarIdentifier)
localVarIdentifier.thisClass = this.thisClass;
TypeCheckResult leftType = left.typeCheck(methodContext, typeContext, localVars);
TypeCheckResult rightType = right.typeCheck(methodContext, typeContext, localVars);

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

@ -4,6 +4,7 @@ import TypeCheck.AbstractType;
import TypeCheck.TypeCheckException;
import TypeCheck.TypeCheckHelper;
import TypeCheck.TypeCheckResult;
import abstractSyntaxTree.Expression.BinaryExpression;
import abstractSyntaxTree.Expression.IExpression;
import abstractSyntaxTree.Expression.InstVarExpression;
import abstractSyntaxTree.Expression.LocalVarIdentifier;
@ -54,6 +55,8 @@ public class AssignStatementExpression extends AbstractType implements IExpressi
methodCallStatementExpression.thisClass = this.thisClass;
if(right instanceof LocalVarIdentifier localVarIdentifierRight)
localVarIdentifierRight.thisClass = this.thisClass;
if(right instanceof BinaryExpression binaryExpression)
binaryExpression.thisClass = this.thisClass;
TypeCheckResult rightType = right.typeCheck(methodContext, typeContext, localVars);