diff options
author | dgp <dgp@users.sourceforge.net> | 2014-07-15 13:18:33 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2014-07-15 13:18:33 (GMT) |
commit | 64c066f9bb2daa64cc0cf366d0c0812a828d2d61 (patch) | |
tree | 934228bab58b4be058c64ed75ac9363292cc7474 /generic/tclOO.c | |
parent | 773c4c75ee2ec9d60766f09ced30a5fef6d812c6 (diff) | |
parent | 74d71bafde63ca49cecadc990df7b3a2d7797849 (diff) | |
download | tcl-dgp_pkg_migration.zip tcl-dgp_pkg_migration.tar.gz tcl-dgp_pkg_migration.tar.bz2 |
merge trunkdgp_pkg_migration
Diffstat (limited to 'generic/tclOO.c')
-rw-r--r-- | generic/tclOO.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/generic/tclOO.c b/generic/tclOO.c index d6d2d6a..de00733 100644 --- a/generic/tclOO.c +++ b/generic/tclOO.c @@ -271,7 +271,7 @@ TclOOInit( return TCL_ERROR; } - return Tcl_PkgProvideEx(interp, "TclOO", TCLOO_VERSION, + return Tcl_PkgProvideEx(interp, "TclOO", TCLOO_PATCHLEVEL, (ClientData) &tclOOStubs); } @@ -437,10 +437,12 @@ InitFoundation( * ensemble. */ - Tcl_CreateObjCommand(interp, "::oo::Helpers::next", TclOONextObjCmd, NULL, - NULL); - Tcl_CreateObjCommand(interp, "::oo::Helpers::nextto", TclOONextToObjCmd, - NULL, NULL); + cmdPtr = (Command *) Tcl_NRCreateCommand(interp, "::oo::Helpers::next", + NULL, TclOONextObjCmd, NULL, NULL); + cmdPtr->compileProc = TclCompileObjectNextCmd; + cmdPtr = (Command *) Tcl_NRCreateCommand(interp, "::oo::Helpers::nextto", + NULL, TclOONextToObjCmd, NULL, NULL); + cmdPtr->compileProc = TclCompileObjectNextToCmd; cmdPtr = (Command *) Tcl_CreateObjCommand(interp, "::oo::Helpers::self", TclOOSelfObjCmd, NULL, NULL); cmdPtr->compileProc = TclCompileObjectSelfCmd; @@ -843,7 +845,7 @@ ObjectRenamedTrace( result = Tcl_NRCallObjProc(interp, TclOOInvokeContext, contextPtr, 0, NULL); if (result != TCL_OK) { - Tcl_BackgroundError(interp); + Tcl_BackgroundException(interp, result); } Tcl_RestoreInterpState(interp, state); TclOODeleteContext(contextPtr); |