summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2006-10-31 15:23:40 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2006-10-31 15:23:40 (GMT)
commit20c1156972864f916da62a217137e346eb93ac79 (patch)
treef3563690ba220879dc87b79bb6a46ffb7852c33a
parent794852278f00d531ee4a0f3a95c2a993e9ffe33d (diff)
downloadtcl-20c1156972864f916da62a217137e346eb93ac79.zip
tcl-20c1156972864f916da62a217137e346eb93ac79.tar.gz
tcl-20c1156972864f916da62a217137e346eb93ac79.tar.bz2
* generic/tclBasic.c:
* generic/tcl.h: * generic/tclInterp.c: * generic/tclNamesp.c: removing the flag bit TCL_EVAL_NOREWRITE, the last remnant of the callObjc/v fiasco. It is not needed, as it is now always set and checked or'ed with TCL_EVAL_INVOKE.
-rw-r--r--ChangeLog9
-rw-r--r--generic/tcl.h5
-rw-r--r--generic/tclBasic.c4
-rw-r--r--generic/tclInterp.c8
-rw-r--r--generic/tclNamesp.c4
5 files changed, 17 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 39e286d..fa1bbe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-31 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclBasic.c:
+ * generic/tcl.h:
+ * generic/tclInterp.c:
+ * generic/tclNamesp.c: removing the flag bit TCL_EVAL_NOREWRITE,
+ the last remnant of the callObjc/v fiasco. It is not needed, as it
+ is now always set and checked or'ed with TCL_EVAL_INVOKE.
+
2006-10-31 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/rules.vc: Fix for bug #1582769 - options conflict with VC2003.
diff --git a/generic/tcl.h b/generic/tcl.h
index c67cad7..cede805 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.225 2006/10/27 12:44:08 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.226 2006/10/31 15:23:40 msofer Exp $
*/
#ifndef _TCL
@@ -1067,14 +1067,11 @@ typedef struct Tcl_DString {
* o Cut out of error traces
* o Don't reset the flags controlling ensemble
* error message rewriting.
- * TCL_EVAL_NOREWRITE Do not update the interp's last call info;
- * used by the ensemble rewrite machinery
*/
#define TCL_NO_EVAL 0x10000
#define TCL_EVAL_GLOBAL 0x20000
#define TCL_EVAL_DIRECT 0x40000
#define TCL_EVAL_INVOKE 0x80000
-#define TCL_EVAL_NOREWRITE 0x100000
/*
* Special freeProc values that may be passed to Tcl_SetResult (see the man
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 194864b..2be44d3 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclBasic.c,v 1.207 2006/10/31 13:46:31 dkf Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.208 2006/10/31 15:23:41 msofer Exp $
*/
#include "tclInt.h"
@@ -3411,7 +3411,7 @@ TclEvalObjvInternal(
cmdPtr->refCount++;
iPtr->cmdCount++;
if (code == TCL_OK && traceCode == TCL_OK && !Tcl_LimitExceeded(interp)) {
- if (!(flags & (TCL_EVAL_INVOKE|TCL_EVAL_NOREWRITE)) &&
+ if (!(flags & TCL_EVAL_INVOKE) &&
(iPtr->ensembleRewrite.sourceObjs != NULL)) {
iPtr->ensembleRewrite.sourceObjs = NULL;
}
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 0156391..f4d14f5 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInterp.c,v 1.66 2006/10/26 17:22:17 msofer Exp $
+ * RCS: @(#) $Id: tclInterp.c,v 1.67 2006/10/31 15:23:41 msofer Exp $
*/
#include "tclInt.h"
@@ -1741,12 +1741,10 @@ AliasObjCmd(
if (targetInterp != interp) {
Tcl_Preserve((ClientData) targetInterp);
- result = Tcl_EvalObjv(targetInterp, cmdc, cmdv,
- TCL_EVAL_INVOKE|TCL_EVAL_NOREWRITE);
+ result = Tcl_EvalObjv(targetInterp, cmdc, cmdv, TCL_EVAL_INVOKE);
TclTransferResult(targetInterp, result, interp);
} else {
- result = Tcl_EvalObjv(targetInterp, cmdc, cmdv,
- TCL_EVAL_INVOKE|TCL_EVAL_NOREWRITE);
+ result = Tcl_EvalObjv(targetInterp, cmdc, cmdv, TCL_EVAL_INVOKE);
}
if (isRootEnsemble) {
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index fe4a3f8..bbb8a7b 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -22,7 +22,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclNamesp.c,v 1.112 2006/10/31 13:46:32 dkf Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.113 2006/10/31 15:23:41 msofer Exp $
*/
#include "tclInt.h"
@@ -6282,7 +6282,7 @@ NsEnsembleImplementationCmd(
memcpy(tempObjv, prefixObjv, sizeof(Tcl_Obj *) * prefixObjc);
memcpy(tempObjv+prefixObjc, objv+2, sizeof(Tcl_Obj *) * (objc-2));
result = Tcl_EvalObjv(interp, objc-2+prefixObjc, tempObjv,
- TCL_EVAL_INVOKE|TCL_EVAL_NOREWRITE);
+ TCL_EVAL_INVOKE);
Tcl_DecrRefCount(prefixObj);
TclStackFree(interp);
if (isRootEnsemble) {