From 2f8721230bc86b702c91a8126094ab1c4dda2e87 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Wed, 24 Jul 2019 13:55:40 +0200
Subject: [PATCH] remove debug output in SM, make backlink non-optional in SM
---
statemachine/src/main/jastadd/mapping/SMtoDG.jrag | 8 +-------
statemachine/src/main/jastadd/mapping/SMtoDG.relast | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/statemachine/src/main/jastadd/mapping/SMtoDG.jrag b/statemachine/src/main/jastadd/mapping/SMtoDG.jrag
index 32a0555..cab48b1 100644
--- a/statemachine/src/main/jastadd/mapping/SMtoDG.jrag
+++ b/statemachine/src/main/jastadd/mapping/SMtoDG.jrag
@@ -1,7 +1,6 @@
aspect SMtoDG {
syn DependencyGraph StateMachine.dependencyGraph() {
DependencyGraph dg = new DependencyGraph();
-
dg.setStateMachine(this);
Map<State,Component> componentMap = new HashMap<>();
@@ -15,13 +14,8 @@ aspect SMtoDG {
for (Transition t: transitions()) {
Component to = componentMap.get(t.getTo());
Component from = componentMap.get(t.getFrom());
+ from.addTo(to);
- //if (!from.getToList().contains(to)) {
- logger.info("adding {} -> {}", from, to);
-
- from.addTo(to);
-
- //}
}
return dg;
}
diff --git a/statemachine/src/main/jastadd/mapping/SMtoDG.relast b/statemachine/src/main/jastadd/mapping/SMtoDG.relast
index 7d95fca..8502832 100644
--- a/statemachine/src/main/jastadd/mapping/SMtoDG.relast
+++ b/statemachine/src/main/jastadd/mapping/SMtoDG.relast
@@ -1,2 +1,2 @@
+rel DependencyGraph.StateMachine -> StateMachine;
rel Component.State -> State;
-rel DependencyGraph.StateMachine? -> StateMachine;
--
GitLab