Merge branch 'develop'

src/main/java/de/tlc4b/util/Ast2String.java

-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);
-	}
-}

src/test/java/de/tlc4b/analysis/DefinitionsTest.java

@@ -66,7 +66,7 @@ public class DefinitionsTest {
 				+ "END";
 		String expected = "---- MODULE test----\n"
 				+ "VARIABLES x \n"
-				+ "Invariant == x = 1\n"
+				+ "Invariant1 == x = 1\n"
 				+ "Init == x = 1\n"
 				+ "Next == 1 = 2 /\\ UNCHANGED <<x>>\n"
 				+ "======";

src/test/java/de/tlc4b/analysis/TypeRestrictionsTest.java

@@ -176,7 +176,7 @@ public class TypeRestrictionsTest {
 				+ "EXTENDS Naturals\n"
 				+ "VARIABLES x \n"
 				+ "k == 1 .. 4\n"
-				+ "Invariant == x = 1\n"
+				+ "Invariant1 == x = 1\n"
 				+ "Init == x = 1 \n"
 				+ "foo(a) == x' = a\n"
 				+ "Next == \\E a \\in k: foo(a) \n"
@@ -234,7 +234,7 @@ public class TypeRestrictionsTest {
 
 		String expected = "---- MODULE test ----\n"
 				+ "VARIABLES x \n"
-				+ "Invariant == x = 1\n"
+				+ "Invariant1 == x = 1\n"
 				+ "Init == x = 1 \n"
 				+ "foo(a) == (a = a)	/\\ x' = 3\n"
 				+ "Next == \\E a \\in {1} : foo(a) \n"