summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--generic/tclCompile.h9
-rw-r--r--generic/tclInt.decls11
-rw-r--r--generic/tclIntDecls.h17
-rw-r--r--generic/tclStubInit.c4
5 files changed, 23 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index b289a06..0972303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-23 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclCompile.h: Demote TclCompEvalObj() from internal stubs to
+ * generic/tclInt.decls: a MODULE_SCOPE routine declared in tclCompile.h.
+
+ * generic/tclIntDecls.h: make genstubs
+ * generic/tclStubInit.c:
+
2008-01-22 Don Porter <dgp@users.sourceforge.net>
* generic/tclTimer.c (AfterProc): Replace Tcl_EvalEx() with
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 98776ca..fae5553 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompile.h,v 1.88 2008/01/16 21:05:48 msofer Exp $
+ * RCS: @(#) $Id: tclCompile.h,v 1.89 2008/01/23 17:31:42 dgp Exp $
*/
#ifndef _TCLCOMPILATION
@@ -840,11 +840,8 @@ MODULE_SCOPE int TclEvalObjvInternal(Tcl_Interp *interp,
*----------------------------------------------------------------
*/
-/*
- * Declaration moved to the internal stubs table
- *
-MODULE_SCOPE int TclCompEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
- */
+MODULE_SCOPE int TclCompEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+ const CmdFrame *invoker, int word);
/*
*----------------------------------------------------------------
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 6227653..ccc568f 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -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: tclInt.decls,v 1.120 2007/12/13 15:23:18 dgp Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.121 2008/01/23 17:31:42 dgp Exp $
library tcl
@@ -797,11 +797,12 @@ declare 183 generic {
#
# Added in tcl8.5a5 for compiler/executor experimentation.
+# Disabled in Tcl 8.5.1; experiments terminated. :/
#
-declare 197 generic {
- int TclCompEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
- CONST CmdFrame* invoker, int word)
-}
+#declare 197 generic {
+# int TclCompEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+# CONST CmdFrame* invoker, int word)
+#}
declare 198 generic {
int TclObjGetFrame(Tcl_Interp *interp, Tcl_Obj *objPtr,
CallFrame **framePtrPtr)
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index ac53ff5..0ff03f9 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIntDecls.h,v 1.111 2007/12/13 15:23:18 dgp Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.112 2008/01/23 17:31:42 dgp Exp $
*/
#ifndef _TCLINTDECLS
@@ -889,13 +889,7 @@ EXTERN struct tm * TclpGmtime (CONST time_t * clock);
/* Slot 194 is reserved */
/* Slot 195 is reserved */
/* Slot 196 is reserved */
-#ifndef TclCompEvalObj_TCL_DECLARED
-#define TclCompEvalObj_TCL_DECLARED
-/* 197 */
-EXTERN int TclCompEvalObj (Tcl_Interp * interp,
- Tcl_Obj * objPtr, CONST CmdFrame* invoker,
- int word);
-#endif
+/* Slot 197 is reserved */
#ifndef TclObjGetFrame_TCL_DECLARED
#define TclObjGetFrame_TCL_DECLARED
/* 198 */
@@ -1308,7 +1302,7 @@ typedef struct TclIntStubs {
void *reserved194;
void *reserved195;
void *reserved196;
- int (*tclCompEvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST CmdFrame* invoker, int word); /* 197 */
+ void *reserved197;
int (*tclObjGetFrame) (Tcl_Interp * interp, Tcl_Obj * objPtr, CallFrame ** framePtrPtr); /* 198 */
void *reserved199;
int (*tclpObjRemoveDirectory) (Tcl_Obj * pathPtr, int recursive, Tcl_Obj ** errorPtr); /* 200 */
@@ -1966,10 +1960,7 @@ extern TclIntStubs *tclIntStubsPtr;
/* Slot 194 is reserved */
/* Slot 195 is reserved */
/* Slot 196 is reserved */
-#ifndef TclCompEvalObj
-#define TclCompEvalObj \
- (tclIntStubsPtr->tclCompEvalObj) /* 197 */
-#endif
+/* Slot 197 is reserved */
#ifndef TclObjGetFrame
#define TclObjGetFrame \
(tclIntStubsPtr->tclObjGetFrame) /* 198 */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index c681e7b..f663610 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclStubInit.c,v 1.149 2007/12/13 15:23:20 dgp Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.150 2008/01/23 17:31:42 dgp Exp $
*/
#include "tclInt.h"
@@ -295,7 +295,7 @@ TclIntStubs tclIntStubs = {
NULL, /* 194 */
NULL, /* 195 */
NULL, /* 196 */
- TclCompEvalObj, /* 197 */
+ NULL, /* 197 */
TclObjGetFrame, /* 198 */
NULL, /* 199 */
TclpObjRemoveDirectory, /* 200 */