Merge checking prop and explore state space operation

src/main/java/de/prob/voparser/VOTypeChecker.java

@@ -109,18 +109,21 @@ public class VOTypeChecker extends DepthFirstAdapter {
 			case RESET:
 				newAnimatorState = newAnimatorState.cons(AnimatorState.TRACE);
 				break;
+			case STATIC:
+				newAnimatorState = newAnimatorState.disjoin(AnimatorState.TRACE);
+				newAnimatorState = newAnimatorState.disjoin(AnimatorState.STATE_SPACE);
+				break;
 			case TRACE:
 				valid = newAnimatorState.contains(AnimatorState.TRACE);
 				break;
 			case STATE_SPACE:
 				valid = newAnimatorState.contains(AnimatorState.STATE_SPACE);
-				break;
-			case CHECKING_PROP:
 				newAnimatorState = newAnimatorState.disjoin(AnimatorState.TRACE);
+				newAnimatorState = newAnimatorState.disjoin(AnimatorState.STATE_SPACE);
 				break;
-			case EXPLORING_STATE_SPACE:
+			case EXPLORE:
+				valid = newAnimatorState.contains(AnimatorState.TRACE);
 				newAnimatorState = newAnimatorState.disjoin(AnimatorState.TRACE);
-				newAnimatorState = newAnimatorState.cons(AnimatorState.STATE_SPACE);
 				break;
 			default:
 				break;

src/main/java/de/prob/voparser/VTType.java

@@ -3,5 +3,5 @@ package de.prob.voparser;
 public enum VTType {
 	RELOAD, RESET, STATIC,
 	TRACE, STATE_SPACE,
-	CHECKING_PROP, EXPLORING_STATE_SPACE
+	EXPLORE
 }

src/test/java/de/prob/voparser/VOScopingTest.java

@@ -13,7 +13,7 @@ public class VOScopingTest {
 	@Test
 	public void testAtomic() throws VOParseException {
 		VOParser voParser = new VOParser();
-		voParser.registerTask("MC1", VTType.CHECKING_PROP);
+		voParser.registerTask("MC1", VTType.EXPLORE);
 		voParser.scopeCheck("MC1");
 	}
 
@@ -61,7 +61,7 @@ public class VOScopingTest {
 	@Test
 	public void testDot() throws VOParseException {
 		VOParser voParser = new VOParser();
-		voParser.registerTask("MC1.1", VTType.CHECKING_PROP);
+		voParser.registerTask("MC1.1", VTType.EXPLORE);
 		voParser.scopeCheck("MC1.1");
 	}
 

src/test/java/de/prob/voparser/VOTypeCheckingTest.java

@@ -13,7 +13,7 @@ public class VOTypeCheckingTest {
 	@Test
 	public void testAtomic() throws VOParseException {
 		VOParser voParser = new VOParser();
-		voParser.registerTask("MC1", VTType.CHECKING_PROP);
+		voParser.registerTask("MC1", VTType.EXPLORE);
 		voParser.typeCheck("MC1");
 	}
 
@@ -21,7 +21,7 @@ public class VOTypeCheckingTest {
 	public void testSequential() throws VOParseException {
 		VOParser voParser = new VOParser();
 		voParser.registerTask("MC1", VTType.TRACE);
-		voParser.registerTask("MC2", VTType.CHECKING_PROP);
+		voParser.registerTask("MC2", VTType.EXPLORE);
 		voParser.typeCheck("MC1;MC2");
 	}