summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2003-11-20 18:37:54 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2003-11-20 18:37:54 (GMT)
commit3f9b96c8e427f362983ca93d6ab6f65752376f64 (patch)
tree830ad30dc35000e54bf2df191e6dbbcfeee57a3a
parent17d6b9dd7f32888e6f4e99ccdbd57f86c0e7b54e (diff)
downloadtcl-3f9b96c8e427f362983ca93d6ab6f65752376f64.zip
tcl-3f9b96c8e427f362983ca93d6ab6f65752376f64.tar.gz
tcl-3f9b96c8e427f362983ca93d6ab6f65752376f64.tar.bz2
* generic/tclVar.c: fix flag bit collision between
LOOKUP_FOR_UPVAR and TCL_PARSE_PART1 (deprecated) [Bug 835020]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclVar.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e0f1dcf..b5cc467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-20 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclVar.c: fix flag bit collision between
+ LOOKUP_FOR_UPVAR and TCL_PARSE_PART1 (deprecated) [Bug 835020]
+
2003-11-19 Don Porter <dgp@users.sourceforge.net>
* tests/compile.test (compile-16.22.0): Improved test for the
diff --git a/generic/tclVar.c b/generic/tclVar.c
index bb3d38e..5b11f97 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -15,7 +15,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.75 2003/07/03 23:16:25 dkf Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.76 2003/11/20 18:37:55 msofer Exp $
*/
#include "tclInt.h"
@@ -603,8 +603,12 @@ TclObjLookupVar(interp, part1Ptr, part2, flags, msg, createPart1, createPart2,
* - Bug #696893 - variable is either proc-local or in the current
* namespace; never follow the second (global) resolution path
* - Bug #631741 - do not use special namespace or interp resolvers
+ *
+ * It should also not collide with the (deprecated) TCL_PARSE_PART1 flag
+ * (Bug #835020)
*/
-#define LOOKUP_FOR_UPVAR 0x400
+
+#define LOOKUP_FOR_UPVAR 0x40000
/*
*----------------------------------------------------------------------