Telephone example and transformation to dot.

statemachine/build.gradle

@@ -46,9 +46,6 @@ dependencies {
 run {
     mainClassName = 'de.tudresden.inf.st.statemachine.Main'
     standardInput = System.in
-    if (project.hasProperty("appArgs")) {
-        args Eval.me(appArgs)
-    }
 }
 
 buildscript {

statemachine/src/main/jastadd/Analysis.jrag

 aspect Analysis {
-  syn Map<String, State> StateMachine.stateMap() {
-    Map<String, State> map = new HashMap<>();
-    for (State s : states()) {
-      map.put(s.getLabel(), s);
+  syn Set<State> State.reachableWithin(int n) { //circular [new HashSet<>()]
+    if (n == 0) {
+      return new HashSet<>();
     }
-    return map;
+    Set<State> result = new HashSet<>();
+    for (State succ : successors()) {
+      result.add(succ);
+      result.addAll(succ.reachableWithin(n - 1));
     }
-
-  syn Map<String, Transition> StateMachine.transitionMap() {
-    Map<String, Transition> map = new HashMap<>();
-    for (Transition t : transitions()) {
-      map.put(t.getLabel(), t);
-    }
-    return map;
+    return result;
   }
 
-  syn StateMachine ASTNode.root();
-  eq StateMachine.root() = this;
-  eq ASTNode.root() = getParent().root();
+  public void StateMachine.printSomeAnalysis() {
+    // analysis
+    Set<Set<State>> sccs = this.SCC();
+    System.out.println("SCCs found:");
+    for (Set<State> scc : sccs) {
+      System.out.println(scc);
+    }
 
-  refine RefResolverStubs eq ASTNode.globallyResolveStateByToken(String id) {
-    return root().stateMap().get(id);
+    for (State s : this.states()) {
+      System.out.println(s + ".successors() = " + s.successors());
     }
 
-  refine RefResolverStubs eq ASTNode.globallyResolveTransitionByToken(String id) {
-    return root().transitionMap().get(id);
+    Set<State> current;
+    int lastSize = 0;
+    for (int i = 1; i < this.states().size() + 1; i++) {
+      current = this.getInitial().reachableWithin(i);
+      if (current.size() == lastSize) {
+        break;
+      }
+      System.out.println(this.getInitial() + ".reachableWithin(" + i + ") = " + current);
+      lastSize = current.size();
     }
 
-  syn boolean State.isInitial() = root().getInitial().equals(this);
-  syn boolean State.isFinal() = root().getFinalList().contains(this);
+    for (State finalState : this.getFinalList()) {
+      System.out.println("initial state "+ this.getInitial() + " can reach " + finalState + " = " +
+          this.getInitial().reachableWithin(this.states().size()).contains(finalState));
+    }
+  }
 }

statemachine/src/main/jastadd/NameAnalysis.jrag

+aspect NameAnalysis {
+  syn Map<String, State> StateMachine.stateMap() {
+    Map<String, State> map = new HashMap<>();
+    for (State s : states()) {
+      map.put(s.getLabel(), s);
+    }
+    return map;
+  }
+
+  syn Map<String, Transition> StateMachine.transitionMap() {
+    Map<String, Transition> map = new HashMap<>();
+    for (Transition t : transitions()) {
+      map.put(t.getLabel(), t);
+    }
+    return map;
+  }
+
+  refine RefResolverStubs eq ASTNode.globallyResolveStateByToken(String id) {
+    return root().stateMap().get(id);
+  }
+
+  refine RefResolverStubs eq ASTNode.globallyResolveTransitionByToken(String id) {
+    return root().transitionMap().get(id);
+  }
+}

statemachine/src/main/jastadd/Navigation.jrag

@@ -31,4 +31,13 @@ aspect Navigation {
     }
     return transitions;
   }
+
+  syn StateMachine ASTNode.root();
+  eq StateMachine.root() = this;
+  eq ASTNode.root() = getParent().root();
+
+  syn boolean State.isInitial() = root().getInitial().equals(this);
+  syn boolean State.isFinal() = root().getFinalList().contains(this);
+
+  syn Collection<State> State.successors() = getOutgoingList().stream().map(Transition::getTo).collect(Collectors.toList());
 }

statemachine/src/main/jastadd/SMtoDotG.jrag

+aspect StateMachinetoDotG {
+  syn String StateMachine.toDot() {
+    StringBuilder b = new StringBuilder();
+    b.append("strict digraph cycles {\n");
+
+    for (State from : states()) {
+      b.append("  ").append(from.getLabel()).append("[label=\"").append(from.getLabel()).append("\"];\n");
+
+      for (Transition out : from.getOutgoingList()) {
+        b.append("  ").append(from.getLabel()).append(" -> ").append(out.getTo().getLabel())
+         .append("[label=\"").append(out.getLabel()).append("\"];\n");
+      }
+    }
+
+    b.append("}\n");
+    return b.toString();
+  }
+}

statemachine/src/main/java/de/tudresden/inf/st/statemachine/Main.java

 package de.tudresden.inf.st.statemachine;
 
 import beaver.Parser;
+import de.tudresden.inf.st.statemachine.jastadd.model.DotGraph;
 import de.tudresden.inf.st.statemachine.jastadd.model.State;
 import de.tudresden.inf.st.statemachine.jastadd.model.StateMachine;
 import de.tudresden.inf.st.statemachine.jastadd.model.Transition;
@@ -21,7 +22,7 @@ public class Main {
 			//  ^            |
 			//  \            /
 			//  `---- 2 ----*
-			StateMachine statemachine = new StateMachine();
+			StateMachine stateMachine = new StateMachine();
 			State start = new State();
 			start.setLabel("S");
 			State stateB = new State();
@@ -40,24 +41,26 @@ public class Main {
 			t2.setTo(start);
 			t3.setFrom(stateB);
 			t3.setTo(end);
-			statemachine.addElement(start);
-			statemachine.addElement(stateB);
-			statemachine.addElement(end);
-			statemachine.setInitial(start);
-			statemachine.addFinal(end);
+			stateMachine.addElement(start);
+			stateMachine.addElement(stateB);
+			stateMachine.addElement(end);
+			stateMachine.addElement(t1);
+			stateMachine.addElement(t2);
+			stateMachine.addElement(t3);
+			stateMachine.setInitial(start);
+			stateMachine.addFinal(end);
 
-			// reachability analysis
-			Set<Set<State>> sccs = statemachine.SCC();
-			System.out.println("SCCs found:");
-			for (Set<State> scc : sccs) {
-				System.out.println(scc);
-			}
-			DrAST_root_node = statemachine;
+			System.out.println(stateMachine.prettyPrint());
+			stateMachine.printSomeAnalysis();
+			DrAST_root_node = stateMachine;
 		} else {
 			// load the file given as first argument
 			try {
 				StateMachine stateMachine = ParserUtils.load(Paths.get(args[0]));
 				stateMachine.treeResolveAll();
+        stateMachine.printSomeAnalysis();
+				System.out.println("> toDotGraph():");
+				System.out.println(stateMachine.toDot());
 				DrAST_root_node = stateMachine;
 			} catch (IOException | Parser.Exception e) {
 				e.printStackTrace();

statemachine/src/test/resources/telephone.sm

+initial state start;
+state onHook;
+state dialing;
+state ringing;
+state waitingForConnection;
+state communicating;
+state onHold;
+final state end;
+
+trans start -> onHook : start ;
+trans onHook -> dialing : startDialing ;
+trans dialing -> onHook : hangUp ;
+trans onHook -> ringing : incomingCall ;
+trans ringing -> onHook : otherPartyHangUp ;
+trans dialing -> waitingForConnection : completeNumber ;
+trans waitingForConnection -> onHook : hangUp ;
+trans waitingForConnection -> onHook : timeOut ;
+trans waitingForConnection -> communicating : otherPartyPickUp ;
+trans ringing -> communicating : pickUp ;
+trans communicating -> onHook : hangUp ;
+trans communicating -> onHold : putOnHold ;
+trans onHold -> communicating : takeOffHold ;
+trans communicating -> end : otherPartyHangUp ;
+trans onHold -> end : otherPartyHangUp ;
+trans onHold -> end : hangUp ;