From 18db32ddf51b3371bfeba77bab715f372c3add09 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 27 Apr 2023 10:46:14 +0200
Subject: [PATCH] Remove Ast2String which is incompatible with newer parser
versions
Was only used by debug prints that were all commented out.
---
src/main/java/de/tlc4b/Translator.java | 17 +----
src/main/java/de/tlc4b/util/Ast2String.java | 67 -------------------
.../tlc4b/typechecking/TestTypechecker.java | 5 +-
src/test/java/de/tlc4b/util/TestUtil.java | 18 ++---
4 files changed, 7 insertions(+), 100 deletions(-)
delete mode 100644 src/main/java/de/tlc4b/util/Ast2String.java
diff --git a/src/main/java/de/tlc4b/Translator.java b/src/main/java/de/tlc4b/Translator.java
index 62e7bc5..c177a4b 100644
--- a/src/main/java/de/tlc4b/Translator.java
+++ b/src/main/java/de/tlc4b/Translator.java
@@ -15,11 +15,11 @@ import de.tlc4b.analysis.ConstantsEliminator;
import de.tlc4b.analysis.ConstantsEvaluator;
import de.tlc4b.analysis.DefinitionsAnalyser;
import de.tlc4b.analysis.MachineContext;
-import de.tlc4b.analysis.UnsupportedConstructsFinder;
import de.tlc4b.analysis.PrecedenceCollector;
import de.tlc4b.analysis.PrimedNodesMarker;
import de.tlc4b.analysis.Renamer;
import de.tlc4b.analysis.Typechecker;
+import de.tlc4b.analysis.UnsupportedConstructsFinder;
import de.tlc4b.analysis.UsedStandardModules;
import de.tlc4b.analysis.UsedStandardModules.STANDARD_MODULES;
import de.tlc4b.analysis.transformation.DefinitionsEliminator;
@@ -32,7 +32,6 @@ import de.tlc4b.exceptions.TLC4BIOException;
import de.tlc4b.prettyprint.TLAPrinter;
import de.tlc4b.tla.Generator;
import de.tlc4b.tlc.TLCOutputInfo;
-import de.tlc4b.util.Ast2String;
public class Translator {
@@ -52,9 +51,6 @@ public class Translator {
this.machineString = machineString;
BParser parser = new BParser("Testing");
start = parser.parse(machineString, false);
- final Ast2String ast2String2 = new Ast2String();
- start.apply(ast2String2);
- // System.out.println(ast2String2.toString());
}
public Translator(String machineString, String ltlFormula) throws BCompoundException {
@@ -62,9 +58,6 @@ public class Translator {
this.ltlFormula = ltlFormula;
BParser parser = new BParser("Testing");
start = parser.parse(machineString, false);
- final Ast2String ast2String2 = new Ast2String();
- start.apply(ast2String2);
- // System.out.println(ast2String2.toString());
}
public Translator(String machineName, File machineFile, String ltlFormula, String constantSetup)
@@ -99,15 +92,7 @@ public class Translator {
APredicateParseUnit parseUnit = (APredicateParseUnit) start2.getPParseUnit();
this.constantsSetup = parseUnit.getPredicate();
-
- final Ast2String ast2String2 = new Ast2String();
- start2.apply(ast2String2);
- // System.out.println(ast2String2.toString());
}
-
- final Ast2String ast2String2 = new Ast2String();
- start.apply(ast2String2);
- // System.out.println(ast2String2.toString());
}
public void translate() {
diff --git a/src/main/java/de/tlc4b/util/Ast2String.java b/src/main/java/de/tlc4b/util/Ast2String.java
deleted file mode 100644
index d64c7de..0000000
--- a/src/main/java/de/tlc4b/util/Ast2String.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package de.tlc4b.util;
-
-import de.be4.classicalb.core.parser.analysis.ExtendedDFAdapter;
-import de.be4.classicalb.core.parser.node.Node;
-import de.be4.classicalb.core.parser.node.Start;
-import de.be4.classicalb.core.parser.node.Token;
-
-public class Ast2String extends ExtendedDFAdapter {
- private final StringBuilder builder = new StringBuilder();
-
- @Override
- public String toString() {
- return builder.toString();
- }
-
- @Override
- public void defaultIn(final Node node) {
- super.defaultIn(node);
- builder.append(node.getClass().getSimpleName());
- builder.append("(");
- }
-
- @Override
- public void defaultCase(final Node node) {
- super.defaultCase(node);
- if (node instanceof Token) {
- builder.append(((Token) node).getText());
- } else {
- builder.append(node.toString());
- }
-
- }
-
- @Override
- public void defaultOut(final Node node) {
- super.defaultOut(node);
- builder.append(")");
- }
-
- @Override
- public void beginList(final Node parent) {
- builder.append('[');
- }
-
- @Override
- public void betweenListElements(final Node parent) {
- builder.append(',');
- }
-
- @Override
- public void endList(final Node parent) {
- builder.append(']');
- }
-
- @Override
- public void betweenChildren(final Node parent) {
- builder.append(',');
- }
-
- @Override
- public void caseStart(final Start node) {
- inStart(node);
- node.getPParseUnit().apply(this);
- node.getEOF().apply(this);
- outStart(node);
- }
-}
diff --git a/src/test/java/de/tlc4b/typechecking/TestTypechecker.java b/src/test/java/de/tlc4b/typechecking/TestTypechecker.java
index 708051e..cab56aa 100644
--- a/src/test/java/de/tlc4b/typechecking/TestTypechecker.java
+++ b/src/test/java/de/tlc4b/typechecking/TestTypechecker.java
@@ -9,7 +9,6 @@ import de.be4.classicalb.core.parser.node.Start;
import de.tlc4b.analysis.MachineContext;
import de.tlc4b.analysis.Typechecker;
import de.tlc4b.btypes.BType;
-import de.tlc4b.util.Ast2String;
public class TestTypechecker {
@@ -29,9 +28,7 @@ public class TestTypechecker {
} catch (BCompoundException e) {
throw e.getFirstException();
}
- final Ast2String ast2String2 = new Ast2String();
- start.apply(ast2String2);
- // System.out.println(ast2String2.toString());
+
MachineContext c = new MachineContext(null, start);
c.analyseMachine();
Typechecker t = new Typechecker(c);
diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java
index 21fb2d4..f3aa5dc 100644
--- a/src/test/java/de/tlc4b/util/TestUtil.java
+++ b/src/test/java/de/tlc4b/util/TestUtil.java
@@ -1,8 +1,5 @@
package de.tlc4b.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -12,16 +9,19 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import util.ToolIO;
import de.be4.classicalb.core.parser.exceptions.BCompoundException;
import de.be4.classicalb.core.parser.exceptions.BException;
-import de.be4.classicalb.core.parser.node.Start;
import de.tla2b.exceptions.TLA2BException;
import de.tlc4b.TLC4B;
import de.tlc4b.TLC4BGlobals;
import de.tlc4b.Translator;
import de.tlc4b.tlc.TLCResults.TLCResult;
+import util.ToolIO;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class TestUtil {
public static void compare(final String expectedModule, final String machineString) throws Exception {
@@ -94,17 +94,10 @@ public class TestUtil {
// b2tlaTranslator.getModuleString(), null);
}
- public static void print(Start start) {
- final Ast2String ast2String2 = new Ast2String();
- start.apply(ast2String2);
- System.out.println(ast2String2.toString());
- }
-
public static void compareEqualsConfig(String expectedModule, String expectedConfig, String machine)
throws Exception {
Translator b2tlaTranslator = new Translator(machine);
b2tlaTranslator.translate();
- // print(b2tlaTranslator.getStart());
System.out.println(b2tlaTranslator.getModuleString());
System.out.println(b2tlaTranslator.getConfigString());
@@ -121,7 +114,6 @@ public class TestUtil {
throws Exception {
Translator b2tlaTranslator = new Translator(machine);
b2tlaTranslator.translate();
- // print(b2tlaTranslator.getStart());
System.out.println(b2tlaTranslator.getModuleString());
System.out.println(b2tlaTranslator.getConfigString());
--
GitLab