Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | import small refactoring from TclOO package codebase |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
81b73c10173437084ed16351bbcac4bc |
| User & Date: | dkf 2012-07-31 12:19:34 |
Context
|
2012-07-31
| ||
| 12:46 | small cosmetic fixes check-in: 79fb0cd1e4 user: dkf tags: trunk | |
| 12:19 | import small refactoring from TclOO package codebase check-in: 81b73c1017 user: dkf tags: trunk | |
| 11:46 | [Frq 3544967] Missing objectfiles in static lib check-in: 184b5f3465 user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/tclOO.c.
| ︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | Tcl_Interp *interp); static void MyDeleted(ClientData clientData); static void ObjectNamespaceDeleted(ClientData clientData); static void ObjectRenamedTrace(ClientData clientData, Tcl_Interp *interp, const char *oldName, const char *newName, int flags); static void ReleaseClassContents(Tcl_Interp *interp,Object *oPtr); static void SquelchedNsFirst(ClientData clientData); static int PublicObjectCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv); static int PublicNRObjectCmd(ClientData clientData, Tcl_Interp *interp, int objc, | > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | Tcl_Interp *interp); static void MyDeleted(ClientData clientData); static void ObjectNamespaceDeleted(ClientData clientData); static void ObjectRenamedTrace(ClientData clientData, Tcl_Interp *interp, const char *oldName, const char *newName, int flags); static void ReleaseClassContents(Tcl_Interp *interp,Object *oPtr); static inline void SquelchCachedName(Object *oPtr); static void SquelchedNsFirst(ClientData clientData); static int PublicObjectCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv); static int PublicNRObjectCmd(ClientData clientData, Tcl_Interp *interp, int objc, |
| ︙ | ︙ | |||
700 701 702 703 704 705 706 707 708 709 710 711 712 713 |
return oPtr;
}
/*
* ----------------------------------------------------------------------
*
* MyDeleted --
*
* This callback is triggered when the object's [my] command is deleted
* by any mechanism. It just marks the object as not having a [my]
* command, and so prevents cleanup of that when the object itself is
* deleted.
*
| > > > > > > > > > > > > > > > > > > > > > | 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 |
return oPtr;
}
/*
* ----------------------------------------------------------------------
*
* SquelchCachedName --
*
* Encapsulates how to throw away a cached object name. Called from
* object rename traces and at object destruction.
*
* ----------------------------------------------------------------------
*/
static inline void
SquelchCachedName(
Object *oPtr)
{
if (oPtr->cachedNameObj) {
Tcl_DecrRefCount(oPtr->cachedNameObj);
oPtr->cachedNameObj = NULL;
}
}
/*
* ----------------------------------------------------------------------
*
* MyDeleted --
*
* This callback is triggered when the object's [my] command is deleted
* by any mechanism. It just marks the object as not having a [my]
* command, and so prevents cleanup of that when the object itself is
* deleted.
*
|
| ︙ | ︙ | |||
774 775 776 777 778 779 780 |
/*
* If this is a rename and not a delete of the object, we just flush the
* cache of the object name.
*/
if (flags & TCL_TRACE_RENAME) {
| | < < < | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 |
/*
* If this is a rename and not a delete of the object, we just flush the
* cache of the object name.
*/
if (flags & TCL_TRACE_RENAME) {
SquelchCachedName(oPtr);
return;
}
/*
* Oh dear, the object really is being deleted. Handle this by running the
* destructors and deleting the object's namespace, which in turn causes
* the real object structures to be deleted.
|
| ︙ | ︙ | |||
1134 1135 1136 1137 1138 1139 1140 |
ckfree(oPtr->variables.list);
}
if (oPtr->chainCache) {
TclOODeleteChainCache(oPtr->chainCache);
}
| | < < < | 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 |
ckfree(oPtr->variables.list);
}
if (oPtr->chainCache) {
TclOODeleteChainCache(oPtr->chainCache);
}
SquelchCachedName(oPtr);
if (oPtr->metadataPtr != NULL) {
Tcl_ObjectMetadataType *metadataTypePtr;
ClientData value;
FOREACH_HASH(metadataTypePtr, value, oPtr->metadataPtr) {
metadataTypePtr->deleteProc(value);
|
| ︙ | ︙ |