From 4a6abbe3bac2a66d584cb1e7e07b1db27cd99772 Mon Sep 17 00:00:00 2001
From: hansen <dominik_hansen@web.de>
Date: Wed, 14 May 2014 10:27:32 +0200
Subject: [PATCH] Fixed instance bug
---
src/main/java/de/tla2b/TLA2B.java | 2 +-
.../de/tla2b/analysis/InstanceTransformation.java | 2 +-
src/main/java/de/tla2b/config/ModuleOverrider.java | 11 +++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/tla2b/TLA2B.java b/src/main/java/de/tla2b/TLA2B.java
index cd5b121..f411cf0 100644
--- a/src/main/java/de/tla2b/TLA2B.java
+++ b/src/main/java/de/tla2b/TLA2B.java
@@ -62,7 +62,7 @@ public class TLA2B implements TranslationGlobals {
System.err.println(e.getMessage());
System.exit(-1);
}
- //translator.createMachineFile();
+ translator.createMachineFile();
translator.createProbFile();
}
diff --git a/src/main/java/de/tla2b/analysis/InstanceTransformation.java b/src/main/java/de/tla2b/analysis/InstanceTransformation.java
index 9fe8a1b..a384888 100644
--- a/src/main/java/de/tla2b/analysis/InstanceTransformation.java
+++ b/src/main/java/de/tla2b/analysis/InstanceTransformation.java
@@ -107,7 +107,7 @@ public class InstanceTransformation extends BuiltInOPs implements ASTConstants {
case StringKind: {
StringNode str = (StringNode) n;
- return new StringNode(str.getTreeNode(), true);
+ return new StringNode(str.getTreeNode(), false);
}
case SubstInKind: {
diff --git a/src/main/java/de/tla2b/config/ModuleOverrider.java b/src/main/java/de/tla2b/config/ModuleOverrider.java
index b90e218..d3a95f7 100644
--- a/src/main/java/de/tla2b/config/ModuleOverrider.java
+++ b/src/main/java/de/tla2b/config/ModuleOverrider.java
@@ -177,13 +177,16 @@ public class ModuleOverrider extends BuiltInOPs implements ASTConstants {
case BuiltInKind:// Buildin operator can not be overridden by in the
// configuration file
ExprNode[] ins = n.getBdedQuantBounds();
- for (int i = 0; i < ins.length; i++) {
+ if(ins != null){
+ for (int i = 0; i < ins.length; i++) {
- OpApplNode res = visitExprOrOpArgNode(ins[i]);
- if (res != null) {
- ins[i] = res;
+ OpApplNode res = visitExprOrOpArgNode(ins[i]);
+ if (res != null) {
+ ins[i] = res;
+ }
}
}
+
break;
case UserDefinedOpKind: {
--
GitLab