summaryrefslogtreecommitdiffstats
path: root/generic/tclDictObj.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-11-13 00:19:03 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-11-13 00:19:03 (GMT)
commit7a07d486140731dd4d08347389ee05bdbb8fd3ec (patch)
treebec4c44844a8c5073250e391a03c4e121f4dd421 /generic/tclDictObj.c
parent72e668e2300443e952f2105adad798d8f6a61c04 (diff)
downloadtcl-7a07d486140731dd4d08347389ee05bdbb8fd3ec.zip
tcl-7a07d486140731dd4d08347389ee05bdbb8fd3ec.tar.gz
tcl-7a07d486140731dd4d08347389ee05bdbb8fd3ec.tar.bz2
TIP #221 IMPLEMENTATION
* generic/tclBasic.c: Define [::tcl::Bgerror] in new interps. * generic/tclEvent.c: Update Tcl_BackgroundError to make use of the registered [interp bgerror] command. * generic/tclInterp.c: New [interp bgerror] subcommand. * tests/interp.test: syntax tests updated. TIP #226 IMPLEMENTATION * generic/tcl.decls: Stubs for Tcl_(Save|Restore|Discard)InterpState * generic/tcl.h: New public opaque type, Tcl_InterpState. * generic/tclInt.h: Drop old private declarations. Add Tcl(Get|Set)BgErrorHandler * generic/tclResult.c: Tcl_*InterpState implementations. * generic/tclDictObj.c: Update callers. * generic/tclIOGT.c: * generic/tclTrace.c: TIP #227 IMPLEMENTATION * generic/tcl.decls: Stubs for Tcl_(Get|Set)ReturnOptions. * generic/tclInt.h: Drop old private declarations. * generic/tclResult.c: Tcl_*ReturnOptions implementations. * generic/tclCmdAH.c: Update callers. * generic/tclMain.c:
Diffstat (limited to 'generic/tclDictObj.c')
-rw-r--r--generic/tclDictObj.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 57576e4..2bbd292 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -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: tclDictObj.c,v 1.26 2004/10/19 22:20:04 dkf Exp $
+ * RCS: @(#) $Id: tclDictObj.c,v 1.27 2004/11/13 00:19:09 dgp Exp $
*/
#include "tclInt.h"
@@ -2739,7 +2739,7 @@ DictUpdateCmd(interp, objc, objv)
{
Tcl_Obj *dictPtr, *objPtr;
int i, result, dummy, allocdict = 0;
- TclInterpState state;
+ Tcl_InterpState state;
if (objc < 6 || objc & 1) {
Tcl_WrongNumArgs(interp, 2, objv,
@@ -2794,9 +2794,9 @@ DictUpdateCmd(interp, objc, objv)
* Double-check that it is still a dictionary.
*/
- state = TclSaveInterpState(interp, result);
+ state = Tcl_SaveInterpState(interp, result);
if (Tcl_DictObjSize(interp, dictPtr, &dummy) != TCL_OK) {
- TclDiscardInterpState(state);
+ Tcl_DiscardInterpState(state);
return TCL_ERROR;
}
@@ -2826,14 +2826,14 @@ DictUpdateCmd(interp, objc, objv)
if (Tcl_ObjSetVar2(interp, objv[2], NULL, dictPtr,
TCL_LEAVE_ERR_MSG) == NULL) {
- TclDiscardInterpState(state);
+ Tcl_DiscardInterpState(state);
if (allocdict) {
TclDecrRefCount(dictPtr);
}
return TCL_ERROR;
}
- return TclRestoreInterpState(interp, state);
+ return Tcl_RestoreInterpState(interp, state);
}
/*
@@ -2862,7 +2862,7 @@ DictWithCmd(interp, objc, objv)
{
Tcl_Obj *dictPtr, *keysPtr, *keyPtr, *valPtr, **keyv, *leafPtr;
Tcl_DictSearch s;
- TclInterpState state;
+ Tcl_InterpState state;
int done, result, keyc, i, allocdict=0;
if (objc < 4) {
@@ -2938,10 +2938,10 @@ DictWithCmd(interp, objc, objv)
* Double-check that it is still a dictionary.
*/
- state = TclSaveInterpState(interp, result);
+ state = Tcl_SaveInterpState(interp, result);
if (Tcl_DictObjSize(interp, dictPtr, &i) != TCL_OK) {
TclDecrRefCount(keysPtr);
- TclDiscardInterpState(state);
+ Tcl_DiscardInterpState(state);
return TCL_ERROR;
}
@@ -2967,7 +2967,7 @@ DictWithCmd(interp, objc, objv)
if (allocdict) {
TclDecrRefCount(dictPtr);
}
- TclDiscardInterpState(state);
+ Tcl_DiscardInterpState(state);
return TCL_ERROR;
}
if (leafPtr == DICT_PATH_NON_EXISTENT) {
@@ -2975,7 +2975,7 @@ DictWithCmd(interp, objc, objv)
if (allocdict) {
TclDecrRefCount(dictPtr);
}
- return TclRestoreInterpState(interp, state);
+ return Tcl_RestoreInterpState(interp, state);
}
} else {
leafPtr = dictPtr;
@@ -3014,10 +3014,10 @@ DictWithCmd(interp, objc, objv)
if (allocdict) {
TclDecrRefCount(dictPtr);
}
- TclDiscardInterpState(state);
+ Tcl_DiscardInterpState(state);
return TCL_ERROR;
}
- return TclRestoreInterpState(interp, state);
+ return Tcl_RestoreInterpState(interp, state);
}
/*