Merge remote-tracking branch 'origin/main'

This commit is contained in:
simon 2024-06-28 18:53:07 +02:00
commit 270a73c74e

View File

@ -55,14 +55,7 @@ public class TypedBinary implements TypedExpression {
} else {
throw new RuntimeException("Type mismatch in " + op);
}
} else if (op == Operator.AND || op == Operator.OR) {
if (leftType == Type.BOOL && rightType == Type.BOOL) {
type = Type.BOOL;
return Type.BOOL;
} else {
throw new RuntimeException("Type mismatch in " + op);
}
} else if(op == Operator.EQ || op == Operator.NE){
} else if(op == Operator.EQ || op == Operator.NE || op == Operator.AND || op == Operator.OR){
if(leftType == Type.INT && rightType == Type.INT || leftType == Type.BOOL && rightType == Type.BOOL){
type = Type.BOOL;
return Type.BOOL;