From f8c14fe6c9af5d39c3527870b74b1d28c8ca1d93 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sun, 1 Dec 2019 21:56:25 +0100
Subject: [PATCH] cleanup
---
.../src/main/jastadd/ConnectedComponents.jrag | 30 -------------------
.../src/main/jastadd/NameAnalysis.jrag | 1 +
.../src/main/jastadd/ConnectedComponents.jrag | 30 -------------------
.../src/main/jastadd/NameAnalysis.jrag | 1 +
4 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/statemachine.solution/src/main/jastadd/ConnectedComponents.jrag b/statemachine.solution/src/main/jastadd/ConnectedComponents.jrag
index 406e5f5..1637d45 100644
--- a/statemachine.solution/src/main/jastadd/ConnectedComponents.jrag
+++ b/statemachine.solution/src/main/jastadd/ConnectedComponents.jrag
@@ -1,34 +1,4 @@
aspect ConnectedComponents {
-// syn Set<State> State.successors() circular [new HashSet<>()] {
-// Set<State> result = new HashSet<>();
-// for (Transition t : getOutgoingList()) {
-// State s = t.getTo();
-// result.add(s);
-// result.addAll(s.successors());
-// }
-// return result;
-// }
-
-// syn Set<State> State.predecessors() circular [new HashSet<>()] {
-// Set<State> result = new HashSet<>();
-// for (Transition t : getIncomingList()) {
-// State s = t.getFrom();
-// result.add(s);
-// result.addAll(s.predecessors());
-// }
-// return result;
-// }
-
-// syn boolean State.hasCycle() = successors().contains(this);
-
-// syn Set<State> State.SCC() {
-// Set<State> result = new HashSet<>(successors());
-// result.retainAll(predecessors());
-// return result;
-// }
-
-// coll HashSet<Set<State>> StateMachine.SCC() with add root StateMachine;
-// State contributes SCC() when SCC().size() > 0 to StateMachine.SCC();
/**
* Kosaraju's algorithm
diff --git a/statemachine.solution/src/main/jastadd/NameAnalysis.jrag b/statemachine.solution/src/main/jastadd/NameAnalysis.jrag
index a381d9c..ddd0f07 100644
--- a/statemachine.solution/src/main/jastadd/NameAnalysis.jrag
+++ b/statemachine.solution/src/main/jastadd/NameAnalysis.jrag
@@ -17,6 +17,7 @@ aspect NameAnalysis {
return null;
}
+ // required interface implementation for name analysis in parser
eq StateMachine.globallyResolveStateByToken(String id) = resolveState(id);
eq Element.globallyResolveStateByToken(String id) = containingStateMachine().resolveState(id);
diff --git a/statemachine.task/src/main/jastadd/ConnectedComponents.jrag b/statemachine.task/src/main/jastadd/ConnectedComponents.jrag
index 406e5f5..1637d45 100644
--- a/statemachine.task/src/main/jastadd/ConnectedComponents.jrag
+++ b/statemachine.task/src/main/jastadd/ConnectedComponents.jrag
@@ -1,34 +1,4 @@
aspect ConnectedComponents {
-// syn Set<State> State.successors() circular [new HashSet<>()] {
-// Set<State> result = new HashSet<>();
-// for (Transition t : getOutgoingList()) {
-// State s = t.getTo();
-// result.add(s);
-// result.addAll(s.successors());
-// }
-// return result;
-// }
-
-// syn Set<State> State.predecessors() circular [new HashSet<>()] {
-// Set<State> result = new HashSet<>();
-// for (Transition t : getIncomingList()) {
-// State s = t.getFrom();
-// result.add(s);
-// result.addAll(s.predecessors());
-// }
-// return result;
-// }
-
-// syn boolean State.hasCycle() = successors().contains(this);
-
-// syn Set<State> State.SCC() {
-// Set<State> result = new HashSet<>(successors());
-// result.retainAll(predecessors());
-// return result;
-// }
-
-// coll HashSet<Set<State>> StateMachine.SCC() with add root StateMachine;
-// State contributes SCC() when SCC().size() > 0 to StateMachine.SCC();
/**
* Kosaraju's algorithm
diff --git a/statemachine.task/src/main/jastadd/NameAnalysis.jrag b/statemachine.task/src/main/jastadd/NameAnalysis.jrag
index a381d9c..ddd0f07 100644
--- a/statemachine.task/src/main/jastadd/NameAnalysis.jrag
+++ b/statemachine.task/src/main/jastadd/NameAnalysis.jrag
@@ -17,6 +17,7 @@ aspect NameAnalysis {
return null;
}
+ // required interface implementation for name analysis in parser
eq StateMachine.globallyResolveStateByToken(String id) = resolveState(id);
eq Element.globallyResolveStateByToken(String id) = containingStateMachine().resolveState(id);
--
GitLab