Skip to content

Fix graph for exit actions with specific trigger #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fixerdude wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix graph for exit actions with specific trigger #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a541a63
Fix graph for exit actions with specific trigger
fixerdude Jan 15, 2025
0062325
Merge branch 'qmuntal:master' into master
fixerdude Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions graph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ func (g *graph) formatActions(sr *stateRepresentation) string {
}
}
for _, act := range sr.ExitActions {
es = append(es, fmt.Sprintf("exit / %s", esc(act.Description.String(), false)))
if act.Trigger == nil {
es = append(es, fmt.Sprintf("exit / %s", esc(act.Description.String(), false)))
}
}
return strings.Join(es, "\\n")
}
Expand Down Expand Up @@ -106,7 +108,7 @@ func (g *graph) formatOneState(sb *strings.Builder, sr *stateRepresentation, lev
}
}

func (g *graph) getEntryActions(ab []actionBehaviour, t Trigger) []string {
func (g *graph) getActions(ab []actionBehaviour, t Trigger) []string {
var actions []string
for _, ea := range ab {
if ea.Trigger != nil && *ea.Trigger == t {
Expand Down Expand Up @@ -145,7 +147,7 @@ func (g *graph) formatAllStateTransitions(sb *strings.Builder, sm *StateMachine,
transition.ignored = append(transition.ignored, formatOneTransition(t.Trigger, nil, t.Guard))
lines[ln] = transition
case *reentryTriggerBehaviour:
actions := g.getEntryActions(sr.EntryActions, t.Trigger)
actions := g.getActions(sr.EntryActions, t.Trigger)
ln := line{sr.State, t.Destination}
if _, ok := lines[ln]; !ok {
order = append(order, ln)
Expand All @@ -154,7 +156,7 @@ func (g *graph) formatAllStateTransitions(sb *strings.Builder, sm *StateMachine,
transition.reentry = append(transition.reentry, formatOneTransition(t.Trigger, actions, t.Guard))
lines[ln] = transition
case *internalTriggerBehaviour:
actions := g.getEntryActions(sr.EntryActions, t.Trigger)
actions := g.getActions(sr.EntryActions, t.Trigger)
ln := line{sr.State, sr.State}
if _, ok := lines[ln]; !ok {
order = append(order, ln)
Expand All @@ -167,10 +169,12 @@ func (g *graph) formatAllStateTransitions(sb *strings.Builder, sm *StateMachine,
if src == nil {
continue
}
dest := sm.stateConfig[t.Destination]
var actions []string
actions = g.getActions(sr.ExitActions, t.Trigger)
dest := sm.stateConfig[t.Destination]
if dest != nil {
actions = g.getEntryActions(dest.EntryActions, t.Trigger)
entryActions := g.getActions(dest.EntryActions, t.Trigger)
actions = append(actions, entryActions...)
}
var destState State
if dest == nil {
Expand Down
4 changes: 2 additions & 2 deletions testdata/golden/phoneCall.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ digraph {
subgraph cluster_Connected {
label="Substates of\nConnected";
style="dashed";
OnHold [label="OnHold|exit / func6"];
OnHold [label="OnHold"];
}
OffHook [label="OffHook"];
Ringing [label="Ringing"];
Connected -> OffHook [label="LeftMessage"];
Connected -> Connected [label="MuteMicrophone\nSetVolume\nUnmuteMicrophone"];
Connected -> OnHold [label="PlacedOnHold"];
OffHook -> Ringing [label="CallDialed / func1"];
OnHold -> PhoneDestroyed [label="PhoneHurledAgainstWall"];
OnHold -> PhoneDestroyed [label="PhoneHurledAgainstWall / func6"];
OnHold -> Connected [label="TakenOffHold"];
Ringing -> Connected [label="CallConnected"];
init [label="", shape=point];
Expand Down
Loading