Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | In progress effort to repair context juggling. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | dgp-method-type |
| Files: | files | file ages | folders |
| SHA1: |
b41e9c4dc4baf3e02cff541ca2baa314 |
| User & Date: | dgp 2015-07-29 10:01:46 |
Context
|
2015-07-29
| ||
| 16:45 | merge trunk check-in: 482c48daf2 user: dgp tags: dgp-method-type | |
| 10:01 | In progress effort to repair context juggling. check-in: b41e9c4dc4 user: dgp tags: dgp-method-type | |
|
2015-02-26
| ||
| 18:44 | Update the idioms for stubs initialization. Closed-Leaf check-in: bc0e48ab05 user: dgp tags: itk-4-0-1, itk-4-0-1-rc | |
Changes
Changes to generic/itkArchBase.c.
301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 ... 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 ... 362 363 364 365 366 367 368 369 370 371 372 373 374 375 |
}
}
/*
* Execute the <createCmds> to create the component widget.
* Do this one level up, in the scope of the calling routine.
*/
Itcl_SetCallFrameResolver(interp, contextClass->resolvePtr);
infoPtr = Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL);
uplevelFramePtr = Itcl_GetUplevelCallFrame(interp, 1);
oldFramePtr = Itcl_ActivateCallFrame(interp, uplevelFramePtr);
result = Tcl_EvalObjEx(interp, objv[2], 0);
if (result != TCL_OK) {
goto compFail;
}
/*
* Take the result from the widget creation commands as the
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"cannot find component access command \"",
path, "\" for component \"", name, "\"",
(char*)NULL);
goto compFail;
}
(void) Itcl_ActivateCallFrame(interp, oldFramePtr);
oldFramePtr = NULL;
winNamePtr = Tcl_NewStringObj((char*)NULL, 0);
Tcl_GetCommandFullName(interp, accessCmd, winNamePtr);
Tcl_IncrRefCount(winNamePtr);
/*
* Create the component record. Set the protection level
* according to the "-protected" or "-private" option.
*/
ownerClass = contextClass;
Tcl_Namespace *ownerNsPtr;
callContextPtr = Itcl_PeekStack(&infoPtr->contextStack);
ownerNsPtr = callContextPtr->nsPtr;
if (ownerNsPtr != NULL) {
Tcl_HashEntry *hPtr;
int idx = 2;
if (Itcl_GetStackSize(&infoPtr->contextStack) == 1) {
................................................................................
}
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-idx);
hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses,
(char *)callContextPtr->nsPtr);
ownerClass = (ItclClass*)Tcl_GetHashValue(hPtr);
}
archComp = Itk_CreateArchComponent(interp, info, name, ownerClass,
accessCmd);
if (!archComp) {
goto compFail;
}
|
> > > > > > |
301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 ... 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 ... 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 |
}
}
/*
* Execute the <createCmds> to create the component widget.
* Do this one level up, in the scope of the calling routine.
*/
#if 0
Itcl_SetCallFrameResolver(interp, contextClass->resolvePtr);
infoPtr = Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL);
uplevelFramePtr = Itcl_GetUplevelCallFrame(interp, 1);
oldFramePtr = Itcl_ActivateCallFrame(interp, uplevelFramePtr);
#endif
result = Tcl_EvalObjEx(interp, objv[2], 0);
if (result != TCL_OK) {
goto compFail;
}
/*
* Take the result from the widget creation commands as the
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"cannot find component access command \"",
path, "\" for component \"", name, "\"",
(char*)NULL);
goto compFail;
}
#if 0
(void) Itcl_ActivateCallFrame(interp, oldFramePtr);
oldFramePtr = NULL;
#endif
winNamePtr = Tcl_NewStringObj((char*)NULL, 0);
Tcl_GetCommandFullName(interp, accessCmd, winNamePtr);
Tcl_IncrRefCount(winNamePtr);
/*
* Create the component record. Set the protection level
* according to the "-protected" or "-private" option.
*/
ownerClass = contextClass;
#if 0
Tcl_Namespace *ownerNsPtr;
callContextPtr = Itcl_PeekStack(&infoPtr->contextStack);
ownerNsPtr = callContextPtr->nsPtr;
if (ownerNsPtr != NULL) {
Tcl_HashEntry *hPtr;
int idx = 2;
if (Itcl_GetStackSize(&infoPtr->contextStack) == 1) {
................................................................................
}
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-idx);
hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses,
(char *)callContextPtr->nsPtr);
ownerClass = (ItclClass*)Tcl_GetHashValue(hPtr);
}
#endif
archComp = Itk_CreateArchComponent(interp, info, name, ownerClass,
accessCmd);
if (!archComp) {
goto compFail;
}
|
Changes to generic/itkArchetype.c.
552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 ... 870 871 872 873 874 875 876 877 878 879 880 881 882 883 ... 886 887 888 889 890 891 892 893 894 895 896 897 898 899 |
return TCL_ERROR;
}
/*
* See what class is being initialized by getting the namespace
* for the calling context.
*/
infoPtr = Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL);
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-2);
hPtr = Tcl_FindHashEntry(
&callContextPtr->ioPtr->iclsPtr->infoPtr->namespaceClasses,
(char *)callContextPtr->nsPtr);
if (hPtr != NULL) {
contextClass = (ItclClass *)Tcl_GetHashValue(hPtr);
}
/*
* Integrate all public variables for the current class
* context into the composite option list.
*/
Itcl_InitHierIter(&hier, contextClass);
................................................................................
return TCL_ERROR;
}
if (Itk_GetArchInfo(interp, contextObj, &info) != TCL_OK) {
return TCL_ERROR;
}
ItclObjectInfo *infoPtr;
infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp,
ITCL_INTERP_DATA, NULL);
if (Itcl_GetStackSize(&infoPtr->contextStack) == 1) {
callingNs = Tcl_GetGlobalNamespace(interp);
} else {
ItclCallContext *callContextPtr;
................................................................................
#ifdef NOTDEF
callingNs = (Tcl_Namespace *)Itcl_GetStackValue(
&infoPtr->namespaceStack,
Itcl_GetStackSize(&infoPtr->namespaceStack)-2);
#endif
callingNs = callContextPtr->nsPtr;
}
/*
* With no arguments, return a list of components that can be
* accessed from the calling scope.
*/
if (objc == 2) {
/* if the name of the component is the empty string ignore that arg */
if (strlen(Tcl_GetString(objv[1])) == 0) {
|
> > > > > > |
552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 ... 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 ... 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 |
return TCL_ERROR;
}
/*
* See what class is being initialized by getting the namespace
* for the calling context.
*/
#if 0
infoPtr = Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL);
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-2);
hPtr = Tcl_FindHashEntry(
&callContextPtr->ioPtr->iclsPtr->infoPtr->namespaceClasses,
(char *)callContextPtr->nsPtr);
if (hPtr != NULL) {
contextClass = (ItclClass *)Tcl_GetHashValue(hPtr);
}
#endif
/*
* Integrate all public variables for the current class
* context into the composite option list.
*/
Itcl_InitHierIter(&hier, contextClass);
................................................................................
return TCL_ERROR;
}
if (Itk_GetArchInfo(interp, contextObj, &info) != TCL_OK) {
return TCL_ERROR;
}
callingNs = Tcl_GetCurrentNamespace(interp);
#if 0
ItclObjectInfo *infoPtr;
infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp,
ITCL_INTERP_DATA, NULL);
if (Itcl_GetStackSize(&infoPtr->contextStack) == 1) {
callingNs = Tcl_GetGlobalNamespace(interp);
} else {
ItclCallContext *callContextPtr;
................................................................................
#ifdef NOTDEF
callingNs = (Tcl_Namespace *)Itcl_GetStackValue(
&infoPtr->namespaceStack,
Itcl_GetStackSize(&infoPtr->namespaceStack)-2);
#endif
callingNs = callContextPtr->nsPtr;
}
#endif
/*
* With no arguments, return a list of components that can be
* accessed from the calling scope.
*/
if (objc == 2) {
/* if the name of the component is the empty string ignore that arg */
if (strlen(Tcl_GetString(objv[1])) == 0) {
|