From 2efdc538b9f8bd5d53fe38c26db1df0b19e2ede5 Mon Sep 17 00:00:00 2001 From: Miguel Sofer Date: Mon, 27 Sep 2010 17:36:47 +0000 Subject: * generic/tclVar.c: use the macro HasLocalVars everywhere --- ChangeLog | 4 ++++ generic/tclVar.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7ef912..bb98176 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-09-26 Miguel Sofer + * generic/tclVar.c: use the macro HasLocalVars everywhere + +2010-09-26 Miguel Sofer + * generic/tclOOMethod.c (ProcedureMethodVarResolver): avoid code duplication, let the runtime var resolver call the compiled var resolver. diff --git a/generic/tclVar.c b/generic/tclVar.c index 9cc2ec6..3370f9d 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclVar.c,v 1.204 2010/09/22 00:57:11 hobbs Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.205 2010/09/27 17:36:48 msofer Exp $ */ #include "tclInt.h" @@ -5998,8 +5998,7 @@ TclInfoVarsCmd( listPtr = Tcl_NewListObj(0, NULL); - if (!(iPtr->varFramePtr->isProcCallFrame & FRAME_IS_PROC) - || specificNsInPattern) { + if (!HasLocalVars(iPtr->varFramePtr) || specificNsInPattern) { /* * There is no frame pointer, the frame pointer was pushed only to * activate a namespace, or we are in a procedure call frame but a @@ -6235,7 +6234,7 @@ TclInfoLocalsCmd( return TCL_ERROR; } - if (!(iPtr->varFramePtr->isProcCallFrame & FRAME_IS_PROC)) { + if (!HasLocalVars(iPtr->varFramePtr)) { return TCL_OK; } -- cgit v0.12