diff --git a/phasectrl.py b/phasectrl.py index 332ff41..b7a1ac8 100644 --- a/phasectrl.py +++ b/phasectrl.py @@ -25,9 +25,9 @@ def load_phase(json): return json.get(v, '#t') return Phase( json['name'], json['text'], - onexit=fallback('on_exit'), - onload=fallback('on_load'), - nextcond=fallback('exit_condition')) + onexit=fallback('onexit'), + onload=fallback('onload'), + nextcond=fallback('nextcond')) def load_recipe(json): return Recipe( @@ -259,6 +259,7 @@ class Phase(): # self.envdata = {} def satisfied_p(self, env): + print('cond', self.nextcond) return safe_eval(self.nextcond, env) def exit(self, env):