Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Also apply the tricks when going via the 'self' definition. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | dkf-oo-override-definition-namespaces |
| Files: | files | file ages | folders |
| SHA1: |
eee12a7f97be792c528a07fda1be59c7 |
| User & Date: | dkf 2017-06-18 13:44:39 |
Context
|
2017-06-19
| ||
| 07:14 | merge core-8-6-branch check-in: e297f56c1c user: dkf tags: dkf-oo-override-definition-namespaces | |
|
2017-06-18
| ||
| 13:44 | Also apply the tricks when going via the 'self' definition. check-in: eee12a7f97 user: dkf tags: dkf-oo-override-definition-namespaces | |
| 13:36 | Start of an idea on how to make it easier to have non-trivial little languages for particular class ... check-in: c3b3ca625f user: dkf tags: dkf-oo-override-definition-namespaces | |
Changes
Changes to generic/tclOODefineCmds.c.
| ︙ | ︙ | |||
1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 |
Tcl_Interp *interp,
int objc,
Tcl_Obj *const *objv)
{
Foundation *fPtr = TclOOGetFoundation(interp);
int result;
Object *oPtr;
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arg ?arg ...?");
return TCL_ERROR;
}
oPtr = (Object *) TclOOGetDefineCmdContext(interp);
if (oPtr == NULL) {
return TCL_ERROR;
}
/*
* Make the oo::objdefine namespace the current namespace and evaluate the
* command(s).
*/
| > > > > > > > > > | | 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 |
Tcl_Interp *interp,
int objc,
Tcl_Obj *const *objv)
{
Foundation *fPtr = TclOOGetFoundation(interp);
int result;
Object *oPtr;
Tcl_Namespace *nsPtr = NULL;
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "arg ?arg ...?");
return TCL_ERROR;
}
oPtr = (Object *) TclOOGetDefineCmdContext(interp);
if (oPtr == NULL) {
return TCL_ERROR;
}
/*
* Make the oo::objdefine namespace the current namespace and evaluate the
* command(s).
*/
if (oPtr->definitionNs &&
TclGetNamespaceFromObj(interp, oPtr->definitionNs,
&nsPtr) != TCL_OK) {
return TCL_ERROR;
}
if (nsPtr == NULL) {
nsPtr = fPtr->objdefNs;
}
if (InitDefineContext(interp, nsPtr, oPtr, objc, objv) != TCL_OK) {
return TCL_ERROR;
}
AddRef(oPtr);
if (objc == 2) {
Tcl_Obj *objNameObj = TclOOObjectName(interp, oPtr);
|
| ︙ | ︙ | |||
1096 1097 1098 1099 1100 1101 1102 | /* * Build the list of arguments using a Tcl_Obj as a workspace. See * comments above for why these contortions are necessary. */ objPtr = Tcl_NewObj(); obj2Ptr = Tcl_NewObj(); | | | 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 |
/*
* Build the list of arguments using a Tcl_Obj as a workspace. See
* comments above for why these contortions are necessary.
*/
objPtr = Tcl_NewObj();
obj2Ptr = Tcl_NewObj();
cmd = FindCommand(interp, objv[1], nsPr);
if (cmd == NULL) {
/* punt this case! */
Tcl_AppendObjToObj(obj2Ptr, objv[1]);
} else {
Tcl_GetCommandFullName(interp, cmd, obj2Ptr);
}
Tcl_ListObjAppendElement(NULL, objPtr, obj2Ptr);
|
| ︙ | ︙ |