From 80e60b921bf42cb20ab0517fbed5b3ae2b256a63 Mon Sep 17 00:00:00 2001
From: Jan Gruteser <jan.gruteser@hhu.de>
Date: Fri, 26 Apr 2024 15:09:32 +0200
Subject: [PATCH] support arithmetic operators for both reals and integers
should be simplified but fixes tests for now
---
.../java/de/tla2b/analysis/TypeChecker.java | 41 ++++++++++++++-----
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/de/tla2b/analysis/TypeChecker.java b/src/main/java/de/tla2b/analysis/TypeChecker.java
index d32b67a..82c94f4 100644
--- a/src/main/java/de/tla2b/analysis/TypeChecker.java
+++ b/src/main/java/de/tla2b/analysis/TypeChecker.java
@@ -1193,25 +1193,44 @@ public class TypeChecker extends BuiltInOPs implements ASTConstants, BBuildIns,
case B_OPCODE_div: // /
case B_OPCODE_mod: // % modulo
case B_OPCODE_exp: { // x hoch y, x^y
- try {
- RealType.getInstance().unify(expected);
- for (int i = 0; i < n.getArgs().length; i++) {
- visitExprOrOpArgNode(n.getArgs()[i], RealType.getInstance());
+ TLAType type;
+ // TODO: Simplify
+ if (expected instanceof RealType) {
+ try {
+ RealType.getInstance().unify(expected);
+ type = RealType.getInstance();
+ } catch (UnificationException e) {
+ throw new TypeErrorException(String.format("Expected %s, found REAL at '%s',%n%s", expected,
+ n.getOperator().getName(), n.getLocation()));
}
- return RealType.getInstance();
- } catch (UnificationException e) {
+ } else if (expected instanceof IntType) {
try {
IntType.getInstance().unify(expected);
- for (int i = 0; i < n.getArgs().length; i++) {
- visitExprOrOpArgNode(n.getArgs()[i], IntType.getInstance());
- }
- return IntType.getInstance();
- } catch (UnificationException e2) {
+ type = IntType.getInstance();
+ } catch (UnificationException ue) {
throw new TypeErrorException(String.format("Expected %s, found INTEGER at '%s',%n%s", expected,
n.getOperator().getName(), n.getLocation()));
}
+ } else if (expected instanceof UntypedType) {
+ IntType.getInstance().unify(expected);
+ type = IntType.getInstance();
+ try {
+ for (int i = 0; i < n.getArgs().length; i++) {
+ visitExprOrOpArgNode(n.getArgs()[i], type);
+ }
+ } catch (TypeErrorException e) {
+ RealType.getInstance().unify(expected);
+ type = RealType.getInstance();
+ }
+ } else {
+ throw new TypeErrorException(String.format("Expected %s, found INTEGER at '%s',%n%s", expected,
+ n.getOperator().getName(), n.getLocation()));
+ }
+ for (int i = 0; i < n.getArgs().length; i++) {
+ visitExprOrOpArgNode(n.getArgs()[i], type);
}
+ return type;
}
case B_OPCODE_dotdot: // ..
--
GitLab