From b2c4b50d8ca158579e1ed3e25e7a4c90790d8b6d Mon Sep 17 00:00:00 2001 From: Michael Hohn Date: Tue, 11 Mar 2008 15:41:20 -0700 Subject: [PATCH] Change 'values written by' to use the original Program's environment. --- l3gui/widgets.py | 8 ++++++-- l3lang/ast.py | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/l3gui/widgets.py b/l3gui/widgets.py index f312049..e39db24 100644 --- a/l3gui/widgets.py +++ b/l3gui/widgets.py @@ -4506,7 +4506,9 @@ def show_written_names(self): ma = ast.Matcher() view, view_id = ast.viewList(aList([])).setup( - empty_parent(), self.w_.state_.def_env, self.w_.state_.storage) + empty_parent(), + self._l3tree.eval_env() or self.w_.state_.def_env, + self.w_.state_.storage) for nd in self._l3tree.top_down_truncate([ast.Function, ast.Call]): # Several choices exist concerning display of nested @@ -4554,7 +4556,9 @@ def show_read_names(self): # Prepare display list. view, view_id = ast.viewList(aList([])).setup( - empty_parent(), self.w_.state_.def_env, self.w_.state_.storage) + empty_parent(), + self._l3tree.eval_env() or self.w_.state_.def_env, + self.w_.state_.storage) for nd in self._l3tree.top_down_truncate([]): if ma.match(nd, Set(Marker('lhs'), Marker('rhs')) ): diff --git a/l3lang/ast.py b/l3lang/ast.py index 1e940b5..35dd98f 100644 --- a/l3lang/ast.py +++ b/l3lang/ast.py @@ -555,6 +555,10 @@ def get_label(self): return self.p_label Program.get_label = get_label +def eval_env(self): + return getattr(self, "_eval_env", None) +Program.eval_env = eval_env + # -- 2.11.4.GIT