diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2019-02-21 16:42:16 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2019-02-21 16:42:16 +0100 |
| commit | 6e72c1b2b53e2290dc5cb7aa218c620a0ee979d4 (patch) | |
| tree | 086ffd7f5833f74dde206c925b7ec17186388ad0 /lib | |
| parent | 115274b46b61180ca1fea79511482fc704b552ca (diff) | |
PTA trace: Return transition objects, not just names
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/automata.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/automata.py b/lib/automata.py index e27aa91..640da96 100755 --- a/lib/automata.py +++ b/lib/automata.py @@ -88,19 +88,19 @@ class State: if with_arguments: if trans.argument_combination == 'cartesian': for args in itertools.product(*trans.argument_values): - yield [(trans.name, args)] + yield [(trans, args)] else: for args in zip(*trans.argument_values): - yield [(trans.name, args)] + yield [(trans, args)] else: - yield [trans.name] + yield [trans] else: for trans in self.outgoing_transitions.values(): for suffix in trans.destination.dfs(depth - 1, with_arguments = with_arguments): if with_arguments: if trans.argument_combination == 'cartesian': for args in itertools.product(*trans.argument_values): - new_suffix = [(trans.name, args)] + new_suffix = [(trans, args)] new_suffix.extend(suffix) yield new_suffix else: @@ -109,11 +109,11 @@ class State: else: arg_values = [tuple()] for args in arg_values: - new_suffix = [(trans.name, args)] + new_suffix = [(trans, args)] new_suffix.extend(suffix) yield new_suffix else: - new_suffix = [trans.name] + new_suffix = [trans] new_suffix.extend(suffix) yield new_suffix @@ -347,6 +347,9 @@ class PTA: destination = transition['destination'] arguments = list() argument_values = list() + is_interrupt = False + if transition['level'] == 'epilogue': + is_interrupt = True if type(destination) == list: destination = destination[0] for arg in transition['parameters']: @@ -354,7 +357,8 @@ class PTA: argument_values.append(arg['values']) for origin in transition['origins']: pta.add_transition(origin, destination, trans_name, - arguments = arguments, argument_values = argument_values) + arguments = arguments, argument_values = argument_values, + is_interrupt = is_interrupt) return pta |