Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add type-casts and some other type-changes, making the source-code more C++-friendly. Not 100% compilable with C++-compiler yet, but almost there. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
c9326d39eb81adf59ab3f5a6fa217455 |
User & Date: | jan.nijtmans 2019-08-22 10:38:36.945 |
Context
2019-08-22
| ||
10:47 | One more signature change, eliminating type-casts. check-in: ff073515d6 user: jan.nijtmans tags: trunk | |
10:38 | Add type-casts and some other type-changes, making the source-code more C++-friendly. Not 100% compilable with C++-compiler yet, but almost there. check-in: c9326d39eb user: jan.nijtmans tags: trunk | |
2019-08-21
| ||
15:27 | TEA update check-in: 7fd8103f8e user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/itcl.decls.
︙ | ︙ | |||
272 273 274 275 276 277 278 | ItclMemberFunc **mfuncPtr) } declare 55 { int Itcl_ChangeMemberFunc(Tcl_Interp *interp, ItclMemberFunc *mfunc, const char *arglist, const char *body) } declare 56 { | | | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | ItclMemberFunc **mfuncPtr) } declare 55 { int Itcl_ChangeMemberFunc(Tcl_Interp *interp, ItclMemberFunc *mfunc, const char *arglist, const char *body) } declare 56 { void Itcl_DeleteMemberFunc(void *cdata) } declare 57 { int Itcl_CreateMemberCode(Tcl_Interp *interp, ItclClass *iclsPtr, \ const char *arglist, const char *body, ItclMemberCode **mcodePtr) } declare 58 { void Itcl_DeleteMemberCode(char *cdata) |
︙ | ︙ |
Changes to generic/itcl2TclOO.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | /* * itcl2TclOO.c -- * * This file contains code to create and manage methods. * * Copyright (c) 2007 by Arnulf P. Wiedemann * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <tclInt.h> #include <tclOOInt.h> #include "itclInt.h" void * Itcl_GetCurrentCallbackPtr( Tcl_Interp *interp) { return TOP_CB(interp); } int Itcl_NRRunCallbacks( Tcl_Interp *interp, void *rootPtr) { | > > > | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | /* * itcl2TclOO.c -- * * This file contains code to create and manage methods. * * Copyright (c) 2007 by Arnulf P. Wiedemann * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <tclInt.h> #include <tclOOInt.h> #undef FOREACH_HASH_DECLS #undef FOREACH_HASH #undef FOREACH_HASH_VALUE #include "itclInt.h" void * Itcl_GetCurrentCallbackPtr( Tcl_Interp *interp) { return TOP_CB(interp); } int Itcl_NRRunCallbacks( Tcl_Interp *interp, void *rootPtr) { return TclNRRunCallbacks(interp, TCL_OK, (NRE_callback*)rootPtr); } static int CallFinalizePMCall( void *data[], Tcl_Interp *interp, int result) { Tcl_Namespace *nsPtr = (Tcl_Namespace *)data[0]; TclOO_PostCallProc *postCallProc = (TclOO_PostCallProc *)data[1]; void *clientData = data[2]; /* * Give the post-call callback a chance to do some cleanup. Note that at * this point the call frame itself is invalid; it's already been popped. */ return postCallProc(clientData, interp, NULL, nsPtr, result); } static int FreeCommand( void *data[], Tcl_Interp *interp, int result) { Command *cmdPtr = (Command *)data[0]; Proc *procPtr = (Proc *)data[1]; ckfree(cmdPtr); procPtr->cmdPtr = NULL; return result; } |
︙ | ︙ | |||
73 74 75 76 77 78 79 | Proc *procPtr = pmPtr->procPtr; CallFrame *framePtr = NULL; CallFrame **framePtrPtr1 = &framePtr; Tcl_CallFrame **framePtrPtr = (Tcl_CallFrame **)framePtrPtr1; int result; if (procPtr->cmdPtr == NULL) { | | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | Proc *procPtr = pmPtr->procPtr; CallFrame *framePtr = NULL; CallFrame **framePtrPtr1 = &framePtr; Tcl_CallFrame **framePtrPtr = (Tcl_CallFrame **)framePtrPtr1; int result; if (procPtr->cmdPtr == NULL) { Command *cmdPtr = (Command *)ckalloc(sizeof(Command)); memset(cmdPtr, 0, sizeof(Command)); cmdPtr->nsPtr = (Namespace *) nsPtr; cmdPtr->clientData = NULL; procPtr->cmdPtr = cmdPtr; Tcl_NRAddCallback(interp, FreeCommand, cmdPtr, procPtr, NULL, NULL); } |
︙ | ︙ | |||
128 129 130 131 132 133 134 | * Now invoke the body of the method. Note that we need to take special * action when doing unknown processing to ensure that the missing method * name is passed as an argument. */ if (pmPtr->postCallProc) { Tcl_NRAddCallback(interp, CallFinalizePMCall, nsPtr, | | | | | | | | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | * Now invoke the body of the method. Note that we need to take special * action when doing unknown processing to ensure that the missing method * name is passed as an argument. */ if (pmPtr->postCallProc) { Tcl_NRAddCallback(interp, CallFinalizePMCall, nsPtr, (void *)pmPtr->postCallProc, pmPtr->clientData, NULL); } return TclNRInterpProcCore(interp, namePtr, 1, pmPtr->errProc); done: return result; } int Itcl_InvokeProcedureMethod( void *clientData, /* Pointer to some per-method context. */ Tcl_Interp *interp, int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Arguments as actually seen. */ { Tcl_Namespace *nsPtr; Method *mPtr; mPtr = (Method *)clientData; if (mPtr->declaringClassPtr == NULL) { /* that is the case for typemethods */ nsPtr = mPtr->declaringObjectPtr->namespacePtr; } else { nsPtr = mPtr->declaringClassPtr->thisPtr->namespacePtr; } return Tcl_InvokeClassProcedureMethod(interp, mPtr->namePtr, nsPtr, (ProcedureMethod *)mPtr->clientData, objc, objv); } static int FreeProcedureMethod( void *data[], Tcl_Interp *interp, int result) { ProcedureMethod *pmPtr = (ProcedureMethod *)data[0]; ckfree(pmPtr); return result; } static void EnsembleErrorProc( Tcl_Interp *interp, |
︙ | ︙ | |||
193 194 195 196 197 198 199 | Tcl_Interp *interp, Tcl_Namespace *nsPtr, /* namespace to call the method in */ Tcl_Obj *namePtr, /* name of the method */ Tcl_Proc *procPtr, int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Arguments as actually seen. */ { | | | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | Tcl_Interp *interp, Tcl_Namespace *nsPtr, /* namespace to call the method in */ Tcl_Obj *namePtr, /* name of the method */ Tcl_Proc *procPtr, int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Arguments as actually seen. */ { ProcedureMethod *pmPtr = (ProcedureMethod *)ckalloc(sizeof(ProcedureMethod)); memset(pmPtr, 0, sizeof(ProcedureMethod)); pmPtr->version = TCLOO_PROCEDURE_METHOD_VERSION; pmPtr->procPtr = (Proc *)procPtr; pmPtr->flags = USE_DECLARER_NS; pmPtr->errProc = EnsembleErrorProc; |
︙ | ︙ | |||
221 222 223 224 225 226 227 | * function that does call chain creation, management and invokation. * * ---------------------------------------------------------------------- */ int Itcl_PublicObjectCmd( | | | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | * function that does call chain creation, management and invokation. * * ---------------------------------------------------------------------- */ int Itcl_PublicObjectCmd( void *clientData, Tcl_Interp *interp, Tcl_Class clsPtr, int objc, Tcl_Obj *const *objv) { Tcl_Object oPtr = (Tcl_Object)clientData; int result; |
︙ | ︙ | |||
252 253 254 255 256 257 258 | Tcl_Method Itcl_NewProcClassMethod( Tcl_Interp *interp, /* The interpreter containing the class. */ Tcl_Class clsPtr, /* The class to modify. */ TclOO_PreCallProc *preCallPtr, TclOO_PostCallProc *postCallPtr, ProcErrorProc *errProc, | | | | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | Tcl_Method Itcl_NewProcClassMethod( Tcl_Interp *interp, /* The interpreter containing the class. */ Tcl_Class clsPtr, /* The class to modify. */ TclOO_PreCallProc *preCallPtr, TclOO_PostCallProc *postCallPtr, ProcErrorProc *errProc, void *clientData, Tcl_Obj *nameObj, /* The name of the method, which may be NULL; * if so, up to caller to manage storage * (e.g., because it is a constructor or * destructor). */ Tcl_Obj *argsObj, /* The formal argument list for the method, * which may be NULL; if so, it is equivalent * to an empty list. */ Tcl_Obj *bodyObj, /* The body of the method, which must not be * NULL. */ void **clientData2) { Tcl_Method result; result = TclOONewProcMethodEx(interp, clsPtr, preCallPtr, postCallPtr, errProc, clientData, nameObj, argsObj, bodyObj, PUBLIC_METHOD | USE_DECLARER_NS, clientData2); return result; |
︙ | ︙ | |||
289 290 291 292 293 294 295 | Tcl_Method Itcl_NewProcMethod( Tcl_Interp *interp, /* The interpreter containing the object. */ Tcl_Object oPtr, /* The object to modify. */ TclOO_PreCallProc *preCallPtr, TclOO_PostCallProc *postCallPtr, ProcErrorProc *errProc, | | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 | Tcl_Method Itcl_NewProcMethod( Tcl_Interp *interp, /* The interpreter containing the object. */ Tcl_Object oPtr, /* The object to modify. */ TclOO_PreCallProc *preCallPtr, TclOO_PostCallProc *postCallPtr, ProcErrorProc *errProc, void *clientData, Tcl_Obj *nameObj, /* The name of the method, which must not be * NULL. */ Tcl_Obj *argsObj, /* The formal argument list for the method, * which must not be NULL. */ Tcl_Obj *bodyObj, /* The body of the method, which must not be * NULL. */ void **clientData2) { return TclOONewProcInstanceMethodEx(interp, oPtr, preCallPtr, postCallPtr, errProc, clientData, nameObj, argsObj, bodyObj, PUBLIC_METHOD | USE_DECLARER_NS, clientData2); } /* |
︙ | ︙ | |||
345 346 347 348 349 350 351 | Tcl_IncrRefCount(namePtr); oPtr->cachedNameObj = namePtr; return namePtr; } int Itcl_SelfCmd( | | | | 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | Tcl_IncrRefCount(namePtr); oPtr->cachedNameObj = namePtr; return namePtr; } int Itcl_SelfCmd( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) { Interp *iPtr = (Interp *) interp; CallFrame *framePtr = iPtr->varFramePtr; CallContext *contextPtr; if (!Itcl_IsMethodCallFrame(interp)) { Tcl_AppendResult(interp, TclGetString(objv[0]), " may only be called from inside a method", NULL); return TCL_ERROR; } contextPtr = (CallContext *)framePtr->clientData; if (objc == 1) { Tcl_SetObjResult(interp, Itcl_TclOOObjectName(interp, contextPtr->oPtr)); return TCL_OK; } return TCL_ERROR; } |
︙ | ︙ |
Changes to generic/itclBase.c.
︙ | ︙ | |||
106 107 108 109 110 111 112 | "Itcl Foundations", Demolition, NULL }; void Demolition( | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | "Itcl Foundations", Demolition, NULL }; void Demolition( void *clientData) { ItclObjectInfo *infoPtr = (ItclObjectInfo *)clientData; infoPtr->clazzObjectPtr = NULL; infoPtr->clazzClassPtr = NULL; } |
︙ | ︙ | |||
133 134 135 136 137 138 139 | RootCallProc, NULL, NULL }; static int RootCallProc( | | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | RootCallProc, NULL, NULL }; static int RootCallProc( void *clientData, Tcl_Interp *interp, Tcl_ObjectContext context, int objc, Tcl_Obj *const *objv) { Tcl_Object oPtr = Tcl_ObjectContextObject(context); ItclObject *ioPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, &objMDT); ItclRootMethodProc *proc = (ItclRootMethodProc *)clientData; return (*proc)(ioPtr, interp, objc, objv); } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
283 284 285 286 287 288 289 | opt = 1; } else { opt = atoi(res_option); } infoPtr->useOldResolvers = opt; Itcl_InitStack(&infoPtr->clsStack); | | | | | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | opt = 1; } else { opt = atoi(res_option); } infoPtr->useOldResolvers = opt; Itcl_InitStack(&infoPtr->clsStack); Tcl_SetAssocData(interp, ITCL_INTERP_DATA, NULL, infoPtr); Itcl_PreserveData(infoPtr); root = Tcl_NewObjectInstance(interp, tclCls, "::itcl::Root", NULL, 0, NULL, 0); Tcl_NewMethod(interp, Tcl_GetObjectAsClass(root), Tcl_NewStringObj("unknown", -1), 0, &itclRootMethodType, (void *)ItclUnknownGuts); Tcl_NewMethod(interp, Tcl_GetObjectAsClass(root), Tcl_NewStringObj("ItclConstructBase", -1), 0, &itclRootMethodType, (void *)ItclConstructGuts); Tcl_NewMethod(interp, Tcl_GetObjectAsClass(root), Tcl_NewStringObj("info", -1), 1, &itclRootMethodType, (void *)ItclInfoGuts); /* first create the Itcl base class as root of itcl classes */ if (Tcl_EvalEx(interp, clazzClassScript, -1, 0) != TCL_OK) { Tcl_Panic("cannot create Itcl root class ::itcl::clazz"); } resPtr = Tcl_GetObjResult(interp); /* |
︙ | ︙ | |||
348 349 350 351 352 353 354 | return TCL_ERROR; } /* * Export all commands in the "itcl" namespace so that they * can be imported with something like "namespace import itcl::*" */ | | | 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | return TCL_ERROR; } /* * Export all commands in the "itcl" namespace so that they * can be imported with something like "namespace import itcl::*" */ itclNs = Tcl_FindNamespace(interp, "::itcl", NULL, TCL_LEAVE_ERR_MSG); /* * This was changed from a glob export (itcl::*) to explicit * command exports, so that the itcl::is command can *not* be * exported. This is done for concern that the itcl::is command * imported might be confusing ("is"). |
︙ | ︙ | |||
462 463 464 465 466 467 468 | * ItclSetHullWindowName() * * * ------------------------------------------------------------------------ */ static int ItclSetHullWindowName( | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | * ItclSetHullWindowName() * * * ------------------------------------------------------------------------ */ static int ItclSetHullWindowName( void *clientData, /* infoPtr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { ItclObjectInfo *infoPtr; infoPtr = (ItclObjectInfo *)clientData; |
︙ | ︙ | |||
486 487 488 489 490 491 492 | * ItclCheckSetItclHull() * * * ------------------------------------------------------------------------ */ static int ItclCheckSetItclHull( | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | * ItclCheckSetItclHull() * * * ------------------------------------------------------------------------ */ static int ItclCheckSetItclHull( void *clientData, /* infoPtr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_HashEntry *hPtr; Tcl_Obj *objPtr; ItclObject *ioPtr; |
︙ | ︙ | |||
527 528 529 530 531 532 533 | hPtr = Tcl_FindHashEntry(&ioPtr->iclsPtr->variables, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "ItclCheckSetItclHull cannot find itcl_hull", " variable for object \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } | | | 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 | hPtr = Tcl_FindHashEntry(&ioPtr->iclsPtr->variables, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "ItclCheckSetItclHull cannot find itcl_hull", " variable for object \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } ivPtr = (ItclVariable *)Tcl_GetHashValue(hPtr); valueStr = Tcl_GetString(objv[2]); if (strcmp(valueStr, "2") == 0) { ivPtr->initted = 2; } else { if (strcmp(valueStr, "0") == 0) { ivPtr->initted = 0; } else { |
︙ | ︙ | |||
553 554 555 556 557 558 559 | * * called when an interp is deleted to free up memory * * ------------------------------------------------------------------------ */ static void FreeItclObjectInfo( | | | 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | * * called when an interp is deleted to free up memory * * ------------------------------------------------------------------------ */ static void FreeItclObjectInfo( void *clientData) { ItclObjectInfo *infoPtr = (ItclObjectInfo *)clientData; Tcl_DeleteHashTable(&infoPtr->instances); Tcl_DeleteHashTable(&infoPtr->classTypes); Tcl_DeleteHashTable(&infoPtr->procMethods); Tcl_DeleteHashTable(&infoPtr->objectCmds); |
︙ | ︙ | |||
590 591 592 593 594 595 596 | ckfree((char *)infoPtr->class_meta_type); infoPtr->class_meta_type = NULL; } /* clean up list pool */ Itcl_FinishList(); | | | 590 591 592 593 594 595 596 597 598 | ckfree((char *)infoPtr->class_meta_type); infoPtr->class_meta_type = NULL; } /* clean up list pool */ Itcl_FinishList(); Itcl_ReleaseData(infoPtr); } |
Changes to generic/itclBuiltin.c.
︙ | ︙ | |||
337 338 339 340 341 342 343 | */ Tcl_DStringInit(&buffer); for (i=0; i < BiMethodListLen; i++) { Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, "::itcl::builtin::", -1); Tcl_DStringAppend(&buffer, BiMethodList[i].name, -1); Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer), | | < | | | | 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 366 367 | */ Tcl_DStringInit(&buffer); for (i=0; i < BiMethodListLen; i++) { Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, "::itcl::builtin::", -1); Tcl_DStringAppend(&buffer, BiMethodList[i].name, -1); Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer), BiMethodList[i].proc, infoPtr, NULL); } Tcl_DStringFree(&buffer); Tcl_CreateObjCommand(interp, "::itcl::builtin::chain", Itcl_BiChainCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "::itcl::builtin::classunknown", ItclBiClassUnknownCmd, infoPtr, NULL); ItclInfoInit(interp, infoPtr); /* * Export all commands in the built-in namespace so we can * import them later on. */ itclBiNs = Tcl_FindNamespace(interp, "::itcl::builtin", NULL, TCL_LEAVE_ERR_MSG); if ((itclBiNs == NULL) || Tcl_Export(interp, itclBiNs, "[a-z]*", /* resetListFirst */ 1) != TCL_OK) { return TCL_ERROR; } /* * Install into the master [info] ensemble. |
︙ | ︙ | |||
487 488 489 490 491 492 493 | * Checks to see if the object has the given <className> anywhere * in its heritage. Returns 1 if so, and 0 otherwise. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiIsaCmd( | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | * Checks to see if the object has the given <className> anywhere * in its heritage. Returns 1 if so, and 0 otherwise. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiIsaCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { ItclClass *iclsPtr; const char *token; |
︙ | ︙ | |||
510 511 512 513 514 515 516 | if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object isa className\"", | | | | 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object isa className\"", NULL); return TCL_ERROR; } if (objc != 2) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"object ", token, " className\"", NULL); return TCL_ERROR; } /* * Look for the requested class. If it is not found, then * try to autoload it. If it absolutely cannot be found, * signal an error. |
︙ | ︙ | |||
566 567 568 569 570 571 572 | * option changes, a big of "config" code associated with the option * is executed, to bring the object up to date. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiConfigureCmd( | | | 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 | * option changes, a big of "config" code associated with the option * is executed, to bring the object up to date. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiConfigureCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { ItclClass *contextIclsPtr; ItclObject *contextIoPtr; |
︙ | ︙ | |||
617 618 619 620 621 622 623 | return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", | | | 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 | return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", NULL); return TCL_ERROR; } /* * BE CAREFUL: work in the virtual scope! */ if (contextIoPtr != NULL) { |
︙ | ︙ | |||
650 651 652 653 654 655 656 | unparsedObjc = objc; } } /* * HANDLE: configure */ if (unparsedObjc == 1) { | | | | | | | 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 | unparsedObjc = objc; } } /* * HANDLE: configure */ if (unparsedObjc == 1) { resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->variables, &place); while (hPtr) { ivPtr = (ItclVariable*)Tcl_GetHashValue(hPtr); if (ivPtr->protection == ITCL_PUBLIC) { objPtr = ItclReportPublicOpt(interp, ivPtr, contextIoPtr); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); Tcl_SetObjResult(interp, resultPtr); return TCL_OK; } else { /* * HANDLE: configure -option */ if (unparsedObjc == 2) { token = Tcl_GetString(unparsedObjv[1]); if (*token != '-') { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", NULL); return TCL_ERROR; } vlookup = NULL; hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, token+1); if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); if (vlookup->ivPtr->protection != ITCL_PUBLIC) { vlookup = NULL; } } if (!vlookup) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "unknown option \"", token, "\"", NULL); return TCL_ERROR; } resultPtr = ItclReportPublicOpt(interp, vlookup->ivPtr, contextIoPtr); Tcl_SetObjResult(interp, resultPtr); return TCL_OK; } |
︙ | ︙ | |||
738 739 740 741 742 743 744 | if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } } if (!vlookup || (vlookup->ivPtr->protection != ITCL_PUBLIC)) { Tcl_AppendResult(interp, "unknown option \"", token, "\"", | | | | | | 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 | if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } } if (!vlookup || (vlookup->ivPtr->protection != ITCL_PUBLIC)) { Tcl_AppendResult(interp, "unknown option \"", token, "\"", NULL); result = TCL_ERROR; goto configureDone; } if (i == unparsedObjc-1) { Tcl_AppendResult(interp, "value for \"", token, "\" missing", NULL); result = TCL_ERROR; goto configureDone; } ivPtr = vlookup->ivPtr; Tcl_DStringSetLength(&buffer2, 0); if (!(ivPtr->flags & ITCL_COMMON)) { Tcl_DStringAppend(&buffer2, Tcl_GetString(contextIoPtr->varNsNamePtr), -1); } Tcl_DStringAppend(&buffer2, Tcl_GetString(ivPtr->iclsPtr->fullNamePtr), -1); Tcl_DStringAppend(&buffer2, "::", 2); Tcl_DStringAppend(&buffer2, Tcl_GetString(ivPtr->namePtr), -1); varName = Tcl_DStringValue(&buffer2); lastval = Tcl_GetVar2(interp, varName, NULL, 0); Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, (lastval) ? lastval : "", -1); token = Tcl_GetString(unparsedObjv[i+1]); if (Tcl_SetVar2(interp, varName, NULL, token, TCL_LEAVE_ERR_MSG) == NULL) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (error in configuration of public variable \"%s\")", Tcl_GetString(ivPtr->fullNamePtr))); result = TCL_ERROR; goto configureDone; } |
︙ | ︙ | |||
798 799 800 801 802 803 804 | Itcl_SetCallFrameNamespace(interp, saveNsPtr); if (result == TCL_OK) { Tcl_ResetResult(interp); } else { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (error in configuration of public variable \"%s\")", Tcl_GetString(ivPtr->fullNamePtr))); | | | 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 | Itcl_SetCallFrameNamespace(interp, saveNsPtr); if (result == TCL_OK) { Tcl_ResetResult(interp); } else { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (error in configuration of public variable \"%s\")", Tcl_GetString(ivPtr->fullNamePtr))); Tcl_SetVar2(interp, varName,NULL, Tcl_DStringValue(&buffer), 0); goto configureDone; } } } |
︙ | ︙ | |||
840 841 842 843 844 845 846 | * Tk widgets. Returns the current value of the public variable * with name <option>. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiCgetCmd( | | | 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 | * Tk widgets. Returns the current value of the public variable * with name <option>. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiCgetCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { ItclClass *contextIclsPtr; ItclObject *contextIoPtr; |
︙ | ︙ | |||
866 867 868 869 870 871 872 | contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if ((contextIoPtr == NULL) || objc != 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object cget -option\"", | | | 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 | contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if ((contextIoPtr == NULL) || objc != 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object cget -option\"", NULL); return TCL_ERROR; } /* * BE CAREFUL: work in the virtual scope! */ if (contextIoPtr != NULL) { |
︙ | ︙ | |||
894 895 896 897 898 899 900 | if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } if ((vlookup == NULL) || (vlookup->ivPtr->protection != ITCL_PUBLIC)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "unknown option \"", name, "\"", | | | 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } if ((vlookup == NULL) || (vlookup->ivPtr->protection != ITCL_PUBLIC)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "unknown option \"", name, "\"", NULL); return TCL_ERROR; } val = Itcl_GetInstanceVar(interp, Tcl_GetString(vlookup->ivPtr->namePtr), contextIoPtr, vlookup->ivPtr->iclsPtr); |
︙ | ︙ | |||
938 939 940 941 942 943 944 | ItclClass *iclsPtr; Tcl_HashEntry *hPtr; ItclVarLookup *vlookup; Tcl_DString optName; Tcl_Obj *listPtr; Tcl_Obj *objPtr; | | | | | | 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 | ItclClass *iclsPtr; Tcl_HashEntry *hPtr; ItclVarLookup *vlookup; Tcl_DString optName; Tcl_Obj *listPtr; Tcl_Obj *objPtr; listPtr = Tcl_NewListObj(0, NULL); /* * Determine how the option name should be reported. * If the simple name can be used to find it in the virtual * data table, then use the simple name. Otherwise, this * is a shadowed variable; use the full name. */ Tcl_DStringInit(&optName); Tcl_DStringAppend(&optName, "-", -1); iclsPtr = (ItclClass*)contextIoPtr->iclsPtr; hPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, Tcl_GetString(ivPtr->fullNamePtr)); assert(hPtr != NULL); vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); Tcl_DStringAppend(&optName, vlookup->leastQualName, -1); objPtr = Tcl_NewStringObj(Tcl_DStringValue(&optName), -1); Tcl_ListObjAppendElement(NULL, listPtr, objPtr); Tcl_DStringFree(&optName); if (ivPtr->init) { objPtr = ivPtr->init; } else { objPtr = Tcl_NewStringObj("<undefined>", -1); } Tcl_ListObjAppendElement(NULL, listPtr, objPtr); val = Itcl_GetInstanceVar(interp, Tcl_GetString(ivPtr->namePtr), contextIoPtr, ivPtr->iclsPtr); if (val) { objPtr = Tcl_NewStringObj((const char *)val, -1); } else { objPtr = Tcl_NewStringObj("<undefined>", -1); } Tcl_ListObjAppendElement(NULL, listPtr, objPtr); return listPtr; } /* * ------------------------------------------------------------------------ * ItclReportOption() |
︙ | ︙ | |||
1005 1006 1007 1008 1009 1010 1011 | ItclObject *contextIoPtr) /* object containing this variable */ { Tcl_Obj *listPtr; Tcl_Obj *objPtr; ItclDelegatedOption *idoPtr; const char *val; | | | | | | | | | | | | | 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 | ItclObject *contextIoPtr) /* object containing this variable */ { Tcl_Obj *listPtr; Tcl_Obj *objPtr; ItclDelegatedOption *idoPtr; const char *val; listPtr = Tcl_NewListObj(0, NULL); idoPtr = ioptPtr->iclsPtr->infoPtr->currIdoPtr; if (idoPtr != NULL) { Tcl_ListObjAppendElement(NULL, listPtr, idoPtr->namePtr); if (idoPtr->resourceNamePtr == NULL) { Tcl_ListObjAppendElement(NULL, listPtr, Tcl_NewStringObj("", -1)); /* FIXME possible memory leak */ } else { Tcl_ListObjAppendElement(NULL, listPtr, idoPtr->resourceNamePtr); } if (idoPtr->classNamePtr == NULL) { Tcl_ListObjAppendElement(NULL, listPtr, Tcl_NewStringObj("", -1)); /* FIXME possible memory leak */ } else { Tcl_ListObjAppendElement(NULL, listPtr, idoPtr->classNamePtr); } } else { Tcl_ListObjAppendElement(NULL, listPtr, ioptPtr->namePtr); Tcl_ListObjAppendElement(NULL, listPtr, ioptPtr->resourceNamePtr); Tcl_ListObjAppendElement(NULL, listPtr, ioptPtr->classNamePtr); } if (ioptPtr->defaultValuePtr) { objPtr = ioptPtr->defaultValuePtr; } else { objPtr = Tcl_NewStringObj("<undefined>", -1); } Tcl_ListObjAppendElement(NULL, listPtr, objPtr); val = ItclGetInstanceVar(interp, "itcl_options", Tcl_GetString(ioptPtr->namePtr), contextIoPtr, ioptPtr->iclsPtr); if (val) { objPtr = Tcl_NewStringObj((const char *)val, -1); } else { objPtr = Tcl_NewStringObj("<undefined>", -1); } Tcl_ListObjAppendElement(NULL, listPtr, objPtr); return listPtr; } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
1073 1074 1075 1076 1077 1078 1079 | * This allows a base class method to be called out in a generic way, * so the code will not have to change if the base class changes. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int NRBiChainCmd( | | | 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 | * This allows a base class method to be called out in a generic way, * so the code will not have to change if the base class changes. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int NRBiChainCmd( void *dummy, /* not used */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { int result = TCL_OK; ItclClass *contextIclsPtr; |
︙ | ︙ | |||
1109 1110 1111 1112 1113 1114 1115 | * signal an error. */ contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot chain functions outside of a class context", | | | 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 | * signal an error. */ contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot chain functions outside of a class context", NULL); return TCL_ERROR; } /* * Try to get the command name from the current call frame. * If it cannot be determined, do nothing. Otherwise, trim * off any leading path names. |
︙ | ︙ | |||
1183 1184 1185 1186 1187 1188 1189 | * methods by passing the full name as * the command argument. */ cmdlinePtr = Itcl_CreateArgs(interp, Tcl_GetString(imPtr->fullNamePtr), objc-1, objv+1); | | | 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 | * methods by passing the full name as * the command argument. */ cmdlinePtr = Itcl_CreateArgs(interp, Tcl_GetString(imPtr->fullNamePtr), objc-1, objv+1); (void) Tcl_ListObjGetElements(NULL, cmdlinePtr, &my_objc, &newobjv); if (imPtr->flags & ITCL_CONSTRUCTOR) { contextIoPtr = imPtr->iclsPtr->infoPtr->currIoPtr; } ItclShowArgs(1, "___chain", objc-1, newobjv+1); result = Itcl_EvalMemberCode(interp, imPtr, contextIoPtr, |
︙ | ︙ | |||
1205 1206 1207 1208 1209 1210 1211 | Tcl_DStringFree(&buffer); Itcl_DeleteHierIter(&hier); return result; } /* ARGSUSED */ int Itcl_BiChainCmd( | | | | | | 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 | Tcl_DStringFree(&buffer); Itcl_DeleteHierIter(&hier); return result; } /* ARGSUSED */ int Itcl_BiChainCmd( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) { return Tcl_NRCallObjProc(interp, NRBiChainCmd, clientData, objc, objv); } static int CallCreateObject( void *data[], Tcl_Interp *interp, int result) { Tcl_CallFrame frame; Tcl_Namespace *nsPtr; ItclClass *iclsPtr = (ItclClass *)data[0]; int objc = PTR2INT(data[1]); Tcl_Obj *const *objv = (Tcl_Obj *const *)data[2]; if (result != TCL_OK) { return result; } nsPtr = Itcl_GetUplevelNamespace(interp, 1); if (Itcl_PushCallFrame(interp, &frame, nsPtr, /*isProcCallFrame*/0) != TCL_OK) { |
︙ | ︙ | |||
1284 1285 1286 1287 1288 1289 1290 | Tcl_IncrRefCount(newObjv[1]); newObjv[2] = Tcl_NewStringObj(iclsPtr->nsPtr->fullName, -1); Tcl_IncrRefCount(newObjv[2]); memcpy(newObjv+3, objv+offset, (objc-offset) * sizeof(Tcl_Obj *)); callbackPtr = Itcl_GetCurrentCallbackPtr(interp); ItclShowArgs(1, "CREATE", objc+3-offset, newObjv); Tcl_NRAddCallback(interp, CallCreateObject, iclsPtr, | | | 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 | Tcl_IncrRefCount(newObjv[1]); newObjv[2] = Tcl_NewStringObj(iclsPtr->nsPtr->fullName, -1); Tcl_IncrRefCount(newObjv[2]); memcpy(newObjv+3, objv+offset, (objc-offset) * sizeof(Tcl_Obj *)); callbackPtr = Itcl_GetCurrentCallbackPtr(interp); ItclShowArgs(1, "CREATE", objc+3-offset, newObjv); Tcl_NRAddCallback(interp, CallCreateObject, iclsPtr, INT2PTR(objc+3-offset), newObjv, NULL); result = Itcl_NRRunCallbacks(interp, callbackPtr); if (result != TCL_OK) { if (iclsPtr->infoPtr->currIoPtr != NULL) { /* we are in a constructor call */ if (iclsPtr->infoPtr->currIoPtr->hadConstructorError == 0) { iclsPtr->infoPtr->currIoPtr->hadConstructorError = 1; } |
︙ | ︙ | |||
1312 1313 1314 1315 1316 1317 1318 | * classunknown <object> <methodname> ?<arg> <arg>...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclBiClassUnknownCmd( | | | 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 | * classunknown <object> <methodname> ?<arg> <arg>...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclBiClassUnknownCmd( void *clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { FOREACH_HASH_DECLS; Tcl_HashEntry *hPtr2; Tcl_Obj **newObjv; |
︙ | ︙ | |||
1359 1360 1361 1362 1363 1364 1365 | hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)Tcl_GetCurrentNamespace(interp)); if (hPtr == NULL) { Tcl_AppendResult(interp, "INTERNAL ERROR: ItclBiClassUnknownCmd ", "cannot find class\n", NULL); return TCL_ERROR; } | | | 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 | hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)Tcl_GetCurrentNamespace(interp)); if (hPtr == NULL) { Tcl_AppendResult(interp, "INTERNAL ERROR: ItclBiClassUnknownCmd ", "cannot find class\n", NULL); return TCL_ERROR; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); funcName = Tcl_GetString(objv[1]); if (strcmp(funcName, "create") == 0) { /* check if we have a user method create. If not, it is the builtin * create method and we don't need to check for delegation * and components with ITCL_COMPONENT_INHERIT */ hPtr = Tcl_FindHashEntry(&iclsPtr->resolveCmds, (char *)objv[1]); |
︙ | ︙ | |||
1427 1428 1429 1430 1431 1432 1433 | if (hPtr == NULL) { objPtr = Tcl_NewStringObj("*", -1); Tcl_IncrRefCount(objPtr); hPtr = Tcl_FindHashEntry(&iclsPtr->delegatedFunctions, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr != NULL) { | | | 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 | if (hPtr == NULL) { objPtr = Tcl_NewStringObj("*", -1); Tcl_IncrRefCount(objPtr); hPtr = Tcl_FindHashEntry(&iclsPtr->delegatedFunctions, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr != NULL) { idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); isStar = 1; } } if (isStar) { /* check if the function is in the exceptions */ hPtr2 = Tcl_FindHashEntry(&starIdmPtr->exceptions, (char *)objv[1]); if (hPtr2 != NULL) { |
︙ | ︙ | |||
1455 1456 1457 1458 1459 1460 1461 | } } Tcl_SetObjResult(interp, objPtr); return TCL_ERROR; } } if (hPtr != NULL) { | | | 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 | } } Tcl_SetObjResult(interp, objPtr); return TCL_ERROR; } } if (hPtr != NULL) { idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); val = NULL; if (idmPtr->icPtr != NULL) { if (idmPtr->icPtr->ivPtr->flags & ITCL_COMMON) { val = Tcl_GetVar2(interp, Tcl_GetString(idmPtr->icPtr->namePtr), NULL, 0); } else { ItclClass *contextIclsPtr; |
︙ | ︙ | |||
1621 1622 1623 1624 1625 1626 1627 | int isStar; int isTypeMethod; int isNew; int idx; if (objc < 2) { Tcl_AppendResult(interp, "wrong # args: should be one of...", | | | 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 | int isStar; int isTypeMethod; int isNew; int idx; if (objc < 2) { Tcl_AppendResult(interp, "wrong # args: should be one of...", NULL); ItclReportObjectUsage(interp, ioPtr, NULL, NULL); return TCL_ERROR; } iclsPtr = ioPtr->iclsPtr; lObjc = 0; offset = 1; isStar = 0; |
︙ | ︙ | |||
1690 1691 1692 1693 1694 1695 1696 | if (hPtr == NULL) { objPtr = Tcl_NewStringObj("*", -1); Tcl_IncrRefCount(objPtr); hPtr = Tcl_FindHashEntry(&iclsPtr->delegatedFunctions, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr != NULL) { | | | | | 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 | if (hPtr == NULL) { objPtr = Tcl_NewStringObj("*", -1); Tcl_IncrRefCount(objPtr); hPtr = Tcl_FindHashEntry(&iclsPtr->delegatedFunctions, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr != NULL) { idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); isStar = 1; } } else { found = 1; idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); } if (isStar) { /* check if the function is in the exceptions */ hPtr2 = Tcl_FindHashEntry(&idmPtr->exceptions, (char *)objv[1]); if (hPtr2 != NULL) { const char *sep = ""; objPtr = Tcl_NewStringObj("unknown subcommand \"", -1); |
︙ | ︙ | |||
1776 1777 1778 1779 1780 1781 1782 | sep = " or "; } } } } if (idmPtr == NULL) { Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]), | | | 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 | sep = " or "; } } } } if (idmPtr == NULL) { Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]), "\": should be one of...", NULL); ItclReportObjectUsage(interp, ioPtr, NULL, NULL); return TCL_ERROR; } lObjc = 0; if ((idmPtr != NULL) && ((idmPtr->asPtr != NULL) || (idmPtr->usingPtr != NULL))) { offset++; |
︙ | ︙ | |||
1920 1921 1922 1923 1924 1925 1926 | * option changes, a big of "config" code associated with the option * is executed, to bring the object up to date. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclExtendedConfigure( | | | 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 | * option changes, a big of "config" code associated with the option * is executed, to bring the object up to date. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclExtendedConfigure( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { FOREACH_HASH_DECLS; Tcl_HashTable unique; Tcl_HashEntry *hPtr2; |
︙ | ︙ | |||
1981 1982 1983 1984 1985 1986 1987 | return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", | | | 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 | return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", NULL); return TCL_ERROR; } /* * BE CAREFUL: work in the virtual scope! */ if (contextIoPtr != NULL) { |
︙ | ︙ | |||
2587 2588 2589 2590 2591 2592 2593 | * Tk widgets. Returns the current value of the public variable * with name <option>. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclExtendedCget( | | | 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 | * Tk widgets. Returns the current value of the public variable * with name <option>. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclExtendedCget( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_HashEntry *hPtr; Tcl_HashEntry *hPtr2; Tcl_HashEntry *hPtr3; |
︙ | ︙ | |||
2624 2625 2626 2627 2628 2629 2630 | contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if ((contextIoPtr == NULL) || objc != 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object cget -option\"", | | | 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 | contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if ((contextIoPtr == NULL) || objc != 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object cget -option\"", NULL); return TCL_ERROR; } /* * BE CAREFUL: work in the virtual scope! */ if (contextIoPtr != NULL) { |
︙ | ︙ | |||
2825 2826 2827 2828 2829 2830 2831 | * this sets the variable to the value calling a callback if exists: * * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclExtendedSetGet( | | | 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 | * this sets the variable to the value calling a callback if exists: * * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int ItclExtendedSetGet( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { ItclClass *contextIclsPtr; ItclObject *contextIoPtr; |
︙ | ︙ | |||
2857 2858 2859 2860 2861 2862 2863 | if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } usageStr = "improper usage: should be \"object setget varName ?value?\""; if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), | | | | 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 | if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } usageStr = "improper usage: should be \"object setget varName ?value?\""; if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), usageStr, NULL); return TCL_ERROR; } /* * BE CAREFUL: work in the virtual scope! */ if (contextIoPtr != NULL) { contextIclsPtr = contextIoPtr->iclsPtr; } infoPtr = contextIclsPtr->infoPtr; if (infoPtr->currContextIclsPtr != NULL) { contextIclsPtr = infoPtr->currContextIclsPtr; } hPtr = NULL; if (objc < 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), usageStr, NULL); return TCL_ERROR; } /* look if it is an methodvariable at all */ hPtr = Tcl_FindHashEntry(&contextIoPtr->objectMethodVariables, (char *) objv[1]); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such methodvariable \"", |
︙ | ︙ | |||
2943 2944 2945 2946 2947 2948 2949 | * ?-option value -option value ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiInstallComponentCmd( | | | 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 | * ?-option value -option value ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiInstallComponentCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { FOREACH_HASH_DECLS; Tcl_Obj ** newObjv; ItclClass *contextIclsPtr; |
︙ | ︙ | |||
2974 2975 2976 2977 2978 2979 2980 | if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object installcomponent \"", | | | | 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 | if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "improper usage: should be \"object installcomponent \"", NULL); return TCL_ERROR; } if (objc < 5) { /* FIXME strip off the :: parts here properly*/ token = Tcl_GetString(objv[0])+2; Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " <componentName> using", " <widgetClassName> <widgetPathName>", " ?-option value -option value ...?\"", NULL); return TCL_ERROR; } /* get component name and check, if it exists */ token = Tcl_GetString(objv[1]); if (contextIclsPtr == NULL) { Tcl_AppendResult(interp, "cannot find context class for object \"", |
︙ | ︙ | |||
3078 3079 3080 3081 3082 3083 3084 | * destroy * * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int Itcl_BiDestroyCmd( | | | 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 | * destroy * * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int Itcl_BiDestroyCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_Obj **newObjv; ItclClass *contextIclsPtr; ItclObject *contextIoPtr; |
︙ | ︙ | |||
3125 3126 3127 3128 3129 3130 3131 | Tcl_DecrRefCount(newObjv[2]); Tcl_DecrRefCount(newObjv[1]); Tcl_DecrRefCount(newObjv[0]); return result; } if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), | | | 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 | Tcl_DecrRefCount(newObjv[2]); Tcl_DecrRefCount(newObjv[1]); Tcl_DecrRefCount(newObjv[0]); return result; } if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", Tcl_GetString(objv[0]), NULL); return TCL_ERROR; } if (contextIoPtr != NULL) { Tcl_Obj *objPtr = Tcl_NewObj(); Tcl_GetCommandFullName(interp, contextIoPtr->accessCmd, objPtr); Itcl_RenameCommand(interp, Tcl_GetString(objPtr), ""); |
︙ | ︙ | |||
3155 3156 3157 3158 3159 3160 3161 | * callinstance <instanceName> ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiCallInstanceCmd( | | | 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 | * callinstance <instanceName> ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiCallInstanceCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_HashEntry *hPtr; Tcl_Obj *objPtr; Tcl_Obj **newObjv; |
︙ | ︙ | |||
3183 3184 3185 3186 3187 3188 3189 | return TCL_ERROR; } if (objc < 2) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " <instanceName>", | | | | 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 | return TCL_ERROR; } if (objc < 2) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " <instanceName>", NULL); return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&contextIclsPtr->infoPtr->instances, Tcl_GetString(objv[1])); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such instanceName \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } ioPtr = (ItclObject *)Tcl_GetHashValue(hPtr); objPtr =Tcl_NewObj(); Tcl_GetCommandFullName(interp, ioPtr->accessCmd, objPtr); newObjv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj*) * (objc - 1)); newObjv[0] = objPtr; Tcl_IncrRefCount(newObjv[0]); memcpy(newObjv + 1, objv + 2, sizeof(Tcl_Obj *) * (objc - 2)); result = Tcl_EvalObjv(interp, objc - 1, newObjv, 0); |
︙ | ︙ | |||
3222 3223 3224 3225 3226 3227 3228 | * getinstancevar <instanceName> ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiGetInstanceVarCmd( | | | 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 | * getinstancevar <instanceName> ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiGetInstanceVarCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_HashEntry *hPtr; Tcl_Obj *objPtr; Tcl_Obj **newObjv; |
︙ | ︙ | |||
3250 3251 3252 3253 3254 3255 3256 | return TCL_ERROR; } if (objc < 2) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " <instanceName>", | | | | | 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 | return TCL_ERROR; } if (objc < 2) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " <instanceName>", NULL); return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&contextIclsPtr->infoPtr->instances, Tcl_GetString(objv[1])); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such instanceName \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } ioPtr = (ItclObject *)Tcl_GetHashValue(hPtr); objPtr = Tcl_NewObj(); Tcl_GetCommandFullName(interp, ioPtr->accessCmd, objPtr); newObjv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj*) * (objc - 1)); newObjv[0] = objPtr; Tcl_IncrRefCount(newObjv[0]); memcpy(newObjv + 1, objv + 2, sizeof(Tcl_Obj *) * (objc - 2)); result = Tcl_EvalObjv(interp, objc - 1, newObjv, 0); Tcl_DecrRefCount(newObjv[0]); |
︙ | ︙ | |||
3288 3289 3290 3291 3292 3293 3294 | * mytypemethod ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyTypeMethodCmd( | | | 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 | * mytypemethod ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyTypeMethodCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_Obj *objPtr; Tcl_Obj *resultPtr; ItclClass *contextIclsPtr; |
︙ | ︙ | |||
3338 3339 3340 3341 3342 3343 3344 | * mymethod ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyMethodCmd( | | | 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 | * mymethod ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyMethodCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_Obj *resultPtr; int i; ItclClass *contextIclsPtr; |
︙ | ︙ | |||
3387 3388 3389 3390 3391 3392 3393 | * myproc ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyProcCmd( | | | 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 | * myproc ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyProcCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_Obj *objPtr; Tcl_Obj *resultPtr; ItclClass *contextIclsPtr; |
︙ | ︙ | |||
3438 3439 3440 3441 3442 3443 3444 | * mytypevar ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyTypeVarCmd( | | | 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 | * mytypevar ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyTypeVarCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_Obj *objPtr; Tcl_Obj *resultPtr; ItclClass *contextIclsPtr; |
︙ | ︙ | |||
3490 3491 3492 3493 3494 3495 3496 | * myvar ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyVarCmd( | | | 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 | * myvar ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiMyVarCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_Obj *resultPtr; ItclClass *contextIclsPtr; ItclObject *contextIoPtr; |
︙ | ︙ | |||
3534 3535 3536 3537 3538 3539 3540 | * itcl_hull ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiItclHullCmd( | | | 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 | * itcl_hull ?arg arg ...? * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiItclHullCmd( void *clientData, /* class definition */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { ItclClass *contextIclsPtr; ItclObject *contextIoPtr; const char *val; |
︙ | ︙ | |||
3576 3577 3578 3579 3580 3581 3582 | * createhull <widget_type> <widget_path> ?-class <widgetClassName>? * ?<optionName> <optionValue> <optionName> <optionValue> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiCreateHullCmd( | | | 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 | * createhull <widget_type> <widget_path> ?-class <widgetClassName>? * ?<optionName> <optionValue> <optionName> <optionValue> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiCreateHullCmd( void *clientData, /* info for all known objects */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { int result; ItclObjectInfo *infoPtr = (ItclObjectInfo*)clientData; |
︙ | ︙ | |||
3611 3612 3613 3614 3615 3616 3617 | * setupcomponent <componentName> using <widgetType> <widget_path> * ?<optionName> <optionValue> <optionName> <optionValue> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiSetupComponentCmd( | | | 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 | * setupcomponent <componentName> using <widgetType> <widget_path> * ?<optionName> <optionValue> <optionName> <optionValue> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiSetupComponentCmd( void *clientData, /* info for all known objects */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { int result; ItclObjectInfo *infoPtr = (ItclObjectInfo*)clientData; |
︙ | ︙ | |||
3647 3648 3649 3650 3651 3652 3653 | * ?<optionName> <optionValue> <optionName> <optionValue> ...? * FIXME !!!! seems no longer been used !!! * * ------------------------------------------------------------------------ */ static int Itcl_BiInitOptionsCmd( | | | 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 | * ?<optionName> <optionValue> <optionName> <optionValue> ...? * FIXME !!!! seems no longer been used !!! * * ------------------------------------------------------------------------ */ static int Itcl_BiInitOptionsCmd( void *clientData, /* info for all known objects */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { int result; ItclObjectInfo *infoPtr = (ItclObjectInfo*)clientData; ItclClass *iclsPtr; |
︙ | ︙ | |||
3699 3700 3701 3702 3703 3704 3705 | * * keepcomponentoption <componentName> <optionName> ?<optionName> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiKeepComponentOptionCmd( | | | 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 | * * keepcomponentoption <componentName> <optionName> ?<optionName> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiKeepComponentOptionCmd( void *clientData, /* info for all known objects */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { int result; ItclObjectInfo *infoPtr = (ItclObjectInfo*)clientData; |
︙ | ︙ | |||
3734 3735 3736 3737 3738 3739 3740 | * * ignorecomponentoption <componentName> <optionName> ?<optionName> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiIgnoreComponentOptionCmd( | | | 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 | * * ignorecomponentoption <componentName> <optionName> ?<optionName> ...? * * ------------------------------------------------------------------------ */ static int Itcl_BiIgnoreComponentOptionCmd( void *clientData, /* info for all known objects */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { Tcl_HashEntry *hPtr; Tcl_HashEntry *hPtr2; Tcl_Obj *objPtr; |
︙ | ︙ | |||
3777 3778 3779 3780 3781 3782 3783 | hPtr = Tcl_FindHashEntry(&ioPtr->objectComponents, (char *)objv[1]); if (hPtr == NULL) { Tcl_AppendResult(interp, "ignorecomponentoption cannot find component \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } | | | 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 | hPtr = Tcl_FindHashEntry(&ioPtr->objectComponents, (char *)objv[1]); if (hPtr == NULL) { Tcl_AppendResult(interp, "ignorecomponentoption cannot find component \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); icPtr->haveKeptOptions = 1; for (idx = 2; idx < objc; idx++) { hPtr = Tcl_CreateHashEntry(&icPtr->keptOptions, (char *)objv[idx], &isNew); if (isNew) { Tcl_SetHashValue(hPtr, objv[idx]); } |
︙ | ︙ |
Changes to generic/itclClass.c.
︙ | ︙ | |||
66 67 68 69 70 71 72 | * ------------------------------------------------------------------------ * Itcl_DeleteMemberFunc() * * ------------------------------------------------------------------------ */ void Itcl_DeleteMemberFunc ( | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | * ------------------------------------------------------------------------ * Itcl_DeleteMemberFunc() * * ------------------------------------------------------------------------ */ void Itcl_DeleteMemberFunc ( void *cdata) { /* needed for stubs compatibility */ ItclMemberFunc *imPtr; imPtr = (ItclMemberFunc *)cdata; if (imPtr == NULL) { /* FIXME need code here */ |
︙ | ︙ | |||
89 90 91 92 93 94 95 | * ------------------------------------------------------------------------ */ static void ItclDestroyClass2( ClientData clientData) /* The class being deleted. */ { | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | * ------------------------------------------------------------------------ */ static void ItclDestroyClass2( ClientData clientData) /* The class being deleted. */ { ItclClass *iclsPtr = (ItclClass *)clientData; ItclDestroyClassNamesp(iclsPtr); ItclReleaseClass(iclsPtr); } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
111 112 113 114 115 116 117 | ClientData clientData) { /* * This is how we get alerted from TclOO that the object corresponding * to an Itcl class (or its namespace...) is being torn down. */ | | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | ClientData clientData) { /* * This is how we get alerted from TclOO that the object corresponding * to an Itcl class (or its namespace...) is being torn down. */ ItclClass *iclsPtr = (ItclClass *)clientData; Tcl_Object oPtr = iclsPtr->oPtr; Tcl_Namespace *ooNsPtr = Tcl_GetObjectNamespace(oPtr); if (ooNsPtr != iclsPtr->nsPtr) { /* * Itcl's idea of the class namespace is different from that of TclOO. * Make sure both get torn down and pulled from tables. |
︙ | ︙ | |||
138 139 140 141 142 143 144 | static int CallNewObjectInstance( ClientData data[], Tcl_Interp *interp, int result) { | | | | | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | static int CallNewObjectInstance( ClientData data[], Tcl_Interp *interp, int result) { ItclObjectInfo *infoPtr = (ItclObjectInfo *)data[0]; const char *path = (const char *)data[1]; Tcl_Object *oPtr = (Tcl_Object *)data[2]; Tcl_Obj *nameObjPtr = (Tcl_Obj *)data[3]; *oPtr = NULL; if (infoPtr->clazzClassPtr) { *oPtr = Tcl_NewObjectInstance(interp, infoPtr->clazzClassPtr, path, path, 0, NULL, 0); } if (*oPtr == NULL) { |
︙ | ︙ | |||
212 213 214 215 216 217 218 | * already exist in the current namespace context. If a * namespace exists, that's okay. It may have been created * to contain stubs during a "namespace import" operation. * We'll just replace the namespace data below with the * proper class data. */ classNs = Tcl_FindNamespace(interp, (const char *)path, | | | | | | | | | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | * already exist in the current namespace context. If a * namespace exists, that's okay. It may have been created * to contain stubs during a "namespace import" operation. * We'll just replace the namespace data below with the * proper class data. */ classNs = Tcl_FindNamespace(interp, (const char *)path, NULL, /* flags */ 0); if (classNs != NULL && Itcl_IsClassNamespace(classNs)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "class \"", path, "\" already exists", NULL); return TCL_ERROR; } oPtr = NULL; /* * Make sure that a command with the given class name does not * already exist in the current namespace. This prevents the * usual Tcl commands from being clobbered when a programmer * makes a bogus call like "class info". */ cmd = Tcl_FindCommand(interp, (const char *)path, NULL, /* flags */ TCL_NAMESPACE_ONLY); if (cmd != NULL && !Itcl_IsStub(cmd)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "command \"", path, "\" already exists", NULL); if (strstr(path,"::") == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), " in namespace \"", Tcl_GetCurrentNamespace(interp)->fullName, "\"", NULL); } return TCL_ERROR; } /* * Make sure that the class name does not have any goofy * characters: * * . => reserved for member access like: class.publicVar */ Itcl_ParseNamespPath(path, &buffer, &head, &tail); if (strstr(tail,".")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad class name \"", tail, "\"", NULL); Tcl_DStringFree(&buffer); return TCL_ERROR; } Tcl_DStringFree(&buffer); /* * Allocate class definition data. */ iclsPtr = (ItclClass*)ckalloc(sizeof(ItclClass)); memset(iclsPtr, 0, sizeof(ItclClass)); iclsPtr->interp = interp; iclsPtr->infoPtr = infoPtr; Itcl_PreserveData(infoPtr); Tcl_InitObjHashTable(&iclsPtr->variables); Tcl_InitObjHashTable(&iclsPtr->functions); Tcl_InitObjHashTable(&iclsPtr->options); Tcl_InitObjHashTable(&iclsPtr->components); Tcl_InitObjHashTable(&iclsPtr->delegatedOptions); Tcl_InitObjHashTable(&iclsPtr->delegatedFunctions); |
︙ | ︙ | |||
346 347 348 349 350 351 352 | callbackPtr = Itcl_GetCurrentCallbackPtr(interp); /* * Create a command in the current namespace to manage the class: * <className> * <className> <objName> ?<constructor-args>? */ Tcl_NRAddCallback(interp, CallNewObjectInstance, infoPtr, | | | | 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | callbackPtr = Itcl_GetCurrentCallbackPtr(interp); /* * Create a command in the current namespace to manage the class: * <className> * <className> <objName> ?<constructor-args>? */ Tcl_NRAddCallback(interp, CallNewObjectInstance, infoPtr, (void *)path, &oPtr, nameObjPtr); result = Itcl_NRRunCallbacks(interp, callbackPtr); if (result == TCL_ERROR) { result = TCL_ERROR; goto errorOut; } iclsPtr->clsPtr = Tcl_GetObjectAsClass(oPtr); iclsPtr->oPtr = oPtr; ItclPreserveClass(iclsPtr); Tcl_ObjectSetMetadata(iclsPtr->oPtr, infoPtr->class_meta_type, iclsPtr); cmd = Tcl_GetObjectCommand(iclsPtr->oPtr); Tcl_GetCommandInfoFromToken(cmd, &cmdInfo); cmdInfo.deleteProc = ItclDestroyClass; cmdInfo.deleteData = iclsPtr; Tcl_SetCommandInfoFromToken(cmd, &cmdInfo); ooNs = Tcl_GetObjectNamespace(oPtr); classNs = Tcl_FindNamespace(interp, Tcl_GetString(nameObjPtr), NULL, /* flags */ 0); if (_TclOONamespaceDeleteProc == NULL) { _TclOONamespaceDeleteProc = ooNs->deleteProc; } if (classNs == NULL) { Tcl_AppendResult(interp, "ITCL: cannot create/get class namespace for class \"", |
︙ | ︙ | |||
399 400 401 402 403 404 405 | Tcl_IncrRefCount(iclsPtr->namePtr); iclsPtr->fullNamePtr = Tcl_NewStringObj(classNs->fullName, -1); Tcl_IncrRefCount(iclsPtr->fullNamePtr); hPtr = Tcl_CreateHashEntry(&infoPtr->nameClasses, (char *)iclsPtr->fullNamePtr, &newEntry); | | | | | | | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 | Tcl_IncrRefCount(iclsPtr->namePtr); iclsPtr->fullNamePtr = Tcl_NewStringObj(classNs->fullName, -1); Tcl_IncrRefCount(iclsPtr->fullNamePtr); hPtr = Tcl_CreateHashEntry(&infoPtr->nameClasses, (char *)iclsPtr->fullNamePtr, &newEntry); Tcl_SetHashValue(hPtr, iclsPtr); hPtr = Tcl_CreateHashEntry(&infoPtr->namespaceClasses, (char *)classNs, &newEntry); Tcl_SetHashValue(hPtr, iclsPtr); if (classNs != ooNs) { hPtr = Tcl_CreateHashEntry(&infoPtr->namespaceClasses, (char *)ooNs, &newEntry); Tcl_SetHashValue(hPtr, iclsPtr); if (classNs->clientData && classNs->deleteProc) { (*classNs->deleteProc)(classNs->clientData); } classNs->clientData = iclsPtr; classNs->deleteProc = ItclDestroyClass2; } hPtr = Tcl_CreateHashEntry(&infoPtr->classes, (char *)iclsPtr, &newEntry); Tcl_SetHashValue(hPtr, iclsPtr); /* * now build the namespace for the common private and protected variables * public variables go directly to the class namespace */ Tcl_DStringInit(&buffer); Tcl_DStringAppend(&buffer, ITCL_VARIABLES_NAMESPACE, -1); |
︙ | ︙ | |||
452 453 454 455 456 457 458 | Itcl_ThisCmd, iclsPtr, NULL); /* * Add the built-in "type" variable to the list of data members. */ if (iclsPtr->flags & ITCL_TYPE) { namePtr = Tcl_NewStringObj("type", -1); | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 | Itcl_ThisCmd, iclsPtr, NULL); /* * Add the built-in "type" variable to the list of data members. */ if (iclsPtr->flags & ITCL_TYPE) { namePtr = Tcl_NewStringObj("type", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_TYPE_VAR; /* mark as "type" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); } if (iclsPtr->flags & (ITCL_ECLASS)) { namePtr = Tcl_NewStringObj("win", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_WIN_VAR; /* mark as "win" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); } if (iclsPtr->flags & (ITCL_TYPE|ITCL_WIDGET|ITCL_WIDGETADAPTOR)) { namePtr = Tcl_NewStringObj("self", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_SELF_VAR; /* mark as "self" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); namePtr = Tcl_NewStringObj("selfns", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_SELFNS_VAR; /* mark as "selfns" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); namePtr = Tcl_NewStringObj("win", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_WIN_VAR; /* mark as "win" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); } namePtr = Tcl_NewStringObj("this", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_THIS_VAR; /* mark as "this" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); if (infoPtr->currClassFlags & (ITCL_ECLASS|ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET)) { /* * Add the built-in "itcl_options" variable to the list of * data members. */ namePtr = Tcl_NewStringObj("itcl_options", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_OPTIONS_VAR; /* mark as "itcl_options" * variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); } if (infoPtr->currClassFlags & ITCL_ECLASS) { /* * Add the built-in "itcl_option_components" variable to the list of * data members. */ namePtr = Tcl_NewStringObj("itcl_option_components", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_OPTION_COMP_VAR; /* mark as "itcl_option_components" * variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); } if (infoPtr->currClassFlags & (ITCL_WIDGET|ITCL_WIDGETADAPTOR)) { /* * Add the built-in "thiswin" variable to the list of data members. */ namePtr = Tcl_NewStringObj("thiswin", -1); (void) Itcl_CreateVariable(interp, iclsPtr, namePtr, NULL, NULL, &ivPtr); ivPtr->protection = ITCL_PROTECTED; /* always "protected" */ ivPtr->flags |= ITCL_THIS_VAR; /* mark as "thiswin" variable */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); Tcl_SetHashValue(hPtr, ivPtr); } if (infoPtr->currClassFlags & (ITCL_WIDGET|ITCL_WIDGETADAPTOR)) { /* create the itcl_hull component */ ItclComponent *icPtr; namePtr = Tcl_NewStringObj("itcl_hull", 9); /* itcl_hull must not be an ITCL_COMMON!! */ if (ItclCreateComponent(interp, iclsPtr, namePtr, 0, &icPtr) != |
︙ | ︙ | |||
613 614 615 616 617 618 619 | Tcl_Interp *interp, int result) { Tcl_HashEntry *hPtr; Tcl_HashSearch place; ItclClass *iclsPtr2 = NULL; ItclObject *contextIoPtr; | | | | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 | Tcl_Interp *interp, int result) { Tcl_HashEntry *hPtr; Tcl_HashSearch place; ItclClass *iclsPtr2 = NULL; ItclObject *contextIoPtr; ItclClass *iclsPtr = (ItclClass *)data[0]; ItclObjectInfo *infoPtr = (ItclObjectInfo *)data[1]; void *callbackPtr; int classIsDeleted; if (result != TCL_OK) { return result; } classIsDeleted = 0; |
︙ | ︙ | |||
680 681 682 683 684 685 686 | static int CallDeleteOneClass( ClientData data[], Tcl_Interp *interp, int result) { Tcl_HashEntry *hPtr; | | | | 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 | static int CallDeleteOneClass( ClientData data[], Tcl_Interp *interp, int result) { Tcl_HashEntry *hPtr; ItclClass *iclsPtr = (ItclClass *)data[0]; ItclObjectInfo *infoPtr = (ItclObjectInfo *)data[1]; int isDerivedReleased; if (result != TCL_OK) { return result; } isDerivedReleased = iclsPtr->flags & ITCL_CLASS_DERIVED_RELEASED; result = Itcl_DeleteClass(interp, iclsPtr); |
︙ | ︙ | |||
732 733 734 735 736 737 738 | Tcl_HashEntry *hPtr; ItclObjectInfo *infoPtr; ItclClass *iclsPtr2 = NULL; Itcl_ListElem *elem; void *callbackPtr; int result; | | | 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 | Tcl_HashEntry *hPtr; ItclObjectInfo *infoPtr; ItclClass *iclsPtr2 = NULL; Itcl_ListElem *elem; void *callbackPtr; int result; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->classes, (char *)iclsPtr); if (hPtr == NULL) { /* class has already been deleted */ return TCL_OK; } if (iclsPtr->flags & ITCL_CLASS_IS_DELETED) { return TCL_OK; |
︙ | ︙ | |||
1049 1050 1051 1052 1053 1054 1055 | * Tear down the virtual method table... */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->resolveCmds, &place); if (hPtr == NULL) { break; } | | | | 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 | * Tear down the virtual method table... */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->resolveCmds, &place); if (hPtr == NULL) { break; } clookupPtr = (ItclCmdLookup *)Tcl_GetHashValue(hPtr); ckfree((char *)clookupPtr); Tcl_DeleteHashEntry(hPtr); } Tcl_DeleteHashTable(&iclsPtr->resolveCmds); /* * Delete all option definitions. */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->options, &place); if (hPtr == NULL) { break; } ioptPtr = (ItclOption *)Tcl_GetHashValue(hPtr); Tcl_DeleteHashEntry(hPtr); Itcl_ReleaseData(ioptPtr); } Tcl_DeleteHashTable(&iclsPtr->options); /* * Delete all function definitions. |
︙ | ︙ | |||
1101 1102 1103 1104 1105 1106 1107 | } Tcl_DeleteHashTable(&iclsPtr->delegatedFunctions); /* * Delete all components */ while (1) { | | | | | | | | 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | } Tcl_DeleteHashTable(&iclsPtr->delegatedFunctions); /* * Delete all components */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->components, &place); if (hPtr == NULL) { break; } icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); Tcl_DeleteHashEntry(hPtr); if (icPtr != NULL) { ItclDeleteComponent(icPtr); } } Tcl_DeleteHashTable(&iclsPtr->components); /* * Delete all variable definitions. */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->variables, &place); if (hPtr == NULL) { break; } ivPtr = (ItclVariable *)Tcl_GetHashValue(hPtr); Tcl_DeleteHashEntry(hPtr); if (ivPtr != NULL) { Itcl_ReleaseData(ivPtr); } } Tcl_DeleteHashTable(&iclsPtr->variables); |
︙ | ︙ | |||
1200 1201 1202 1203 1204 1205 1206 | /* * Free up the object initialization code. */ if (iclsPtr->initCode) { Tcl_DecrRefCount(iclsPtr->initCode); } | | | 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 | /* * Free up the object initialization code. */ if (iclsPtr->initCode) { Tcl_DecrRefCount(iclsPtr->initCode); } Itcl_ReleaseData(iclsPtr->infoPtr); Tcl_DecrRefCount(iclsPtr->namePtr); Tcl_DecrRefCount(iclsPtr->fullNamePtr); if (iclsPtr->resolvePtr != NULL) { ckfree((char *)iclsPtr->resolvePtr->clientData); ckfree((char *)iclsPtr->resolvePtr); |
︙ | ︙ | |||
1294 1295 1296 1297 1298 1299 1300 | * Search for a namespace with the specified name, and if * one is found, see if it is a class namespace. */ Tcl_Namespace* classNs = Itcl_FindClassNamespace(interp, path); if (classNs) { | | | | 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 | * Search for a namespace with the specified name, and if * one is found, see if it is a class namespace. */ Tcl_Namespace* classNs = Itcl_FindClassNamespace(interp, path); if (classNs) { ItclObjectInfo *infoPtr = (ItclObjectInfo *) Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *) classNs); if (hPtr) { return (ItclClass *) Tcl_GetHashValue(hPtr); } } |
︙ | ︙ | |||
1328 1329 1330 1331 1332 1333 1334 | Tcl_DStringFree(&buf); return Itcl_FindClass(interp, path, 0); } Tcl_AppendResult(interp, "class \"", path, "\" not found in context \"", Tcl_GetCurrentNamespace(interp)->fullName, "\"", | | | 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 | Tcl_DStringFree(&buf); return Itcl_FindClass(interp, path, 0); } Tcl_AppendResult(interp, "class \"", path, "\" not found in context \"", Tcl_GetCurrentNamespace(interp)->fullName, "\"", NULL); return NULL; } /* * ------------------------------------------------------------------------ * Itcl_FindClassNamespace() |
︙ | ︙ | |||
1356 1357 1358 1359 1360 1361 1362 | * context, just like the normal command lookup. * * This procedure returns a pointer to the desired namespace, or * NULL if the namespace was not found. * ------------------------------------------------------------------------ */ Tcl_Namespace* | | | | | 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 | * context, just like the normal command lookup. * * This procedure returns a pointer to the desired namespace, or * NULL if the namespace was not found. * ------------------------------------------------------------------------ */ Tcl_Namespace* Itcl_FindClassNamespace( Tcl_Interp* interp, /* interpreter containing class */ const char* path) /* path name for class */ { Tcl_Namespace* contextNs = Tcl_GetCurrentNamespace(interp); Tcl_Namespace *classNs = Tcl_FindNamespace(interp, path, NULL, 0); if ( !classNs /* We didn't find it... */ && contextNs->parentPtr != NULL /* context is not global */ && (*path != ':' || *(path+1) != ':') /* path not FQ */ |
︙ | ︙ | |||
1384 1385 1386 1387 1388 1389 1390 | static int FinalizeCreateObject( ClientData data[], Tcl_Interp *interp, int result) { | | | | | | | 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 | static int FinalizeCreateObject( ClientData data[], Tcl_Interp *interp, int result) { Tcl_Obj *objNamePtr = (Tcl_Obj *)data[0]; ItclClass *iclsPtr = (ItclClass *)data[1]; if (result == TCL_OK) { if (!(iclsPtr->flags & (ITCL_TYPE|ITCL_WIDGET|ITCL_WIDGETADAPTOR))) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, Tcl_GetString(objNamePtr), NULL); } } Tcl_DecrRefCount(objNamePtr); return result; } static int CallCreateObject( ClientData data[], Tcl_Interp *interp, int result) { Tcl_Obj *objNamePtr = (Tcl_Obj *)data[0]; ItclClass *iclsPtr = (ItclClass *)data[1]; int objc = PTR2INT(data[2]); Tcl_Obj **objv = (Tcl_Obj **)data[3]; if (result == TCL_OK) { result = ItclCreateObject(interp, Tcl_GetString(objNamePtr), iclsPtr, objc, objv); } return result; } |
︙ | ︙ | |||
1534 1535 1536 1537 1538 1539 1540 | hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objv[2]); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such class: \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } | | | 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 | hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objv[2]); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such class: \"", Tcl_GetString(objv[1]), "\"", NULL); return TCL_ERROR; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * If the object name is "::", and if this is an old-style class * definition, then treat the remaining arguments as a command * in the class namespace. This used to be the way of invoking * a class proc, but the new syntax is "class::proc" (without * spaces). |
︙ | ︙ | |||
1556 1557 1558 1559 1560 1561 1562 | Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "syntax \"class :: proc\" is an anachronism\n", "[incr Tcl] no longer supports this syntax.\n", "Instead, remove the spaces from your procedure invocations:\n", " ", Tcl_GetString(objv[1]), "::", Tcl_GetString(objv[4]), " ?args?", | | | 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 | Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "syntax \"class :: proc\" is an anachronism\n", "[incr Tcl] no longer supports this syntax.\n", "Instead, remove the spaces from your procedure invocations:\n", " ", Tcl_GetString(objv[1]), "::", Tcl_GetString(objv[4]), " ?args?", NULL); return TCL_ERROR; } /* * Otherwise, we have a proper object name. Create a new instance * with that name. If the name contains "#auto", replace this with * a uniquely generated string based on the class name. |
︙ | ︙ | |||
1767 1768 1769 1770 1771 1772 1773 | nsPtr = iclsPtr2->nsPtr; while (1) { hPtr = Tcl_CreateHashEntry(&iclsPtr->resolveVars, Tcl_DStringValue(&buffer), &newEntry); if (newEntry) { | | | | 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 | nsPtr = iclsPtr2->nsPtr; while (1) { hPtr = Tcl_CreateHashEntry(&iclsPtr->resolveVars, Tcl_DStringValue(&buffer), &newEntry); if (newEntry) { Tcl_SetHashValue(hPtr, vlookup); vlookup->usage++; if (!vlookup->leastQualName) { vlookup->leastQualName = (char *) Tcl_GetHashKey(&iclsPtr->resolveVars, hPtr); } } if (nsPtr == NULL) { break; } |
︙ | ︙ | |||
1809 1810 1811 1812 1813 1814 1815 | * Clear the command resolution table. */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->resolveCmds, &place); if (hPtr == NULL) { break; } | | | 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 | * Clear the command resolution table. */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->resolveCmds, &place); if (hPtr == NULL) { break; } clookupPtr = (ItclCmdLookup *)Tcl_GetHashValue(hPtr); ckfree((char *)clookupPtr); Tcl_DeleteHashEntry(hPtr); } Tcl_DeleteHashTable(&iclsPtr->resolveCmds); Tcl_InitObjHashTable(&iclsPtr->resolveCmds); /* |
︙ | ︙ | |||
1850 1851 1852 1853 1854 1855 1856 | hPtr = Tcl_CreateHashEntry(&iclsPtr->resolveCmds, (char *)objPtr, &newEntry); if (newEntry) { clookupPtr = (ItclCmdLookup *)ckalloc(sizeof(ItclCmdLookup)); memset(clookupPtr, 0, sizeof(ItclCmdLookup)); clookupPtr->imPtr = imPtr; | | | 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 | hPtr = Tcl_CreateHashEntry(&iclsPtr->resolveCmds, (char *)objPtr, &newEntry); if (newEntry) { clookupPtr = (ItclCmdLookup *)ckalloc(sizeof(ItclCmdLookup)); memset(clookupPtr, 0, sizeof(ItclCmdLookup)); clookupPtr->imPtr = imPtr; Tcl_SetHashValue(hPtr, clookupPtr); } else { Tcl_DecrRefCount(objPtr); } if (nsPtr == NULL) { break; } |
︙ | ︙ | |||
1940 1941 1942 1943 1944 1945 1946 | */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); if (!newEntry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable name \"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | | 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 | */ hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry); if (!newEntry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable name \"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } /* * If this variable has some "config" code, try to capture * its implementation. */ if (config) { if (Itcl_CreateMemberCode(interp, iclsPtr, NULL, config, &mCodePtr) != TCL_OK) { Tcl_DeleteHashEntry(hPtr); return TCL_ERROR; } ItclPreserveMemberCode(mCodePtr); } else { mCodePtr = NULL; |
︙ | ︙ | |||
1988 1989 1990 1991 1992 1993 1994 | if (init != NULL) { ivPtr->init = Tcl_NewStringObj(init, -1); Tcl_IncrRefCount(ivPtr->init); } else { ivPtr->init = NULL; } | | | | | 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 | if (init != NULL) { ivPtr->init = Tcl_NewStringObj(init, -1); Tcl_IncrRefCount(ivPtr->init); } else { ivPtr->init = NULL; } Tcl_SetHashValue(hPtr, ivPtr); Itcl_PreserveData(ivPtr); Itcl_EventuallyFree(ivPtr, (Tcl_FreeProc *) Itcl_DeleteVariable); *ivPtrPtr = ivPtr; return TCL_OK; } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
2030 2031 2032 2033 2034 2035 2036 | hPtr = Tcl_CreateHashEntry(&iclsPtr->options, (char *)ioptPtr->namePtr, &newEntry); if (!newEntry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "option name \"", Tcl_GetString(ioptPtr->namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | | | | 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 | hPtr = Tcl_CreateHashEntry(&iclsPtr->options, (char *)ioptPtr->namePtr, &newEntry); if (!newEntry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "option name \"", Tcl_GetString(ioptPtr->namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } iclsPtr->numOptions++; ioptPtr->iclsPtr = iclsPtr; ioptPtr->codePtr = NULL; ioptPtr->fullNamePtr = Tcl_NewStringObj( Tcl_GetString(iclsPtr->fullNamePtr), -1); Tcl_AppendToObj(ioptPtr->fullNamePtr, "::", 2); Tcl_AppendToObj(ioptPtr->fullNamePtr, Tcl_GetString(ioptPtr->namePtr), -1); Tcl_IncrRefCount(ioptPtr->fullNamePtr); Tcl_SetHashValue(hPtr, ioptPtr); Itcl_PreserveData(ioptPtr); Itcl_EventuallyFree(ioptPtr, (Tcl_FreeProc *) ItclDeleteOption); return TCL_OK; } /* * ------------------------------------------------------------------------ * Itcl_CreateMethodVariable() * |
︙ | ︙ | |||
2085 2086 2087 2088 2089 2090 2091 | hPtr = Tcl_CreateHashEntry(&iclsPtr->methodVariables, (char *)namePtr, &isNew); if (!isNew) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "methdovariable name \"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString (iclsPtr->fullNamePtr), "\"", | | | 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 | hPtr = Tcl_CreateHashEntry(&iclsPtr->methodVariables, (char *)namePtr, &isNew); if (!isNew) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "methdovariable name \"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString (iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } Tcl_IncrRefCount(namePtr); /* * If everything looks good, create the option definition. */ |
︙ | ︙ | |||
2117 2118 2119 2120 2121 2122 2123 | Tcl_IncrRefCount(imvPtr->callbackPtr); } if (imvPtr->protection == ITCL_DEFAULT_PROTECT) { imvPtr->protection = ITCL_PROTECTED; } | | | 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 | Tcl_IncrRefCount(imvPtr->callbackPtr); } if (imvPtr->protection == ITCL_DEFAULT_PROTECT) { imvPtr->protection = ITCL_PROTECTED; } Tcl_SetHashValue(hPtr, imvPtr); *imvPtrPtr = imvPtr; return TCL_OK; } |
︙ | ︙ | |||
2170 2171 2172 2173 2174 2175 2176 | namePtr = Tcl_NewStringObj(lastCp, -1); Tcl_IncrRefCount(namePtr); hPtr = Tcl_FindHashEntry(&contextIclsPtr->variables, (char *)namePtr); Tcl_DecrRefCount(namePtr); if (hPtr == NULL) { return NULL; } | | | | 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 | namePtr = Tcl_NewStringObj(lastCp, -1); Tcl_IncrRefCount(namePtr); hPtr = Tcl_FindHashEntry(&contextIclsPtr->variables, (char *)namePtr); Tcl_DecrRefCount(namePtr); if (hPtr == NULL) { return NULL; } ivPtr = (ItclVariable *)Tcl_GetHashValue(hPtr); /* * Activate the namespace for the given class. That installs * the appropriate name resolution rules and by-passes any * security restrictions. */ if (lastCp == name) { /* 'name' is a simple name (this is untested!!!!) */ /* Use the context class passed in */ oPtr = contextIclsPtr->oPtr; } else { int code = TCL_ERROR; Tcl_Obj *classObjPtr = Tcl_NewStringObj(name, lastCp - name - 2); oPtr = Tcl_GetObjectFromObj(interp, classObjPtr); if (oPtr) { ItclClass *iclsPtr = (ItclClass *)Tcl_ObjectGetMetadata(oPtr, contextIclsPtr->infoPtr->class_meta_type); if (iclsPtr) { code = TCL_OK; assert(oPtr == iclsPtr->oPtr); /* |
︙ | ︙ | |||
2225 2226 2227 2228 2229 2230 2231 | Tcl_DStringAppend(&buffer, ITCL_VARIABLES_NAMESPACE, -1); } Tcl_DStringAppend(&buffer, (Tcl_GetObjectNamespace(oPtr))->fullName, -1); Tcl_DStringAppend(&buffer, "::", -1); Tcl_DStringAppend(&buffer, lastCp, -1); val = Tcl_GetVar2(interp, (const char *)Tcl_DStringValue(&buffer), | | | | | | | | | 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 | Tcl_DStringAppend(&buffer, ITCL_VARIABLES_NAMESPACE, -1); } Tcl_DStringAppend(&buffer, (Tcl_GetObjectNamespace(oPtr))->fullName, -1); Tcl_DStringAppend(&buffer, "::", -1); Tcl_DStringAppend(&buffer, lastCp, -1); val = Tcl_GetVar2(interp, (const char *)Tcl_DStringValue(&buffer), NULL, 0); Tcl_DStringFree(&buffer); return val; } /* * ------------------------------------------------------------------------ * Itcl_InitHierIter() * * Initializes an iterator for traversing the hierarchy of the given * class. Subsequent calls to Itcl_AdvanceHierIter() will return * the base classes in order from most-to-least specific. * ------------------------------------------------------------------------ */ void Itcl_InitHierIter( ItclHierIter *iter, /* iterator used for traversal */ ItclClass *iclsPtr) /* class definition for start of traversal */ { Itcl_InitStack(&iter->stack); Itcl_PushStack(iclsPtr, &iter->stack); iter->current = iclsPtr; } /* * ------------------------------------------------------------------------ * Itcl_DeleteHierIter() * * Destroys an iterator for traversing class hierarchies, freeing * all memory associated with it. * ------------------------------------------------------------------------ */ void Itcl_DeleteHierIter( ItclHierIter *iter) /* iterator used for traversal */ { Itcl_DeleteStack(&iter->stack); iter->current = NULL; } /* * ------------------------------------------------------------------------ |
︙ | ︙ |
Changes to generic/itclCmd.c.
︙ | ︙ | |||
51 52 53 54 55 56 57 | Tcl_Obj *const objv[]) /* argument objects */ { ClientData clientData2; Tcl_Object oPtr; ItclClass *iclsPtr; ItclShowArgs(1, "NRThisCmd", objc, objv); | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | Tcl_Obj *const objv[]) /* argument objects */ { ClientData clientData2; Tcl_Object oPtr; ItclClass *iclsPtr; ItclShowArgs(1, "NRThisCmd", objc, objv); iclsPtr = (ItclClass *)clientData; clientData2 = Itcl_GetCallFrameClientData(interp); oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData2); return Itcl_PublicObjectCmd(oPtr, interp, iclsPtr->clsPtr, objc, objv); } /* ARGSUSED */ int Itcl_ThisCmd( ClientData clientData, Tcl_Interp *interp, |
︙ | ︙ | |||
78 79 80 81 82 83 84 | const char *val; int result; if (objc == 1) { return Itcl_SelfCmd(clientData,interp, objc, objv); } ItclShowArgs(1, "Itcl_ThisCmd", objc, objv); | | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | const char *val; int result; if (objc == 1) { return Itcl_SelfCmd(clientData,interp, objc, objv); } ItclShowArgs(1, "Itcl_ThisCmd", objc, objv); iclsPtr = (ItclClass *)clientData; clientData2 = Itcl_GetCallFrameClientData(interp); if (clientData2 == NULL) { Tcl_AppendResult(interp, "this cannot be invoked without an object context", NULL); return TCL_ERROR; } oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData2); if (oPtr == NULL) { Tcl_AppendResult(interp, "this cannot be invoked without an object context", NULL); return TCL_ERROR; } if (objc == 1) { Tcl_Obj *namePtr = Tcl_NewObj(); |
︙ | ︙ | |||
207 208 209 210 211 212 213 | * Search through all commands in the current namespace first, * in the global namespace next, then in all child namespaces * in this interpreter. If we find any commands that * represent classes, report them. */ Itcl_InitStack(&search); | | | | | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 | * Search through all commands in the current namespace first, * in the global namespace next, then in all child namespaces * in this interpreter. If we find any commands that * represent classes, report them. */ Itcl_InitStack(&search); Itcl_PushStack(globalNs, &search); Itcl_PushStack(activeNs, &search); /* last in, first out! */ Tcl_InitHashTable(&unique, TCL_ONE_WORD_KEYS); handledActiveNs = 0; while (Itcl_GetStackSize(&search) > 0) { nsPtr = (Tcl_Namespace *)Itcl_PopStack(&search); if (nsPtr == activeNs && handledActiveNs) { continue; } hPtr = Tcl_FirstHashEntry(Itcl_GetNamespaceCommandTable(nsPtr), &place); while (hPtr) { |
︙ | ︙ | |||
238 239 240 241 242 243 244 | * another namespace. * * Otherwise, report short names. */ if (forceFullNames || nsPtr != activeNs || originalCmd != NULL) { | | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | * another namespace. * * Otherwise, report short names. */ if (forceFullNames || nsPtr != activeNs || originalCmd != NULL) { objPtr = Tcl_NewStringObj(NULL, 0); Tcl_GetCommandFullName(interp, cmd, objPtr); cmdName = Tcl_GetString(objPtr); } else { cmdName = Tcl_GetCommandName(interp, cmd); objPtr = Tcl_NewStringObj((const char *)cmdName, -1); } if (originalCmd) { cmd = originalCmd; } Tcl_CreateHashEntry(&unique, (char*)cmd, &newEntry); if (newEntry && ((pattern == NULL) || Tcl_StringCaseMatch((const char *)cmdName, pattern, 0))) { Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp), objPtr); } else { /* if not appended to the result, free objPtr. */ Tcl_DecrRefCount(objPtr); } } |
︙ | ︙ | |||
389 390 391 392 393 394 395 | * Search through all commands in the current namespace first, * in the global namespace next, then in all child namespaces * in this interpreter. If we find any commands that * represent objects, report them. */ Itcl_InitStack(&search); | | | | | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | * Search through all commands in the current namespace first, * in the global namespace next, then in all child namespaces * in this interpreter. If we find any commands that * represent objects, report them. */ Itcl_InitStack(&search); Itcl_PushStack(globalNs, &search); Itcl_PushStack(activeNs, &search); /* last in, first out! */ Tcl_InitHashTable(&unique, TCL_ONE_WORD_KEYS); handledActiveNs = 0; while (Itcl_GetStackSize(&search) > 0) { nsPtr = (Tcl_Namespace *)Itcl_PopStack(&search); if (nsPtr == activeNs && handledActiveNs) { continue; } entry = Tcl_FirstHashEntry(Itcl_GetNamespaceCommandTable(nsPtr), &place); while (entry) { cmd = (Tcl_Command)Tcl_GetHashValue(entry); |
︙ | ︙ | |||
424 425 426 427 428 429 430 | * another namespace. * * Otherwise, report short names. */ if (forceFullNames || nsPtr != activeNs || originalCmd != NULL) { | | | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 | * another namespace. * * Otherwise, report short names. */ if (forceFullNames || nsPtr != activeNs || originalCmd != NULL) { objPtr = Tcl_NewStringObj(NULL, 0); Tcl_GetCommandFullName(interp, cmd, objPtr); cmdName = Tcl_GetString(objPtr); } else { cmdName = Tcl_GetCommandName(interp, cmd); objPtr = Tcl_NewStringObj((const char *)cmdName, -1); } |
︙ | ︙ | |||
455 456 457 458 459 460 461 | match = 1; } } } } if (match) { | | | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 | match = 1; } } } } if (match) { Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp), objPtr); } else { Tcl_DecrRefCount(objPtr); /* throw away the name */ } } entry = Tcl_NextHashEntry(&place); } |
︙ | ︙ | |||
568 569 570 571 572 573 574 | */ static int CallDeleteObject( ClientData data[], Tcl_Interp *interp, int result) { | | | 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 | */ static int CallDeleteObject( ClientData data[], Tcl_Interp *interp, int result) { ItclObject *contextIoPtr = (ItclObject *)data[0]; if (contextIoPtr->destructorHasBeenCalled) { Tcl_AppendResult(interp, "can't delete an object while it is being ", "destructed", NULL); return TCL_ERROR; } if (result == TCL_OK) { result = Itcl_DeleteObject(interp, contextIoPtr); |
︙ | ︙ | |||
600 601 602 603 604 605 606 | ItclShowArgs(1, "Itcl_DelObjectCmd", objc, objv); /* * Scan through the list of objects and attempt to delete them. * If anything goes wrong (i.e., destructors fail), then * abort with an error. */ for (i=1; i < objc; i++) { | | | | 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 | ItclShowArgs(1, "Itcl_DelObjectCmd", objc, objv); /* * Scan through the list of objects and attempt to delete them. * If anything goes wrong (i.e., destructors fail), then * abort with an error. */ for (i=1; i < objc; i++) { name = Tcl_GetString(objv[i]); contextIoPtr = NULL; if (Itcl_FindObject(interp, name, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "object \"", name, "\" not found", NULL); return TCL_ERROR; } callbackPtr = Itcl_GetCurrentCallbackPtr(interp); Tcl_NRAddCallback(interp, CallDeleteObject, contextIoPtr, NULL, NULL, NULL); result = Itcl_NRRunCallbacks(interp, callbackPtr); |
︙ | ︙ | |||
698 699 700 701 702 703 704 | contextNsPtr = Tcl_GetCurrentNamespace(interp); openParen = NULL; result = TCL_OK; /* * If this looks like a fully qualified name already, * then return it as is. */ | | | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 | contextNsPtr = Tcl_GetCurrentNamespace(interp); openParen = NULL; result = TCL_OK; /* * If this looks like a fully qualified name already, * then return it as is. */ token = Tcl_GetString(objv[1]); if (*token == ':' && *(token+1) == ':') { Tcl_SetObjResult(interp, objv[1]); return TCL_OK; } /* * If the variable name is an array reference, pick out |
︙ | ︙ | |||
735 736 737 738 739 740 741 | * the array variable as the variable name. We must be * careful to add the index (everything from openParen * onward) as well. */ contextIoPtr = NULL; contextIclsPtr = NULL; oPtr = NULL; | | | | 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | * the array variable as the variable name. We must be * careful to add the index (everything from openParen * onward) as well. */ contextIoPtr = NULL; contextIclsPtr = NULL; oPtr = NULL; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)contextNsPtr); if (hPtr != NULL) { contextIclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } if (Itcl_IsClassNamespace(contextNsPtr)) { ClientData clientData; entry = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, token); if (!entry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable \"", token, "\" not found in class \"", Tcl_GetString(contextIclsPtr->fullNamePtr), "\"", NULL); result = TCL_ERROR; goto scopeCmdDone; } vlookup = (ItclVarLookup*)Tcl_GetHashValue(entry); if (vlookup->ivPtr->flags & ITCL_COMMON) { Tcl_Obj *resultPtr = Tcl_GetObjResult(interp); |
︙ | ︙ | |||
793 794 795 796 797 798 799 | contextIoPtr = infoPtr->currIoPtr; } } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't scope variable \"", token, "\": missing object context", | | | | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 | contextIoPtr = infoPtr->currIoPtr; } } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't scope variable \"", token, "\": missing object context", NULL); result = TCL_ERROR; goto scopeCmdDone; } doAppend = 1; if (contextIclsPtr->flags & ITCL_ECLASS) { if (strcmp(token, "itcl_options") == 0) { doAppend = 0; } } objPtr2 = Tcl_NewStringObj(NULL, 0); Tcl_IncrRefCount(objPtr2); Tcl_AppendToObj(objPtr2, ITCL_VARIABLES_NAMESPACE, -1); Tcl_AppendToObj(objPtr2, (Tcl_GetObjectNamespace(contextIoPtr->oPtr))->fullName, -1); if (doAppend) { Tcl_AppendToObj(objPtr2, |
︙ | ︙ | |||
848 849 850 851 852 853 854 | var = Itcl_FindNamespaceVar(interp, token, contextNsPtr, TCL_NAMESPACE_ONLY); if (!var) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable \"", token, "\" not found in namespace \"", contextNsPtr->fullName, "\"", | | | 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 | var = Itcl_FindNamespaceVar(interp, token, contextNsPtr, TCL_NAMESPACE_ONLY); if (!var) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable \"", token, "\" not found in namespace \"", contextNsPtr->fullName, "\"", NULL); result = TCL_ERROR; goto scopeCmdDone; } Itcl_GetVariableFullName(interp, var, resultPtr); if (openParen) { *openParen = '('; |
︙ | ︙ | |||
909 910 911 912 913 914 915 | int pos; ItclShowArgs(1, "Itcl_CodeCmd", objc, objv); /* * Handle flags like "-namespace"... */ for (pos=1; pos < objc; pos++) { | | | | | | 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 | int pos; ItclShowArgs(1, "Itcl_CodeCmd", objc, objv); /* * Handle flags like "-namespace"... */ for (pos=1; pos < objc; pos++) { token = Tcl_GetString(objv[pos]); if (*token != '-') { break; } if (strcmp(token, "-namespace") == 0) { if (objc == 2) { Tcl_WrongNumArgs(interp, 1, objv, "?-namespace name? command ?arg arg...?"); return TCL_ERROR; } else { token = Tcl_GetString(objv[pos+1]); contextNs = Tcl_FindNamespace(interp, token, NULL, TCL_LEAVE_ERR_MSG); if (!contextNs) { return TCL_ERROR; } pos++; } } else { if (strcmp(token, "--") == 0) { pos++; break; } else { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option \"", token, "\": should be -namespace or --", NULL); return TCL_ERROR; } } } if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "?-namespace name? command ?arg arg...?"); return TCL_ERROR; } /* * Now construct a scoped command by integrating the * current namespace context, and appending the remaining * arguments AS A LIST... */ listPtr = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewStringObj("namespace", -1)); Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewStringObj("inscope", -1)); if (contextNs == Tcl_GetGlobalNamespace(interp)) { |
︙ | ︙ | |||
1254 1255 1256 1257 1258 1259 1260 | ItclClass *iclsPtr; ItclShowArgs(1, "Itcl_ForwardAddCmd", objc, objv); if (objc < 3) { Tcl_WrongNumArgs(interp, 1, objv, "<forwardName> <targetName> ?<arg> ...?"); return TCL_ERROR; } | | | | 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 | ItclClass *iclsPtr; ItclShowArgs(1, "Itcl_ForwardAddCmd", objc, objv); if (objc < 3) { Tcl_WrongNumArgs(interp, 1, objv, "<forwardName> <targetName> ?<arg> ...?"); return TCL_ERROR; } infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); iclsPtr = (ItclClass*)Itcl_PeekStack(&infoPtr->clsStack); if (iclsPtr == NULL) { Tcl_HashEntry *hPtr; hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objv[1]); if (hPtr == NULL) { Tcl_AppendResult(interp, "class: \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } prefixObj = Tcl_NewListObj(objc-2, objv+2); mPtr = Itcl_NewForwardClassMethod(interp, iclsPtr->clsPtr, 1, objv[1], prefixObj); if (mPtr == NULL) { return TCL_ERROR; } |
︙ | ︙ | |||
1437 1438 1439 1440 1441 1442 1443 | } hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objv[1]); if (hPtr == NULL) { Tcl_AppendResult(interp, "class \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } | | | | 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 | } hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objv[1]); if (hPtr == NULL) { Tcl_AppendResult(interp, "class \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); protectionStr = Tcl_GetString(objv[2]); pLevel = -1; if (strcmp(protectionStr, "public") == 0) { pLevel = ITCL_PUBLIC; } if (strcmp(protectionStr, "protected") == 0) { pLevel = ITCL_PROTECTED; } if (strcmp(protectionStr, "private") == 0) { pLevel = ITCL_PRIVATE; } if (pLevel == -1) { Tcl_AppendResult(interp, "bad protection \"", protectionStr, "\"", NULL); return TCL_ERROR; } Itcl_PushStack(iclsPtr, &infoPtr->clsStack); result = Itcl_ClassOptionCmd(clientData, interp, objc-2, objv+2); Itcl_PopStack(&infoPtr->clsStack); if (result != TCL_OK) { return result; } result = DelegatedOptionsInstall(interp, iclsPtr); return result; |
︙ | ︙ | |||
1522 1523 1524 1525 1526 1527 1528 | } hPtr = Tcl_FindHashEntry(&infoPtr->objectCmds, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } | | | 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 | } hPtr = Tcl_FindHashEntry(&infoPtr->objectCmds, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } ioPtr = (ItclObject *)Tcl_GetHashValue(hPtr); protectionStr = Tcl_GetString(objv[2]); pLevel = -1; if (strcmp(protectionStr, "public") == 0) { pLevel = ITCL_PUBLIC; } if (strcmp(protectionStr, "protected") == 0) { pLevel = ITCL_PROTECTED; |
︙ | ︙ | |||
1608 1609 1610 1611 1612 1613 1614 | } hPtr = Tcl_FindHashEntry(&infoPtr->objectCmds, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } | | | 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 | } hPtr = Tcl_FindHashEntry(&infoPtr->objectCmds, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } ioPtr = (ItclObject *)Tcl_GetHashValue(hPtr); result = Itcl_HandleDelegateOptionCmd(interp, ioPtr, NULL, &idoPtr, objc-3, objv+3); if (result != TCL_OK) { return result; } hPtr = Tcl_CreateHashEntry(&ioPtr->objectDelegatedOptions, (char *)idoPtr->namePtr, &isNew); |
︙ | ︙ | |||
1672 1673 1674 1675 1676 1677 1678 | } hPtr = Tcl_FindHashEntry(&infoPtr->objectCmds, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } | | | 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 | } hPtr = Tcl_FindHashEntry(&infoPtr->objectCmds, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" not found", NULL); return TCL_ERROR; } ioPtr = (ItclObject *)Tcl_GetHashValue(hPtr); result = Itcl_HandleDelegateMethodCmd(interp, ioPtr, NULL, &idmPtr, objc-3, objv+3); if (result != TCL_OK) { return result; } componentNamePtr = idmPtr->icPtr->namePtr; Itcl_InitHierIter(&hier, ioPtr->iclsPtr); |
︙ | ︙ | |||
1779 1780 1781 1782 1783 1784 1785 | NULL, 0); hPtr = Tcl_FindHashEntry(&contextIclsPtr->variables, (char *)objv[2]); if (hPtr == NULL) { Tcl_AppendResult(interp, "Itcl_AddComponentCmd cannot find component", " \"", Tcl_GetString(objv[2]), "\"in class variables", NULL); return TCL_ERROR; } | | | 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 | NULL, 0); hPtr = Tcl_FindHashEntry(&contextIclsPtr->variables, (char *)objv[2]); if (hPtr == NULL) { Tcl_AppendResult(interp, "Itcl_AddComponentCmd cannot find component", " \"", Tcl_GetString(objv[2]), "\"in class variables", NULL); return TCL_ERROR; } ivPtr = (ItclVariable *)Tcl_GetHashValue(hPtr); /* add entry to the virtual tables */ vlookup = (ItclVarLookup *)ckalloc(sizeof(ItclVarLookup)); vlookup->ivPtr = ivPtr; vlookup->usage = 0; vlookup->leastQualName = NULL; /* |
︙ | ︙ | |||
1813 1814 1815 1816 1817 1818 1819 | Tcl_DStringInit(&buffer2); while (1) { hPtr = Tcl_CreateHashEntry(&contextIclsPtr->resolveVars, Tcl_DStringValue(&buffer), &isNew); if (isNew) { | | | | 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 | Tcl_DStringInit(&buffer2); while (1) { hPtr = Tcl_CreateHashEntry(&contextIclsPtr->resolveVars, Tcl_DStringValue(&buffer), &isNew); if (isNew) { Tcl_SetHashValue(hPtr, vlookup); vlookup->usage++; if (!vlookup->leastQualName) { vlookup->leastQualName = (char *) Tcl_GetHashKey(&contextIclsPtr->resolveVars, hPtr); } } if (nsPtr == NULL) { break; } |
︙ | ︙ | |||
1900 1901 1902 1903 1904 1905 1906 | contextIoPtr = NULL; ItclShowArgs(1, "Itcl_SetComponentCmd", objc, objv); if (objc < 4) { Tcl_WrongNumArgs(interp, 1, objv, "objectName componentName value"); return TCL_ERROR; } | | | 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 | contextIoPtr = NULL; ItclShowArgs(1, "Itcl_SetComponentCmd", objc, objv); if (objc < 4) { Tcl_WrongNumArgs(interp, 1, objv, "objectName componentName value"); return TCL_ERROR; } name = Tcl_GetString(objv[1]); if (Itcl_FindObject(interp, name, &contextIoPtr) != TCL_OK) { return TCL_ERROR; } if (contextIoPtr == NULL) { Tcl_AppendResult(interp, "Itcl_SetComponentCmd contextIoPtr " "for \"", Tcl_GetString(objv[1]), "\" == NULL", NULL); return TCL_ERROR; |
︙ | ︙ | |||
1923 1924 1925 1926 1927 1928 1929 | } Itcl_DeleteHierIter(&hier); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" has no component \"", Tcl_GetString(objv[2]), "\"", NULL); return TCL_ERROR; } | | | 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 | } Itcl_DeleteHierIter(&hier); if (hPtr == NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(objv[1]), "\" has no component \"", Tcl_GetString(objv[2]), "\"", NULL); return TCL_ERROR; } icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); val = ItclGetInstanceVar(interp, Tcl_GetString(icPtr->namePtr), NULL, contextIoPtr, contextIclsPtr); if ((val != NULL) && (strlen(val) != 0)) { /* delete delegated options to the old component here !! */ Itcl_InitHierIter(&hier, contextIoPtr->iclsPtr); while ((iclsPtr = Itcl_AdvanceHierIter(&hier)) != NULL) { FOREACH_HASH_VALUE(idoPtr, &iclsPtr->delegatedOptions) { |
︙ | ︙ |
Changes to generic/itclEnsemble.c.
︙ | ︙ | |||
43 44 45 46 47 48 49 | char *name; /* name of this part */ Tcl_Obj *namePtr; Tcl_Command cmdPtr; /* command handling this part */ char *usage; /* usage string describing syntax */ struct Ensemble* ensemble; /* ensemble containing this part */ ItclArgList *arglistPtr; /* the parsed argument list */ Tcl_ObjCmdProc *objProc; /* handling procedure for part */ | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | char *name; /* name of this part */ Tcl_Obj *namePtr; Tcl_Command cmdPtr; /* command handling this part */ char *usage; /* usage string describing syntax */ struct Ensemble* ensemble; /* ensemble containing this part */ ItclArgList *arglistPtr; /* the parsed argument list */ Tcl_ObjCmdProc *objProc; /* handling procedure for part */ void *clientData; /* the procPtr for the part */ Tcl_CmdDeleteProc *deleteProc; /* procedure used to destroy client data */ int minChars; /* chars needed to uniquely identify part */ int flags; Tcl_Interp *interp; Tcl_Obj *mapNamePtr; Tcl_Obj *subEnsemblePtr; |
︙ | ︙ | |||
143 144 145 146 147 148 149 | int Itcl_EnsembleInit( Tcl_Interp *interp) /* interpreter being initialized */ { Tcl_DString buffer; ItclObjectInfo *infoPtr; | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 | int Itcl_EnsembleInit( Tcl_Interp *interp) /* interpreter being initialized */ { Tcl_DString buffer; ItclObjectInfo *infoPtr; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); Tcl_CreateObjCommand(interp, "::itcl::ensemble", Itcl_EnsembleCmd, NULL, NULL); Tcl_DStringInit(&buffer); Tcl_DStringAppend(&buffer, ITCL_COMMANDS_NAMESPACE, -1); Tcl_DStringAppend(&buffer, "::ensembles", -1); infoPtr->ensembleInfo->ensembleNsPtr = Tcl_CreateNamespace(interp, Tcl_DStringValue(&buffer), NULL, NULL); Tcl_DStringFree(&buffer); |
︙ | ︙ | |||
218 219 220 221 222 223 224 | if (Tcl_SplitList(interp, (const char *)ensName, &nameArgc, &nameArgv) != TCL_OK) { goto ensCreateFail; } if (nameArgc < 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid ensemble name \"", ensName, "\"", | | | | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | if (Tcl_SplitList(interp, (const char *)ensName, &nameArgc, &nameArgv) != TCL_OK) { goto ensCreateFail; } if (nameArgc < 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid ensemble name \"", ensName, "\"", NULL); goto ensCreateFail; } /* * If there is more than one path component, then follow * the path down to the last component, to find the containing * ensemble. */ parentEnsData = NULL; if (nameArgc > 1) { if (FindEnsemble(interp, nameArgv, nameArgc-1, &parentEnsData) != TCL_OK) { goto ensCreateFail; } if (parentEnsData == NULL) { char *pname = Tcl_Merge(nameArgc-1, nameArgv); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid ensemble name \"", pname, "\"", NULL); ckfree(pname); goto ensCreateFail; } } /* * Create the ensemble. |
︙ | ︙ | |||
325 326 327 328 329 330 331 | goto ensPartFail; } if (ensData == NULL) { char *pname = Tcl_Merge(nameArgc, nameArgv); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid ensemble name \"", pname, "\"", | | | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | goto ensPartFail; } if (ensData == NULL) { char *pname = Tcl_Merge(nameArgc, nameArgv); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid ensemble name \"", pname, "\"", NULL); ckfree(pname); goto ensPartFail; } /* * Install the new part into the part list. */ |
︙ | ︙ | |||
679 680 681 682 683 684 685 | /* * Build the trail of ensemble names leading to this part. */ Tcl_DStringInit(&buffer); Itcl_InitList(&trail); for (part=ensPart; part; part=part->ensemble->parent) { | | | 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 | /* * Build the trail of ensemble names leading to this part. */ Tcl_DStringInit(&buffer); Itcl_InitList(&trail); for (part=ensPart; part; part=part->ensemble->parent) { Itcl_InsertList(&trail, part); } while (ensData->parent != NULL) { ensData = ensData->parent->ensemble; } cmdPtr = ensData->cmdPtr; name = Tcl_GetCommandName(interp, cmdPtr); |
︙ | ︙ | |||
766 767 768 769 770 771 772 | int isNew; char buf[20]; Tcl_Obj *unkObjPtr; /* * Create the data associated with the ensemble. */ | | | 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 | int isNew; char buf[20]; Tcl_Obj *unkObjPtr; /* * Create the data associated with the ensemble. */ infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); infoPtr->ensembleInfo->numEnsembles++; ensData = (Ensemble*)ckalloc(sizeof(Ensemble)); memset(ensData, 0, sizeof(Ensemble)); ensData->namePtr = Tcl_NewStringObj(ensName, -1); Tcl_IncrRefCount(ensData->namePtr); ensData->interp = interp; ensData->numParts = 0; |
︙ | ︙ | |||
808 809 810 811 812 813 814 | Tcl_GetCurrentNamespace(interp), TCL_ENSEMBLE_PREFIX); hPtr = Tcl_CreateHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)ensData->cmdPtr, &isNew); if (!isNew) { result = TCL_ERROR; goto finish; } | | | | 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 | Tcl_GetCurrentNamespace(interp), TCL_ENSEMBLE_PREFIX); hPtr = Tcl_CreateHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)ensData->cmdPtr, &isNew); if (!isNew) { result = TCL_ERROR; goto finish; } Tcl_SetHashValue(hPtr, ensData); unkObjPtr = Tcl_NewStringObj(ITCL_COMMANDS_NAMESPACE, -1); Tcl_AppendToObj(unkObjPtr, "::ensembles::unknown", -1); if (Tcl_SetEnsembleUnknownHandler(NULL, ensData->cmdPtr, unkObjPtr) != TCL_OK) { Tcl_DecrRefCount(unkObjPtr); result = TCL_ERROR; goto finish; } Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_DStringValue(&buffer), -1)); result = TCL_OK; goto finish; } /* * Otherwise, this ensemble is contained within another parent. * Install the new ensemble as a part within its parent. */ if (CreateEnsemblePart(interp, parentEnsData, ensName, &ensPart) != TCL_OK) { DeleteEnsemble(ensData); result = TCL_ERROR; goto finish; } Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, infoPtr->ensembleInfo->ensembleNsPtr->fullName, -1); Tcl_DStringAppend(&buffer, "::subensembles::", -1); sprintf(buf, "%d", parentEnsData->ensembleId); |
︙ | ︙ | |||
857 858 859 860 861 862 863 | Tcl_GetCurrentNamespace(interp), TCL_ENSEMBLE_PREFIX); hPtr = Tcl_CreateHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)ensPart->cmdPtr, &isNew); if (!isNew) { result = TCL_ERROR; goto finish; } | | | 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 | Tcl_GetCurrentNamespace(interp), TCL_ENSEMBLE_PREFIX); hPtr = Tcl_CreateHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)ensPart->cmdPtr, &isNew); if (!isNew) { result = TCL_ERROR; goto finish; } Tcl_SetHashValue(hPtr, ensData); unkObjPtr = Tcl_NewStringObj(ITCL_COMMANDS_NAMESPACE, -1); Tcl_AppendToObj(unkObjPtr, "::ensembles::unknown", -1); if (Tcl_SetEnsembleUnknownHandler(NULL, ensPart->cmdPtr, unkObjPtr) != TCL_OK) { result = TCL_ERROR; goto finish; } |
︙ | ︙ | |||
935 936 937 938 939 940 941 | * Install the new part into the part list. */ if (CreateEnsemblePart(interp, ensData, partName, &ensPart) != TCL_OK) { return TCL_ERROR; } if (usageInfo) { | | | 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 | * Install the new part into the part list. */ if (CreateEnsemblePart(interp, ensData, partName, &ensPart) != TCL_OK) { return TCL_ERROR; } if (usageInfo) { ensPart->usage = (char *)ckalloc(strlen(usageInfo)+1); strcpy(ensPart->usage, usageInfo); } ensPart->objProc = objProc; ensPart->clientData = clientData; ensPart->deleteProc = deleteProc; ensPart->flags = flags; |
︙ | ︙ | |||
1013 1014 1015 1016 1017 1018 1019 | while (ensData->numParts > 0) { DeleteEnsemblePart(ensData->parts[0]); } Tcl_DecrRefCount(ensData->namePtr); ckfree((char*)ensData->parts); ensData->parts = NULL; ensData->numParts = 0; | | | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 | while (ensData->numParts > 0) { DeleteEnsemblePart(ensData->parts[0]); } Tcl_DecrRefCount(ensData->namePtr); ckfree((char*)ensData->parts); ensData->parts = NULL; ensData->numParts = 0; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(ensData->interp, ITCL_INTERP_DATA, NULL); FOREACH_HASH_VALUE(ensData2, &infoPtr->ensembleInfo->ensembles) { if (ensData2 == ensData) { Tcl_DeleteHashEntry(hPtr); } } ckfree((char*)ensData); } |
︙ | ︙ | |||
1080 1081 1082 1083 1084 1085 1086 | objPtr = Tcl_NewStringObj(nameArgv[0], -1); cmdPtr = Tcl_FindEnsemble(interp, objPtr, 0); Tcl_DecrRefCount(objPtr); if (cmdPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "command \"", nameArgv[0], "\" is not an ensemble", | | | | | | | | 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 | objPtr = Tcl_NewStringObj(nameArgv[0], -1); cmdPtr = Tcl_FindEnsemble(interp, objPtr, 0); Tcl_DecrRefCount(objPtr); if (cmdPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "command \"", nameArgv[0], "\" is not an ensemble", NULL); return TCL_ERROR; } infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)cmdPtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "command \"", nameArgv[0], "\" is not an ensemble", NULL); return TCL_ERROR; } ensData = (Ensemble *)Tcl_GetHashValue(hPtr); /* * Follow the trail of sub-ensemble names. */ for (i=1; i < nameArgc; i++) { if (FindEnsemblePart(interp, ensData, nameArgv[i], &ensPart) != TCL_OK) { return TCL_ERROR; } if (ensPart == NULL) { char *pname = Tcl_Merge(i, nameArgv); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid ensemble name \"", pname, "\"", NULL); ckfree(pname); return TCL_ERROR; } cmdPtr = ensPart->cmdPtr; if (cmdPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "part \"", nameArgv[i], "\" is not an ensemble", NULL); return TCL_ERROR; } if (!Tcl_IsEnsemble(cmdPtr)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "part \"", nameArgv[i], "\" is not an ensemble", NULL); return TCL_ERROR; } if (Tcl_GetCommandInfoFromToken(cmdPtr, &cmdInfo) != 1) { return TCL_ERROR; } ensData = (Ensemble*)cmdInfo.objClientData; } |
︙ | ︙ | |||
1171 1172 1173 1174 1175 1176 1177 | /* * If a matching entry was found, then return an error. */ if (FindEnsemblePartIndex(ensData, partName, &pos)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "part \"", partName, "\" already exists in ensemble", | | | 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 | /* * If a matching entry was found, then return an error. */ if (FindEnsemblePartIndex(ensData, partName, &pos)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "part \"", partName, "\" already exists in ensemble", NULL); return TCL_ERROR; } /* * Otherwise, make room for a new entry. Keep the parts in * lexicographical order, so we can search them quickly * later. |
︙ | ︙ | |||
1197 1198 1199 1200 1201 1202 1203 | for (i=ensData->numParts; i > pos; i--) { ensData->parts[i] = ensData->parts[i-1]; } ensData->numParts++; ensPart = (EnsemblePart*)ckalloc(sizeof(EnsemblePart)); memset(ensPart, 0, sizeof(EnsemblePart)); | | | 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 | for (i=ensData->numParts; i > pos; i--) { ensData->parts[i] = ensData->parts[i-1]; } ensData->numParts++; ensPart = (EnsemblePart*)ckalloc(sizeof(EnsemblePart)); memset(ensPart, 0, sizeof(EnsemblePart)); ensPart->name = (char*)ckalloc(strlen(partName)+1); strcpy(ensPart->name, partName); ensPart->namePtr = Tcl_NewStringObj(ensPart->name, -1); ensPart->ensemble = ensData; ensPart->interp = interp; ensData->parts[pos] = ensPart; |
︙ | ︙ | |||
1270 1271 1272 1273 1274 1275 1276 | */ if ((ensPart->deleteProc != NULL) && (ensPart->clientData != NULL)) { (*ensPart->deleteProc)(ensPart->clientData); } /* if it is a subensemble remove the command to free the data */ if (ensPart->subEnsemblePtr != NULL) { | | | | | 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 | */ if ((ensPart->deleteProc != NULL) && (ensPart->clientData != NULL)) { (*ensPart->deleteProc)(ensPart->clientData); } /* if it is a subensemble remove the command to free the data */ if (ensPart->subEnsemblePtr != NULL) { infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(ensData->interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->subEnsembles, (char *)ensPart->subEnsemblePtr); if (hPtr != NULL) { ensData2 = (Ensemble *)Tcl_GetHashValue(hPtr); Tcl_DeleteNamespace(ensData2->nsPtr); Tcl_DeleteHashEntry(hPtr); } Tcl_SetEnsembleUnknownHandler(NULL, ensPart->cmdPtr, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)ensPart->ensemble->cmdPtr); if (hPtr != NULL) { ensData2 = (Ensemble *)Tcl_GetHashValue(hPtr); Tcl_GetEnsembleMappingDict(NULL, ensData2->cmdPtr, &mapDict); if (mapDict != NULL) { Tcl_DictObjRemove(ensPart->interp, mapDict, ensPart->namePtr); Tcl_SetEnsembleMappingDict(NULL, ensData2->cmdPtr, mapDict); } } |
︙ | ︙ | |||
1425 1426 1427 1428 1429 1430 1431 | if (strncmp(partName, ensData->parts[pos]->name, nlen) != 0) { pos++; break; } } } if (nlen < ensData->parts[pos]->minChars) { | | | | 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 | if (strncmp(partName, ensData->parts[pos]->name, nlen) != 0) { pos++; break; } } } if (nlen < ensData->parts[pos]->minChars) { Tcl_Obj *resultPtr = Tcl_NewStringObj(NULL, 0); Tcl_AppendStringsToObj(resultPtr, "ambiguous option \"", partName, "\": should be one of...", NULL); for (i=pos; i < ensData->numParts; i++) { if (strncmp(partName, ensData->parts[i]->name, nlen) != 0) { break; } Tcl_AppendToObj(resultPtr, "\n ", 3); GetEnsemblePartUsage(interp, ensData, ensData->parts[i], resultPtr); |
︙ | ︙ | |||
1649 1650 1651 1652 1653 1654 1655 | ItclShowArgs(1, "Itcl_EnsembleCmd", objc, objv); /* * Make sure that an ensemble name was specified. */ if (objc < 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", | | | | 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 | ItclShowArgs(1, "Itcl_EnsembleCmd", objc, objv); /* * Make sure that an ensemble name was specified. */ if (objc < 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", Tcl_GetString(objv[0]), " name ?command arg arg...?\"", NULL); return TCL_ERROR; } /* * If this is the "ensemble" command in the main interpreter, * then the client data will be null. Otherwise, it is * the "ensemble" command in the ensemble body parser, and |
︙ | ︙ | |||
1692 1693 1694 1695 1696 1697 1698 | if (FindEnsemblePart(ensInfo->master, ensData, ensName, &ensPart) != TCL_OK) { Tcl_Panic("Itcl_EnsembleCmd: can't create ensemble"); } } cmd = ensPart->cmdPtr; | | | | | | | | | | | | | 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 | if (FindEnsemblePart(ensInfo->master, ensData, ensName, &ensPart) != TCL_OK) { Tcl_Panic("Itcl_EnsembleCmd: can't create ensemble"); } } cmd = ensPart->cmdPtr; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(ensInfo->master, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)ensPart->cmdPtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "part \"", Tcl_GetString(objv[1]), "\" is not an ensemble", NULL); return TCL_ERROR; } ensData = (Ensemble *)Tcl_GetHashValue(hPtr); } else { /* * Otherwise, the desired ensemble is a top-level ensemble. * Find or create the access command for the ensemble, and * then get its data. */ cmd = Tcl_FindCommand(interp, ensName, NULL, 0); if (cmd == NULL) { if (CreateEnsemble(interp, NULL, ensName) != TCL_OK) { return TCL_ERROR; } cmd = Tcl_FindCommand(interp, ensName, NULL, 0); } if (cmd == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "command \"", Tcl_GetString(objv[1]), "\" is not an ensemble", NULL); return TCL_ERROR; } infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)cmd); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "command \"", Tcl_GetString(objv[1]), "\" is not an ensemble", NULL); return TCL_ERROR; } ensData = (Ensemble *)Tcl_GetHashValue(hPtr); } /* * At this point, we have the data for the ensemble that is |
︙ | ︙ | |||
1767 1768 1769 1770 1771 1772 1773 | * master interpreter. If an error was encountered, * copy the error info first, and then set the result. * Otherwise, the offending command is reported twice. */ if (status == TCL_ERROR) { /* no longer needed, no extra interpreter !! */ const char *errInfo = Tcl_GetVar2(ensInfo->parser, "::errorInfo", | | | 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 | * master interpreter. If an error was encountered, * copy the error info first, and then set the result. * Otherwise, the offending command is reported twice. */ if (status == TCL_ERROR) { /* no longer needed, no extra interpreter !! */ const char *errInfo = Tcl_GetVar2(ensInfo->parser, "::errorInfo", NULL, TCL_GLOBAL_ONLY); if (errInfo) { Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(errInfo, -1)); } if (objc == 3) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( |
︙ | ︙ | |||
1838 1839 1840 1841 1842 1843 1844 | Tcl_DeleteNamespace(Tcl_GetGlobalNamespace(ensInfo->parser)); /* * Add the allowed commands to the parser interpreter: * part, delete, ensemble */ Tcl_CreateObjCommand(ensInfo->parser, "part", Itcl_EnsPartCmd, | | | | | | 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 | Tcl_DeleteNamespace(Tcl_GetGlobalNamespace(ensInfo->parser)); /* * Add the allowed commands to the parser interpreter: * part, delete, ensemble */ Tcl_CreateObjCommand(ensInfo->parser, "part", Itcl_EnsPartCmd, ensInfo, NULL); Tcl_CreateObjCommand(ensInfo->parser, "option", Itcl_EnsPartCmd, ensInfo, NULL); Tcl_CreateObjCommand(ensInfo->parser, "ensemble", Itcl_EnsembleCmd, ensInfo, NULL); /* * Install the parser data, so we'll have it the next time * we call this procedure. */ (void) Tcl_SetAssocData(interp, "itcl_ensembleParser", DeleteEnsParser, ensInfo); return ensInfo; } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1939 1940 1941 1942 1943 1944 1945 | int maxArgc; Tcl_CmdInfo cmdInfo; ItclShowArgs(1, "Itcl_EnsPartCmd", objc, objv); if (objc != 4) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", | | | | | 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 | int maxArgc; Tcl_CmdInfo cmdInfo; ItclShowArgs(1, "Itcl_EnsPartCmd", objc, objv); if (objc != 4) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", Tcl_GetString(objv[0]), " name args body\"", NULL); return TCL_ERROR; } /* * Create a Tcl-style proc definition using the specified args * and body. This is not a proc in the usual sense. It belongs * to the namespace that contains the ensemble, but it is * accessed through the ensemble, not through a Tcl command. */ partName = Tcl_GetString(objv[1]); if (ItclCreateArgList(interp, Tcl_GetString(objv[2]), &argc, &maxArgc, &usagePtr, &arglistPtr, NULL, partName) != TCL_OK) { result = TCL_ERROR; goto errorOut; } if (Tcl_GetCommandInfoFromToken(ensData->cmdPtr, &cmdInfo) != 1) { |
︙ | ︙ | |||
1978 1979 1980 1981 1982 1983 1984 | /* * Create a new part within the ensemble. If successful, * plug the command token into the proc; we'll need it later * if we try to compile the Tcl code for the part. If * anything goes wrong, clean up before bailing out. */ result = AddEnsemblePart(ensInfo->master, ensData, partName, usage, | | | 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 | /* * Create a new part within the ensemble. If successful, * plug the command token into the proc; we'll need it later * if we try to compile the Tcl code for the part. If * anything goes wrong, clean up before bailing out. */ result = AddEnsemblePart(ensInfo->master, ensData, partName, usage, (Tcl_ObjCmdProc *)Tcl_GetObjInterpProc(), procPtr, _Tcl_ProcDeleteProc, ITCL_ENSEMBLE_ENSEMBLE, &ensPart); if (result == TCL_ERROR) { _Tcl_ProcDeleteProc(procPtr); } Tcl_TransferResult(ensInfo->master, result, interp); errorOut: |
︙ | ︙ | |||
2030 2031 2032 2033 2034 2035 2036 | Ensemble *ensData = (Ensemble*)clientData; char *cmdName; Tcl_Obj *objPtr; cmdName = Tcl_GetString(objv[0]); | | | | | | | | | 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 | Ensemble *ensData = (Ensemble*)clientData; char *cmdName; Tcl_Obj *objPtr; cmdName = Tcl_GetString(objv[0]); objPtr = Tcl_NewStringObj(NULL, 0); Tcl_AppendStringsToObj(objPtr, "bad option \"", cmdName, "\": should be one of...\n", NULL); GetEnsembleUsage(interp, ensData, objPtr); Tcl_SetObjResult(interp, objPtr); return TCL_ERROR; } /* *---------------------------------------------------------------------- * * EnsembleSubCmd -- * *---------------------------------------------------------------------- */ static int CallInvokeEnsembleMethod( ClientData data[], Tcl_Interp *interp, int result) { Tcl_Namespace *nsPtr = (Tcl_Namespace *)data[0]; EnsemblePart *ensPart = (EnsemblePart *)data[1]; int objc = PTR2INT(data[2]); Tcl_Obj *const *objv = (Tcl_Obj *const *)data[3]; result = Itcl_InvokeEnsembleMethod(interp, nsPtr, ensPart->namePtr, (Tcl_Proc *)ensPart->clientData, objc, objv); return result; } static int CallInvokeEnsembleMethod2( ClientData data[], Tcl_Interp *interp, int result) { EnsemblePart *ensPart = (EnsemblePart *)data[0]; int objc = PTR2INT(data[1]); Tcl_Obj *const*objv = (Tcl_Obj *const*)data[2]; result = (*ensPart->objProc)(ensPart->clientData, interp, objc, objv); return result; } static int EnsembleSubCmd( ClientData clientData, /* ensPart struct pointer */ |
︙ | ︙ | |||
2099 2100 2101 2102 2103 2104 2105 | nsPtr = Tcl_GetCurrentNamespace(interp); callbackPtr = Itcl_GetCurrentCallbackPtr(interp); if (ensPart->flags & ITCL_ENSEMBLE_ENSEMBLE) { /* FIXME !!! */ if (ensPart->clientData == NULL) { return TCL_ERROR; } | | | | 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 | nsPtr = Tcl_GetCurrentNamespace(interp); callbackPtr = Itcl_GetCurrentCallbackPtr(interp); if (ensPart->flags & ITCL_ENSEMBLE_ENSEMBLE) { /* FIXME !!! */ if (ensPart->clientData == NULL) { return TCL_ERROR; } Tcl_NRAddCallback(interp, CallInvokeEnsembleMethod, nsPtr, ensPart, INT2PTR(objc), (void *)objv); } else { Tcl_NRAddCallback(interp, CallInvokeEnsembleMethod2, ensPart, INT2PTR(objc), (void *)objv, NULL); } result = Itcl_NRRunCallbacks(interp, callbackPtr); return result; } /* * ------------------------------------------------------------------------ * EnsembleUnknownCmd() |
︙ | ︙ | |||
2134 2135 2136 2137 2138 2139 2140 | ItclShowArgs(2, "EnsembleUnknownCmd", objc, objv); cmd = Tcl_GetCommandFromObj(interp, objv[1]); if (cmd == NULL) { Tcl_AppendResult(interp, "EnsembleUnknownCmd, ensemble not found!", Tcl_GetString(objv[1]), NULL); return TCL_ERROR; } | | | 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 | ItclShowArgs(2, "EnsembleUnknownCmd", objc, objv); cmd = Tcl_GetCommandFromObj(interp, objv[1]); if (cmd == NULL) { Tcl_AppendResult(interp, "EnsembleUnknownCmd, ensemble not found!", Tcl_GetString(objv[1]), NULL); return TCL_ERROR; } infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)cmd); if (hPtr == NULL) { Tcl_AppendResult(interp, "EnsembleUnknownCmd, ensemble struct not ", "found!", Tcl_GetString(objv[1]), NULL); return TCL_ERROR; } ensData = (Ensemble *)Tcl_GetHashValue(hPtr); |
︙ | ︙ | |||
2157 2158 2159 2160 2161 2162 2163 | if (FindEnsemblePart(interp, ensData, "@error", &ensPart) != TCL_OK) { Tcl_AppendResult(interp, "FindEnsemblePart error", NULL); return TCL_ERROR; } if (ensPart != NULL) { Tcl_Obj *listPtr; | | | 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 | if (FindEnsemblePart(interp, ensData, "@error", &ensPart) != TCL_OK) { Tcl_AppendResult(interp, "FindEnsemblePart error", NULL); return TCL_ERROR; } if (ensPart != NULL) { Tcl_Obj *listPtr; listPtr = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(NULL, listPtr, objv[1]); Tcl_ListObjAppendElement(NULL, listPtr, Tcl_NewStringObj("@error", -1)); Tcl_ListObjAppendElement(NULL, listPtr, objv[2]); Tcl_SetObjResult(interp, listPtr); return TCL_OK; } |
︙ | ︙ | |||
2204 2205 2206 2207 2208 2209 2210 | } hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)cmdPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such ensemble \"", Tcl_GetString(objv[i]), "\"", NULL); return TCL_ERROR; } | | | 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 | } hPtr = Tcl_FindHashEntry(&infoPtr->ensembleInfo->ensembles, (char *)cmdPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such ensemble \"", Tcl_GetString(objv[i]), "\"", NULL); return TCL_ERROR; } ensData = (Ensemble *)Tcl_GetHashValue(hPtr); Itcl_RenameCommand(ensData->interp, Tcl_GetString(ensData->namePtr), ""); if (Tcl_FindNamespace(interp, ensData->nsPtr->fullName, NULL, 0) != NULL) { Tcl_DeleteNamespace(ensData->nsPtr); } } return TCL_OK; |
︙ | ︙ |
Changes to generic/itclHelpers.c.
︙ | ︙ | |||
137 138 139 140 141 142 143 | result = TCL_ERROR; break; } if (defaultArgc > 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "too many fields in argument specifier \"", argv[i], "\"", | | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 | result = TCL_ERROR; break; } if (defaultArgc > 2) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "too many fields in argument specifier \"", argv[i], "\"", NULL); ckfree((char *) defaultArgv); result = TCL_ERROR; break; } if (strstr(defaultArgv[0],"::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad argument name \"", defaultArgv[0], "\"", NULL); ckfree((char *) defaultArgv); result = TCL_ERROR; break; } arglistPtr = (ItclArgList *)ckalloc(sizeof(ItclArgList)); memset(arglistPtr, 0, sizeof(ItclArgList)); if (*arglistPtrPtr == NULL) { |
︙ | ︙ | |||
275 276 277 278 279 280 281 | cmd = Tcl_FindCommand(interp, "unknown", (Tcl_Namespace *) NULL, /*flags*/ TCL_GLOBAL_ONLY); if (cmd == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid command name \"", | | | 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | cmd = Tcl_FindCommand(interp, "unknown", (Tcl_Namespace *) NULL, /*flags*/ TCL_GLOBAL_ONLY); if (cmd == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid command name \"", Tcl_GetString(objv[0]), "\"", NULL); return TCL_ERROR; } cmdlinePtr = Itcl_CreateArgs(interp, "unknown", objc, objv); Tcl_ListObjGetElements(NULL, cmdlinePtr, &cmdlinec, &cmdlinev); } |
︙ | ︙ |
Changes to generic/itclInfo.c.
︙ | ︙ | |||
322 323 324 325 326 327 328 | ItclCallContext *popped; Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *) framePtr); Itcl_Stack *stackPtr = (Itcl_Stack *) Tcl_GetHashValue(hPtr); | | | 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 | ItclCallContext *popped; Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *) framePtr); Itcl_Stack *stackPtr = (Itcl_Stack *) Tcl_GetHashValue(hPtr); popped = (ItclCallContext *)Itcl_PopStack(stackPtr); if (Itcl_GetStackSize(stackPtr) == 0) { Itcl_DeleteStack(stackPtr); ckfree((char *)stackPtr); Tcl_DeleteHashEntry(hPtr); } |
︙ | ︙ | |||
687 688 689 690 691 692 693 | ClientData clientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; clientData = Itcl_GetCallFrameClientData(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (clientData != NULL) { | | | | 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 | ClientData clientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; clientData = Itcl_GetCallFrameClientData(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (clientData != NULL) { oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData); contextIoPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, infoPtr->object_meta_type); contextIclsPtr = contextIoPtr->iclsPtr; } if ((contextIoPtr == NULL) || (contextIclsPtr == NULL)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "\nget info like this instead: " \ "\n namespace eval className { info class }", -1)); |
︙ | ︙ | |||
763 764 765 766 767 768 769 | int result; int i; ItclShowArgs(1, "Itcl_BiInfoClassOptionsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 | int result; int i; ItclShowArgs(1, "Itcl_BiInfoClassOptionsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (objc > 2) { Tcl_AppendResult(interp, "wrong # args should be: info options ", "?pattern?", NULL); return TCL_ERROR; } |
︙ | ︙ | |||
863 864 865 866 867 868 869 | ItclShowArgs(1, "Itcl_BiInfoContextCmd", objc, objv); iclsPtr = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { return TCL_ERROR; } if (ioPtr == NULL) { | | | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 | ItclShowArgs(1, "Itcl_BiInfoContextCmd", objc, objv); iclsPtr = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { return TCL_ERROR; } if (ioPtr == NULL) { Tcl_AppendResult(interp, "cannot get object context ", NULL); return TCL_ERROR; } listPtr = Tcl_NewListObj(0, NULL); objPtr = Tcl_NewStringObj(Tcl_GetString(iclsPtr->namePtr), -1); Tcl_ListObjAppendElement(interp, listPtr, objPtr); objPtr = Tcl_NewStringObj(Tcl_GetString(ioPtr->namePtr), -1); Tcl_ListObjAppendElement(interp, listPtr, objPtr); |
︙ | ︙ | |||
918 919 920 921 922 923 924 | return TCL_ERROR; } /* * Return the list of base classes. */ | | | | 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 | return TCL_ERROR; } /* * Return the list of base classes. */ listPtr = Tcl_NewListObj(0, NULL); elem = Itcl_FirstListElem(&contextIclsPtr->bases); while (elem) { Tcl_Obj *objPtr; ItclClass *iclsPtr = (ItclClass*)Itcl_GetListValue(elem); objPtr = Tcl_NewStringObj(iclsPtr->nsPtr->fullName, -1); Tcl_ListObjAppendElement(NULL, listPtr, objPtr); elem = Itcl_NextListElem(elem); } Tcl_SetObjResult(interp, listPtr); return TCL_OK; } |
︙ | ︙ | |||
980 981 982 983 984 985 986 | return TCL_ERROR; } /* * Traverse through the derivation hierarchy and return * base class names. */ | | | | 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 | return TCL_ERROR; } /* * Traverse through the derivation hierarchy and return * base class names. */ listPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { if (iclsPtr->nsPtr == NULL) { Tcl_AppendResult(interp, "ITCL: iclsPtr->nsPtr == NULL", Tcl_GetString(iclsPtr->fullNamePtr), NULL); return TCL_ERROR; } objPtr = Tcl_NewStringObj(iclsPtr->nsPtr->fullName, -1); Tcl_ListObjAppendElement(NULL, listPtr, objPtr); } Itcl_DeleteHierIter(&hier); Tcl_SetObjResult(interp, listPtr); return TCL_OK; } |
︙ | ︙ | |||
1027 1028 1029 1030 1031 1032 1033 | { char *cmdName = NULL; Tcl_Obj *resultPtr = NULL; Tcl_Obj *objPtr = NULL; static const char *options[] = { "-args", "-body", "-name", "-protection", "-type", | | | 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 | { char *cmdName = NULL; Tcl_Obj *resultPtr = NULL; Tcl_Obj *objPtr = NULL; static const char *options[] = { "-args", "-body", "-name", "-protection", "-type", NULL }; enum BIfIdx { BIfArgsIdx, BIfBodyIdx, BIfNameIdx, BIfProtectIdx, BIfTypeIdx } *iflist, iflistStorage[5]; static enum BIfIdx DefInfoFunction[5] = { BIfProtectIdx, |
︙ | ︙ | |||
1095 1096 1097 1098 1099 1100 1101 | entry = Tcl_FindHashEntry(&contextIclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); objPtr = NULL; if (entry == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a member function in class \"", contextIclsPtr->nsPtr->fullName, "\"", | | | 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 | entry = Tcl_FindHashEntry(&contextIclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); objPtr = NULL; if (entry == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a member function in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } clookup = (ItclCmdLookup *)Tcl_GetHashValue(entry); imPtr = clookup->imPtr; mcode = imPtr->codePtr; |
︙ | ︙ | |||
1126 1127 1128 1129 1130 1131 1132 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (iflist[i]) { case BIfArgsIdx: if (mcode && mcode->argListPtr) { if (imPtr->usagePtr == NULL) { |
︙ | ︙ | |||
1184 1185 1186 1187 1188 1189 1190 | objPtr = Tcl_NewStringObj(val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { | | | | 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 | objPtr = Tcl_NewStringObj(val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available commands. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { entry = Tcl_FirstHashEntry(&iclsPtr->functions, &place); while (entry) { int useIt = 1; |
︙ | ︙ | |||
1222 1223 1224 1225 1226 1227 1228 | useIt = 0; } } } if (useIt) { objPtr = Tcl_NewStringObj( Tcl_GetString(imPtr->fullNamePtr), -1); | | | 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 | useIt = 0; } } } if (useIt) { objPtr = Tcl_NewStringObj( Tcl_GetString(imPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } entry = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); |
︙ | ︙ | |||
1277 1278 1279 1280 1281 1282 1283 | char *varName; const char *val; int i; int result; static const char *options[] = { "-config", "-init", "-name", "-protection", "-type", | | | 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 | char *varName; const char *val; int i; int result; static const char *options[] = { "-config", "-init", "-name", "-protection", "-type", "-value", NULL }; enum BIvIdx { BIvConfigIdx, BIvInitIdx, BIvNameIdx, BIvProtectIdx, BIvTypeIdx, BIvValueIdx } *ivlist, ivlistStorage[6]; static enum BIvIdx DefInfoVariable[5] = { |
︙ | ︙ | |||
1342 1343 1344 1345 1346 1347 1348 | */ if (varName) { entry = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, varName); if (entry == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a variable in class \"", contextIclsPtr->nsPtr->fullName, "\"", | | | 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 | */ if (varName) { entry = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, varName); if (entry == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a variable in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } vlookup = (ItclVarLookup*)Tcl_GetHashValue(entry); ivPtr = vlookup->ivPtr; /* |
︙ | ︙ | |||
1378 1379 1380 1381 1382 1383 1384 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (ivlist[i]) { case BIvConfigIdx: if (ivPtr->codePtr && Itcl_IsMemberCodeImplemented(ivPtr->codePtr)) { |
︙ | ︙ | |||
1401 1402 1403 1404 1405 1406 1407 | /* * If this is the built-in "this" variable, then * report the object name as its initialization string. */ if ((ivPtr->flags & ITCL_THIS_VAR) != 0) { if ((contextIoPtr != NULL) && (contextIoPtr->accessCmd != NULL)) { | | | 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 | /* * If this is the built-in "this" variable, then * report the object name as its initialization string. */ if ((ivPtr->flags & ITCL_THIS_VAR) != 0) { if ((contextIoPtr != NULL) && (contextIoPtr->accessCmd != NULL)) { objPtr = Tcl_NewStringObj(NULL, 0); Tcl_GetCommandFullName( contextIoPtr->iclsPtr->interp, contextIoPtr->accessCmd, objPtr); } else { objPtr = Tcl_NewStringObj("<objectName>", -1); } } else { |
︙ | ︙ | |||
1448 1449 1450 1451 1452 1453 1454 | if (objc > 1) { Tcl_DecrRefCount(resultPtr); } Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", | | | | | | | 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 | if (objc > 1) { Tcl_DecrRefCount(resultPtr); } Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", NULL); return TCL_ERROR; } else { val = Itcl_GetInstanceVar(interp, Tcl_GetString(ivPtr->namePtr), contextIoPtr, ivPtr->iclsPtr); } } if (val == NULL) { val = "<undefined>"; } objPtr = Tcl_NewStringObj((const char *)val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_ResetResult(interp); Tcl_AppendResult(interp, Tcl_GetString(resultPtr), NULL); Tcl_DecrRefCount(resultPtr); } else { /* * Return the list of available variables. Report the built-in * "this" variable only once, for the most-specific class. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { entry = Tcl_FirstHashEntry(&iclsPtr->variables, &place); while (entry) { ivPtr = (ItclVariable*)Tcl_GetHashValue(entry); if ((ivPtr->flags & ITCL_THIS_VAR) != 0) { if (iclsPtr == contextIclsPtr) { objPtr = Tcl_NewStringObj( Tcl_GetString(ivPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } else { objPtr = Tcl_NewStringObj( Tcl_GetString(ivPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } entry = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); |
︙ | ︙ | |||
1616 1617 1618 1619 1620 1621 1622 | if (hPtr != NULL) { Itcl_List varList; Tcl_Obj *resultListPtr; Tcl_Obj *namePtr; int numElems; Itcl_InitList(&varList); | | | 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 | if (hPtr != NULL) { Itcl_List varList; Tcl_Obj *resultListPtr; Tcl_Obj *namePtr; int numElems; Itcl_InitList(&varList); iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); resultListPtr = Tcl_GetObjResult(interp); numElems = 0; /* FIXME !! should perhaps skip ___DO_NOT_DELETE_THIS_VARIABLE here !! */ FOREACH_HASH_VALUE(ivPtr, &iclsPtr->variables) { if ((ivPtr->flags & ITCL_VARIABLE) != 0) { if (head != NULL) { namePtr = Tcl_NewStringObj( |
︙ | ︙ | |||
1821 1822 1823 1824 1825 1826 1827 | if (contextIclsPtr->flags & (ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS)) { hPtr = Tcl_FindHashEntry(&contextIclsPtr->delegatedFunctions, (char *)objv[1]); } if (hPtr) { | | | 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 | if (contextIclsPtr->flags & (ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS)) { hPtr = Tcl_FindHashEntry(&contextIclsPtr->delegatedFunctions, (char *)objv[1]); } if (hPtr) { ItclDelegatedFunction *idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); Tcl_Obj *objPtr = Tcl_NewStringObj("delegated ", -1); if (idmPtr->flags & ITCL_TYPE_METHOD) { what = "typemethod"; } Tcl_AppendToObj(objPtr, what, -1); Tcl_AppendToObj(objPtr, " \"", -1); |
︙ | ︙ | |||
1924 1925 1926 1927 1928 1929 1930 | if (contextIclsPtr->flags & (ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS)) { hPtr = Tcl_FindHashEntry(&contextIclsPtr->delegatedFunctions, (char *)objv[1]); } if (hPtr) { | | | 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 | if (contextIclsPtr->flags & (ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS)) { hPtr = Tcl_FindHashEntry(&contextIclsPtr->delegatedFunctions, (char *)objv[1]); } if (hPtr) { ItclDelegatedFunction *idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); Tcl_Obj *objPtr = Tcl_NewStringObj("delegated ", -1); if (idmPtr->flags & ITCL_TYPE_METHOD) { what = "typemethod"; } Tcl_AppendToObj(objPtr, what, -1); Tcl_AppendToObj(objPtr, " \"", -1); |
︙ | ︙ | |||
1976 1977 1978 1979 1980 1981 1982 | static const char *options[] = { "-cgetmethod", "-cgetmethodvar","-class", "-configuremethod", "-configuremethodvar", "-default", "-name", "-protection", "-resource", "-validatemethod", "-validatemethodvar", | | | 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 | static const char *options[] = { "-cgetmethod", "-cgetmethodvar","-class", "-configuremethod", "-configuremethodvar", "-default", "-name", "-protection", "-resource", "-validatemethod", "-validatemethodvar", "-value", NULL }; enum BOptIdx { BOptCgetMethodIdx, BOptCgetMethodVarIdx, BOptClassIdx, BOptConfigureMethodIdx, BOptConfigureMethodVarIdx, |
︙ | ︙ | |||
2057 2058 2059 2060 2061 2062 2063 | /* * Return info for a specific option. */ if (optionName) { if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", | | | | 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 | /* * Return info for a specific option. */ if (optionName) { if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", NULL); return TCL_ERROR; } optionNamePtr = Tcl_NewStringObj(optionName, -1); hPtr = Tcl_FindHashEntry(&contextIoPtr->objectOptions, (char *)optionNamePtr); Tcl_DecrRefCount(optionNamePtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", optionName, "\" isn't a option in object \"", Tcl_GetString(contextIoPtr->namePtr), "\"", NULL); return TCL_ERROR; } ioptPtr = (ItclOption*)Tcl_GetHashValue(hPtr); /* * By default, return everything. */ |
︙ | ︙ | |||
2096 2097 2098 2099 2100 2101 2102 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (ioptlist[i]) { case BOptCgetMethodIdx: if (ioptPtr->cgetMethodPtr) { objPtr = Tcl_NewStringObj( |
︙ | ︙ | |||
2200 2201 2202 2203 2204 2205 2206 | case BOptValueIdx: if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", | | | | | | 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 | case BOptValueIdx: if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", NULL); return TCL_ERROR; } else { val = ItclGetInstanceVar(interp, "itcl_options", Tcl_GetString(ioptPtr->namePtr), contextIoPtr, ioptPtr->iclsPtr); } if (val == NULL) { val = "<undefined>"; } objPtr = Tcl_NewStringObj((const char *)val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available options. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->options, &place); while (hPtr) { ioptPtr = (ItclOption*)Tcl_GetHashValue(hPtr); objPtr = ioptPtr->namePtr; Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); Tcl_SetObjResult(interp, resultPtr); } |
︙ | ︙ | |||
2274 2275 2276 2277 2278 2279 2280 | { char *componentName = NULL; Tcl_Obj *resultPtr = NULL; Tcl_Obj *objPtr = NULL; Tcl_Obj *componentNamePtr; static const char *components[] = { | | | 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 | { char *componentName = NULL; Tcl_Obj *resultPtr = NULL; Tcl_Obj *objPtr = NULL; Tcl_Obj *componentNamePtr; static const char *components[] = { "-name", "-inherit", "-value", NULL }; enum BCompIdx { BCompNameIdx, BCompInheritIdx, BCompValueIdx } *icomplist, icomplistStorage[3]; static enum BCompIdx DefInfoComponent[3] = { BCompNameIdx, |
︙ | ︙ | |||
2327 2328 2329 2330 2331 2332 2333 | infoPtr = contextIclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "cannot find class name for namespace \"", nsPtr->fullName, "\"", NULL); return TCL_ERROR; } | | | 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 | infoPtr = contextIclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "cannot find class name for namespace \"", nsPtr->fullName, "\"", NULL); return TCL_ERROR; } contextIclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * Process args: * ?componentName? ?-inherit? ?-name? ?-value? */ objv++; /* skip over command name */ objc--; |
︙ | ︙ | |||
2365 2366 2367 2368 2369 2370 2371 | } Tcl_DecrRefCount(componentNamePtr); Itcl_DeleteHierIter(&hier); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", componentName, "\" isn't a component in class \"", contextIclsPtr->nsPtr->fullName, "\"", | | | 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 | } Tcl_DecrRefCount(componentNamePtr); Itcl_DeleteHierIter(&hier); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", componentName, "\" isn't a component in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); /* * By default, return everything. */ |
︙ | ︙ | |||
2393 2394 2395 2396 2397 2398 2399 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (icomplist[i]) { case BCompNameIdx: objPtr = Tcl_NewStringObj( Tcl_GetString(icPtr->ivPtr->fullNamePtr), -1); |
︙ | ︙ | |||
2418 2419 2420 2421 2422 2423 2424 | case BCompValueIdx: if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", | | | | | | 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 | case BCompValueIdx: if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", NULL); return TCL_ERROR; } else { val = ItclGetInstanceVar(interp, Tcl_GetString(icPtr->namePtr), NULL, contextIoPtr, icPtr->ivPtr->iclsPtr); } if (val == NULL) { val = "<undefined>"; } objPtr = Tcl_NewStringObj((const char *)val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available components. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->components, &place); while (hPtr) { icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); objPtr = Tcl_NewStringObj( Tcl_GetString(icPtr->ivPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); Tcl_SetObjResult(interp, resultPtr); } |
︙ | ︙ | |||
2497 2498 2499 2500 2501 2502 2503 | ItclObject *contextIoPtr; char *name; ItclShowArgs(1, "Itcl_BiInfoWidgetCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info widget\"", | | | | | 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 | ItclObject *contextIoPtr; char *name; ItclShowArgs(1, "Itcl_BiInfoWidgetCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info widget\"", NULL); return TCL_ERROR; } /* * If this command is not invoked within a class namespace, * signal an error. */ contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { /* try it the hard way */ ClientData clientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; clientData = Itcl_GetCallFrameClientData(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (clientData != NULL) { oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData); contextIoPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, infoPtr->object_meta_type); contextIclsPtr = contextIoPtr->iclsPtr; } if ((contextIoPtr == NULL) || (contextIclsPtr == NULL)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "\nget info like this instead: " "\n namespace eval className { info widget ... }", -1)); |
︙ | ︙ | |||
2581 2582 2583 2584 2585 2586 2587 | ClientData clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { #ifdef NOTYET static const char *components[] = { | | | 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 | ClientData clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { #ifdef NOTYET static const char *components[] = { "-name", "-inherit", "-value", NULL }; enum BCompIdx { BCompNameIdx, BCompInheritIdx, BCompValueIdx } *icomplist, icomplistStorage[3]; static enum BCompIdx DefInfoComponent[3] = { BCompNameIdx, |
︙ | ︙ | |||
2664 2665 2666 2667 2668 2669 2670 | ClientData clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { #ifdef NOTYET static const char *components[] = { | | | 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 | ClientData clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ { #ifdef NOTYET static const char *components[] = { "-name", "-inherit", "-value", NULL }; enum BCompIdx { BCompNameIdx, BCompInheritIdx, BCompValueIdx } *icomplist, icomplistStorage[3]; static enum BCompIdx DefInfoComponent[3] = { BCompNameIdx, |
︙ | ︙ | |||
2753 2754 2755 2756 2757 2758 2759 | ItclObject *contextIoPtr; char *name; ItclShowArgs(1, "Itcl_BiInfoTypeCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info type\"", | | | | | 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 | ItclObject *contextIoPtr; char *name; ItclShowArgs(1, "Itcl_BiInfoTypeCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info type\"", NULL); return TCL_ERROR; } /* * If this command is not invoked within a class namespace, * signal an error. */ contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { /* try it the hard way */ ClientData clientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; clientData = Itcl_GetCallFrameClientData(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (clientData != NULL) { oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData); contextIoPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, infoPtr->object_meta_type); contextIclsPtr = contextIoPtr->iclsPtr; } if ((contextIoPtr == NULL) || (contextIclsPtr == NULL)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "\nget info like this instead: " "\n namespace eval className { info type ...}", -1)); |
︙ | ︙ | |||
2838 2839 2840 2841 2842 2843 2844 | ItclClass *contextIclsPtr; ItclObject *contextIoPtr; ItclShowArgs(1, "Itcl_BiInfoHullTypeCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info hulltype\"", | | | | | 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 | ItclClass *contextIclsPtr; ItclObject *contextIoPtr; ItclShowArgs(1, "Itcl_BiInfoHullTypeCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info hulltype\"", NULL); return TCL_ERROR; } /* * If this command is not invoked within a class namespace, * signal an error. */ contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { /* try it the hard way */ ClientData clientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; clientData = Itcl_GetCallFrameClientData(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (clientData != NULL) { oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData); contextIoPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, infoPtr->object_meta_type); contextIclsPtr = contextIoPtr->iclsPtr; } if ((contextIoPtr == NULL) || (contextIclsPtr == NULL)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "\nget info like this instead: " "\n namespace eval className { info hulltype ... }", -1)); |
︙ | ︙ | |||
3010 3011 3012 3013 3014 3015 3016 | const char *val; char *cmdName; int i; int result; static const char *options[] = { "-args", "-body", "-name", "-protection", "-type", | | | 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 | const char *val; char *cmdName; int i; int result; static const char *options[] = { "-args", "-body", "-name", "-protection", "-type", NULL }; enum BIfIdx { BIfArgsIdx, BIfBodyIdx, BIfNameIdx, BIfProtectIdx, BIfTypeIdx } *iflist, iflistStorage[5]; static enum BIfIdx DefInfoFunction[5] = { BIfProtectIdx, |
︙ | ︙ | |||
3068 3069 3070 3071 3072 3073 3074 | hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); objPtr = NULL; if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a method in class \"", contextIclsPtr->nsPtr->fullName, "\"", | | | | 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 | hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); objPtr = NULL; if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a method in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } clookup = (ItclCmdLookup *)Tcl_GetHashValue(hPtr); imPtr = clookup->imPtr; mcode = imPtr->codePtr; if (imPtr->flags & ITCL_COMMON) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a method in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } /* * By default, return everything. */ if (objc == 0) { |
︙ | ︙ | |||
3106 3107 3108 3109 3110 3111 3112 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (iflist[i]) { case BIfArgsIdx: if (mcode && mcode->argListPtr) { if (imPtr->usagePtr == NULL) { |
︙ | ︙ | |||
3163 3164 3165 3166 3167 3168 3169 | objPtr = Tcl_NewStringObj(val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { | | | | | 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 | objPtr = Tcl_NewStringObj(val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available commands. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->functions, &place); while (hPtr) { int useIt = 1; imPtr = (ItclMemberFunc*)Tcl_GetHashValue(hPtr); if (!(imPtr->flags & ITCL_METHOD)) { useIt = 0; } if (useIt) { objPtr = Tcl_NewStringObj( Tcl_GetString(imPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); |
︙ | ︙ | |||
3233 3234 3235 3236 3237 3238 3239 | const char *name; const char *pattern; ItclShowArgs(1, "Itcl_BiInfoMethodsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 | const char *name; const char *pattern; ItclShowArgs(1, "Itcl_BiInfoMethodsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (ioPtr != NULL) { iclsPtr = ioPtr->iclsPtr; } if (objc == 2) { pattern = Tcl_GetString(objv[1]); |
︙ | ︙ | |||
3340 3341 3342 3343 3344 3345 3346 | int result; int i; ItclShowArgs(1, "Itcl_BiInfoOptionsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 | int result; int i; ItclShowArgs(1, "Itcl_BiInfoOptionsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (ioPtr != NULL) { iclsPtr = ioPtr->iclsPtr; } if (objc > 2) { Tcl_AppendResult(interp, "wrong # args should be: info options ", |
︙ | ︙ | |||
3505 3506 3507 3508 3509 3510 3511 | const char *name; const char *pattern; ItclShowArgs(1, "Itcl_BiInfoComponentsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 | const char *name; const char *pattern; ItclShowArgs(1, "Itcl_BiInfoComponentsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (ioPtr != NULL) { iclsPtr = ioPtr->iclsPtr; } if (iclsPtr == NULL) { Tcl_AppendResult(interp, "INTERNAL ERROR in Itcl_BiInfoComponentsCmd", |
︙ | ︙ | |||
3579 3580 3581 3582 3583 3584 3585 | const char *val; char *cmdName; int i; int result; static const char *options[] = { "-args", "-body", "-name", "-protection", "-type", | | | 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 | const char *val; char *cmdName; int i; int result; static const char *options[] = { "-args", "-body", "-name", "-protection", "-type", NULL }; enum BIfIdx { BIfArgsIdx, BIfBodyIdx, BIfNameIdx, BIfProtectIdx, BIfTypeIdx } *iflist, iflistStorage[5]; static enum BIfIdx DefInfoFunction[5] = { BIfProtectIdx, |
︙ | ︙ | |||
3638 3639 3640 3641 3642 3643 3644 | hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); objPtr = NULL; if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a typemethod in class \"", contextIclsPtr->nsPtr->fullName, "\"", | | | | 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 | hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); objPtr = NULL; if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a typemethod in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } clookup = (ItclCmdLookup *)Tcl_GetHashValue(hPtr); imPtr = clookup->imPtr; mcode = imPtr->codePtr; if (!(imPtr->flags & ITCL_TYPE_METHOD)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a typemethod in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } /* * By default, return everything. */ if (objc == 0) { |
︙ | ︙ | |||
3676 3677 3678 3679 3680 3681 3682 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (iflist[i]) { case BIfArgsIdx: if (mcode && mcode->argListPtr) { if (imPtr->usagePtr == NULL) { |
︙ | ︙ | |||
3733 3734 3735 3736 3737 3738 3739 | objPtr = Tcl_NewStringObj(val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { | | | | | 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 | objPtr = Tcl_NewStringObj(val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available commands. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->functions, &place); while (hPtr) { int useIt = 1; imPtr = (ItclMemberFunc*)Tcl_GetHashValue(hPtr); if (!(imPtr->flags & ITCL_TYPE_METHOD)) { useIt = 0; } if (useIt) { objPtr = Tcl_NewStringObj( Tcl_GetString(imPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); |
︙ | ︙ | |||
3803 3804 3805 3806 3807 3808 3809 | const char *name; const char *pattern; ItclShowArgs(1, "Itcl_BiInfoTypeMethodsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 | const char *name; const char *pattern; ItclShowArgs(1, "Itcl_BiInfoTypeMethodsCmd", objc, objv); iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (ioPtr != NULL) { iclsPtr = ioPtr->iclsPtr; } if (objc > 1) { pattern = Tcl_GetString(objv[1]); |
︙ | ︙ | |||
3911 3912 3913 3914 3915 3916 3917 | Tcl_AppendResult(interp, "wrong # args should be: info typevars ?pattern?", NULL); return TCL_ERROR; } iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 | Tcl_AppendResult(interp, "wrong # args should be: info typevars ?pattern?", NULL); return TCL_ERROR; } iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (ioPtr != NULL) { iclsPtr = ioPtr->iclsPtr; } if (objc == 2) { pattern = Tcl_GetString(objv[1]); |
︙ | ︙ | |||
3969 3970 3971 3972 3973 3974 3975 | char *varName; const char *val; int i; int result; static const char *options[] = { "-init", "-name", "-protection", "-type", | | | 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 | char *varName; const char *val; int i; int result; static const char *options[] = { "-init", "-name", "-protection", "-type", "-value", NULL }; enum BIvIdx { BIvInitIdx, BIvNameIdx, BIvProtectIdx, BIvTypeIdx, BIvValueIdx |
︙ | ︙ | |||
4027 4028 4029 4030 4031 4032 4033 | */ if (varName) { hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, varName); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a typevariable in class \"", contextIclsPtr->nsPtr->fullName, "\"", | | | | 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 | */ if (varName) { hPtr = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, varName); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a typevariable in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); ivPtr = vlookup->ivPtr; if (!(ivPtr->flags & ITCL_TYPE_VARIABLE)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a typevariable in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } /* * By default, return everything. */ if (objc == 0) { ivlist = DefInfoVariable; |
︙ | ︙ | |||
4062 4063 4064 4065 4066 4067 4068 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | | 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (ivlist[i]) { case BIvInitIdx: /* * If this is the built-in "this" variable, then * report the object name as its initialization string. */ if ((ivPtr->flags & ITCL_THIS_VAR) != 0) { if ((contextIoPtr != NULL) && (contextIoPtr->accessCmd != NULL)) { objPtr = Tcl_NewStringObj(NULL, 0); Tcl_GetCommandFullName( contextIoPtr->iclsPtr->interp, contextIoPtr->accessCmd, objPtr); } else { objPtr = Tcl_NewStringObj("<objectName>", -1); } } else { |
︙ | ︙ | |||
4122 4123 4124 4125 4126 4127 4128 | if (objc > 1) { Tcl_DecrRefCount(resultPtr); } Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", | | | | | | | 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 | if (objc > 1) { Tcl_DecrRefCount(resultPtr); } Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", NULL); return TCL_ERROR; } else { val = Itcl_GetInstanceVar(interp, Tcl_GetString(ivPtr->namePtr), contextIoPtr, ivPtr->iclsPtr); } } if (val == NULL) { val = "<undefined>"; } objPtr = Tcl_NewStringObj((const char *)val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_ResetResult(interp); Tcl_AppendResult(interp, Tcl_GetString(resultPtr), NULL); Tcl_DecrRefCount(resultPtr); } else { /* * Return the list of available variables. Report the built-in * "this" variable only once, for the most-specific class. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->variables, &place); while (hPtr) { ivPtr = (ItclVariable*)Tcl_GetHashValue(hPtr); if (ivPtr->flags & ITCL_TYPE_VAR) { if ((ivPtr->flags & ITCL_THIS_VAR) != 0) { if (iclsPtr == contextIclsPtr) { objPtr = Tcl_NewStringObj( Tcl_GetString(ivPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } else { objPtr = Tcl_NewStringObj( Tcl_GetString(ivPtr->fullNamePtr), -1); Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); |
︙ | ︙ | |||
4237 4238 4239 4240 4241 4242 4243 | ItclObject *contextIoPtr; char *name; ItclShowArgs(1, "Itcl_BiInfoWidgetadaptorCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info widgetadaptor\"", | | | | | 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 | ItclObject *contextIoPtr; char *name; ItclShowArgs(1, "Itcl_BiInfoWidgetadaptorCmd", objc, objv); if (objc != 1) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"info widgetadaptor\"", NULL); return TCL_ERROR; } /* * If this command is not invoked within a class namespace, * signal an error. */ contextIclsPtr = NULL; if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) { /* try it the hard way */ ClientData clientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; clientData = Itcl_GetCallFrameClientData(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (clientData != NULL) { oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)clientData); contextIoPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, infoPtr->object_meta_type); contextIclsPtr = contextIoPtr->iclsPtr; } if ((contextIoPtr == NULL) || (contextIclsPtr == NULL)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "\nget info like this instead: " "\n namespace eval className { info widgetadaptor ... }", -1)); |
︙ | ︙ | |||
4331 4332 4333 4334 4335 4336 4337 | Tcl_AppendResult(interp, "wrong # args should be: info instances ?pattern?", NULL); return TCL_ERROR; } iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { | | | 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 | Tcl_AppendResult(interp, "wrong # args should be: info instances ?pattern?", NULL); return TCL_ERROR; } iclsPtr = NULL; pattern = NULL; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { Tcl_AppendResult(interp, "cannot get context ", NULL); return TCL_ERROR; } if (ioPtr != NULL) { iclsPtr = ioPtr->iclsPtr; } if (objc == 2) { pattern = Tcl_GetString(objv[1]); |
︙ | ︙ | |||
4649 4650 4651 4652 4653 4654 4655 | ItclClass *iclsPtr; char *optionName; int i; int result; static const char *options[] = { "-as", "-class", "-component", "-exceptions", | | | 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 | ItclClass *iclsPtr; char *optionName; int i; int result; static const char *options[] = { "-as", "-class", "-component", "-exceptions", "-name", "-resource", NULL }; enum BOptIdx { BOptAsIdx, BOptClassIdx, BOptComponentIdx, BOptExceptionsIdx, BOptNameIdx, BOptResourceIdx } *ioptlist, ioptlistStorage[6]; static enum BOptIdx DefInfoOption[6] = { |
︙ | ︙ | |||
4691 4692 4693 4694 4695 4696 4697 | infoPtr = contextIclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "cannot find class name for namespace \"", nsPtr->fullName, "\"", NULL); return TCL_ERROR; } | | | 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 | infoPtr = contextIclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { Tcl_AppendResult(interp, "cannot find class name for namespace \"", nsPtr->fullName, "\"", NULL); return TCL_ERROR; } contextIclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * Process args: * ?optionName? ?-name? ?-resource? ?-class? * ?-as? ?-exceptions? */ objv++; /* skip over command name */ |
︙ | ︙ | |||
4714 4715 4716 4717 4718 4719 4720 | /* * Return info for a specific option. */ if (optionName) { if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", | | | | 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 | /* * Return info for a specific option. */ if (optionName) { if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "cannot access object-specific info ", "without an object context", NULL); return TCL_ERROR; } optionNamePtr = Tcl_NewStringObj(optionName, -1); hPtr = Tcl_FindHashEntry(&contextIoPtr->objectDelegatedOptions, (char *)optionNamePtr); Tcl_DecrRefCount(optionNamePtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", optionName, "\" isn't an option in object \"", Tcl_GetString(contextIoPtr->namePtr), "\"", NULL); return TCL_ERROR; } idoptPtr = (ItclDelegatedOption*)Tcl_GetHashValue(hPtr); /* * By default, return everything. */ |
︙ | ︙ | |||
4753 4754 4755 4756 4757 4758 4759 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (ioptlist[i]) { case BOptAsIdx: if (idoptPtr->asPtr) { objPtr = Tcl_NewStringObj( |
︙ | ︙ | |||
4813 4814 4815 4816 4817 4818 4819 | break; } if (objc == 1) { resultPtr = objPtr; } else { | | | | | 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 | break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available options. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->delegatedOptions, &place); while (hPtr) { idoptPtr = (ItclDelegatedOption*)Tcl_GetHashValue(hPtr); objPtr = idoptPtr->namePtr; Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); Tcl_SetObjResult(interp, resultPtr); } |
︙ | ︙ | |||
4881 4882 4883 4884 4885 4886 4887 | ItclClass *iclsPtr; char *cmdName; int i; int result; static const char *options[] = { "-as", "-component", "-exceptions", | | | 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 | ItclClass *iclsPtr; char *cmdName; int i; int result; static const char *options[] = { "-as", "-component", "-exceptions", "-name", "-using", NULL }; enum BOptIdx { BOptAsIdx, BOptComponentIdx, BOptExceptionsIdx, BOptNameIdx, BOptUsingIdx |
︙ | ︙ | |||
4949 4950 4951 4952 4953 4954 4955 | (char *)cmdNamePtr); } Tcl_DecrRefCount(cmdNamePtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a delegated method in object \"", Tcl_GetString(contextIoPtr->namePtr), "\"", | | | | 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 | (char *)cmdNamePtr); } Tcl_DecrRefCount(cmdNamePtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a delegated method in object \"", Tcl_GetString(contextIoPtr->namePtr), "\"", NULL); return TCL_ERROR; } idmPtr = (ItclDelegatedFunction*)Tcl_GetHashValue(hPtr); if (!(idmPtr->flags & ITCL_METHOD)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a delegated method in object \"", Tcl_GetString(contextIoPtr->namePtr), "\"", NULL); return TCL_ERROR; } /* * By default, return everything. */ if (objc == 0) { ioptlist = DefInfoOption; |
︙ | ︙ | |||
4983 4984 4985 4986 4987 4988 4989 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (ioptlist[i]) { case BOptAsIdx: if (idmPtr->asPtr) { objPtr = Tcl_NewStringObj( |
︙ | ︙ | |||
5034 5035 5036 5037 5038 5039 5040 | break; } if (objc == 1) { resultPtr = objPtr; } else { | | | | | 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 | break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available options. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->delegatedFunctions, &place); while (hPtr) { idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); if (idmPtr->flags & ITCL_METHOD) { objPtr = idmPtr->namePtr; Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); |
︙ | ︙ | |||
5106 5107 5108 5109 5110 5111 5112 | ItclClass *iclsPtr; char *cmdName; int i; int result; static const char *options[] = { "-as", "-component", "-exceptions", | | | 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 | ItclClass *iclsPtr; char *cmdName; int i; int result; static const char *options[] = { "-as", "-component", "-exceptions", "-name", "-using", NULL }; enum BOptIdx { BOptAsIdx, BOptComponentIdx, BOptExceptionsIdx, BOptNameIdx, BOptUsingIdx |
︙ | ︙ | |||
5175 5176 5177 5178 5179 5180 5181 | } Tcl_DecrRefCount(cmdNamePtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a delegated typemethod in ", contextIoPtr ? "object \"" : "class \"", contextIoPtr ? Tcl_GetString(contextIoPtr->namePtr) | | | | 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 | } Tcl_DecrRefCount(cmdNamePtr); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a delegated typemethod in ", contextIoPtr ? "object \"" : "class \"", contextIoPtr ? Tcl_GetString(contextIoPtr->namePtr) : Tcl_GetString(contextIclsPtr->namePtr), "\"", NULL); return TCL_ERROR; } idmPtr = (ItclDelegatedFunction*)Tcl_GetHashValue(hPtr); if (!(idmPtr->flags & ITCL_TYPE_METHOD)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", cmdName, "\" isn't a delegated typemethod in ", contextIoPtr ? "object \"" : "class \"", contextIoPtr ? Tcl_GetString(contextIoPtr->namePtr) : Tcl_GetString(contextIclsPtr->namePtr), "\"", NULL); return TCL_ERROR; } /* * By default, return everything. */ if (objc == 0) { ioptlist = DefInfoOption; |
︙ | ︙ | |||
5210 5211 5212 5213 5214 5215 5216 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { | | | 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 | if (result != TCL_OK) { return TCL_ERROR; } } } if (objc > 1) { resultPtr = Tcl_NewListObj(0, NULL); } for (i=0 ; i < objc; i++) { switch (ioptlist[i]) { case BOptAsIdx: if (idmPtr->asPtr) { objPtr = Tcl_NewStringObj( |
︙ | ︙ | |||
5261 5262 5263 5264 5265 5266 5267 | break; } if (objc == 1) { resultPtr = objPtr; } else { | | | | | 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 | break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } } Tcl_SetObjResult(interp, resultPtr); } else { /* * Return the list of available options. */ resultPtr = Tcl_NewListObj(0, NULL); Itcl_InitHierIter(&hier, contextIclsPtr); while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) { hPtr = Tcl_FirstHashEntry(&iclsPtr->delegatedFunctions, &place); while (hPtr) { idmPtr = (ItclDelegatedFunction *)Tcl_GetHashValue(hPtr); if (idmPtr->flags & ITCL_TYPE_METHOD) { objPtr = idmPtr->namePtr; Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } hPtr = Tcl_NextHashEntry(&place); } } Itcl_DeleteHierIter(&hier); Tcl_SetObjResult(interp, resultPtr); } return TCL_OK; } |
Changes to generic/itclInt.h.
︙ | ︙ | |||
48 49 50 51 52 53 54 | #endif /* * MSVC 8.0 started to mark many standard C library functions depreciated * including the *printf family and others. Tell it to shut up. * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0) */ | | > | | > | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | #endif /* * MSVC 8.0 started to mark many standard C library functions depreciated * including the *printf family and others. Tell it to shut up. * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0) */ #if defined(_MSC_VER) # pragma warning(disable:4244) # if _MSC_VER >= 1400 # pragma warning(disable:4267) # pragma warning(disable:4996) # endif #endif /* * Since the Tcl/Tk distribution doesn't perform any asserts, * dynamic loading can fail to find the __assert function. * As a workaround, we'll include our own. */ |
︙ | ︙ | |||
82 83 84 85 86 87 88 | * only iterates over values. */ #define FOREACH_HASH_DECLS \ Tcl_HashEntry *hPtr;Tcl_HashSearch search #define FOREACH_HASH(key,val,tablePtr) \ for(hPtr=Tcl_FirstHashEntry((tablePtr),&search); hPtr!=NULL ? \ | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | * only iterates over values. */ #define FOREACH_HASH_DECLS \ Tcl_HashEntry *hPtr;Tcl_HashSearch search #define FOREACH_HASH(key,val,tablePtr) \ for(hPtr=Tcl_FirstHashEntry((tablePtr),&search); hPtr!=NULL ? \ ((key)=Tcl_GetHashKey((tablePtr),hPtr),\ (val)=Tcl_GetHashValue(hPtr),1):0; hPtr=Tcl_NextHashEntry(&search)) #define FOREACH_HASH_VALUE(val,tablePtr) \ for(hPtr=Tcl_FirstHashEntry((tablePtr),&search); hPtr!=NULL ? \ ((val)=Tcl_GetHashValue(hPtr),1):0;hPtr=Tcl_NextHashEntry(&search)) /* * What sort of size of things we like to allocate. |
︙ | ︙ |
Changes to generic/itclIntDecls.h.
︙ | ︙ | |||
176 177 178 179 180 181 182 | const char *arglist, const char *body, ItclMemberFunc **mfuncPtr); /* 55 */ ITCLAPI int Itcl_ChangeMemberFunc(Tcl_Interp *interp, ItclMemberFunc *mfunc, const char *arglist, const char *body); /* 56 */ | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | const char *arglist, const char *body, ItclMemberFunc **mfuncPtr); /* 55 */ ITCLAPI int Itcl_ChangeMemberFunc(Tcl_Interp *interp, ItclMemberFunc *mfunc, const char *arglist, const char *body); /* 56 */ ITCLAPI void Itcl_DeleteMemberFunc(void *cdata); /* 57 */ ITCLAPI int Itcl_CreateMemberCode(Tcl_Interp *interp, ItclClass *iclsPtr, const char *arglist, const char *body, ItclMemberCode **mcodePtr); /* 58 */ ITCLAPI void Itcl_DeleteMemberCode(char *cdata); /* 59 */ |
︙ | ︙ | |||
580 581 582 583 584 585 586 | void (*reserved49)(void); int (*itcl_BodyCmd) (ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 50 */ int (*itcl_ConfigBodyCmd) (ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 51 */ int (*itcl_CreateMethod) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *namePtr, const char *arglist, const char *body); /* 52 */ int (*itcl_CreateProc) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *namePtr, const char *arglist, const char *body); /* 53 */ int (*itcl_CreateMemberFunc) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *name, const char *arglist, const char *body, ItclMemberFunc **mfuncPtr); /* 54 */ int (*itcl_ChangeMemberFunc) (Tcl_Interp *interp, ItclMemberFunc *mfunc, const char *arglist, const char *body); /* 55 */ | | | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 | void (*reserved49)(void); int (*itcl_BodyCmd) (ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 50 */ int (*itcl_ConfigBodyCmd) (ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 51 */ int (*itcl_CreateMethod) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *namePtr, const char *arglist, const char *body); /* 52 */ int (*itcl_CreateProc) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *namePtr, const char *arglist, const char *body); /* 53 */ int (*itcl_CreateMemberFunc) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *name, const char *arglist, const char *body, ItclMemberFunc **mfuncPtr); /* 54 */ int (*itcl_ChangeMemberFunc) (Tcl_Interp *interp, ItclMemberFunc *mfunc, const char *arglist, const char *body); /* 55 */ void (*itcl_DeleteMemberFunc) (void *cdata); /* 56 */ int (*itcl_CreateMemberCode) (Tcl_Interp *interp, ItclClass *iclsPtr, const char *arglist, const char *body, ItclMemberCode **mcodePtr); /* 57 */ void (*itcl_DeleteMemberCode) (char *cdata); /* 58 */ int (*itcl_GetMemberCode) (Tcl_Interp *interp, ItclMemberFunc *mfunc); /* 59 */ void (*reserved60)(void); int (*itcl_EvalMemberCode) (Tcl_Interp *interp, ItclMemberFunc *mfunc, ItclObject *contextObj, int objc, Tcl_Obj *const objv[]); /* 61 */ void (*reserved62)(void); void (*reserved63)(void); |
︙ | ︙ |
Changes to generic/itclLinkage.c.
︙ | ︙ | |||
70 71 72 73 74 75 76 | * this procedure returns an error. * * Returns TCL_OK on success, or TCL_ERROR (along with an error message * in interp->result) if anything goes wrong. * ------------------------------------------------------------------------ */ int | | | | | | | | | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | * this procedure returns an error. * * Returns TCL_OK on success, or TCL_ERROR (along with an error message * in interp->result) if anything goes wrong. * ------------------------------------------------------------------------ */ int Itcl_RegisterC( Tcl_Interp *interp, /* interpreter handling this registration */ const char *name, /* symbolic name for procedure */ Tcl_CmdProc *proc, /* procedure handling Tcl command */ ClientData clientData, /* client data associated with proc */ Tcl_CmdDeleteProc *deleteProc) /* proc called to free up client data */ { int newEntry; Tcl_HashEntry *entry; Tcl_HashTable *procTable; ItclCfunc *cfunc; /* * Make sure that a proc was specified. */ if (!proc) { Tcl_AppendResult(interp, "initialization error: null pointer for ", "C procedure \"", name, "\"", NULL); return TCL_ERROR; } /* * Add a new entry for the given procedure. If an entry with * this name already exists, then make sure that it was defined * with the same proc. */ procTable = ItclGetRegisteredProcs(interp); entry = Tcl_CreateHashEntry(procTable, name, &newEntry); if (!newEntry) { cfunc = (ItclCfunc*)Tcl_GetHashValue(entry); if (cfunc->argCmdProc != NULL && cfunc->argCmdProc != proc) { Tcl_AppendResult(interp, "initialization error: C procedure ", "with name \"", name, "\" already defined", NULL); return TCL_ERROR; } if (cfunc->deleteProc != NULL) { (*cfunc->deleteProc)(cfunc->clientData); } } else { cfunc = (ItclCfunc*)ckalloc(sizeof(ItclCfunc)); cfunc->objCmdProc = NULL; } cfunc->argCmdProc = proc; cfunc->clientData = clientData; cfunc->deleteProc = deleteProc; Tcl_SetHashValue(entry, cfunc); return TCL_OK; } /* * ------------------------------------------------------------------------ * Itcl_RegisterObjC() |
︙ | ︙ | |||
154 155 156 157 158 159 160 | * this procedure returns an error. * * Returns TCL_OK on success, or TCL_ERROR (along with an error message * in interp->result) if anything goes wrong. * ------------------------------------------------------------------------ */ int | | | | | | | | | | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | * this procedure returns an error. * * Returns TCL_OK on success, or TCL_ERROR (along with an error message * in interp->result) if anything goes wrong. * ------------------------------------------------------------------------ */ int Itcl_RegisterObjC( Tcl_Interp *interp, /* interpreter handling this registration */ const char *name, /* symbolic name for procedure */ Tcl_ObjCmdProc *proc, /* procedure handling Tcl command */ ClientData clientData, /* client data associated with proc */ Tcl_CmdDeleteProc *deleteProc) /* proc called to free up client data */ { int newEntry; Tcl_HashEntry *entry; Tcl_HashTable *procTable; ItclCfunc *cfunc; /* * Make sure that a proc was specified. */ if (!proc) { Tcl_AppendResult(interp, "initialization error: null pointer for ", "C procedure \"", name, "\"", NULL); return TCL_ERROR; } /* * Add a new entry for the given procedure. If an entry with * this name already exists, then make sure that it was defined * with the same proc. */ procTable = ItclGetRegisteredProcs(interp); entry = Tcl_CreateHashEntry(procTable, name, &newEntry); if (!newEntry) { cfunc = (ItclCfunc*)Tcl_GetHashValue(entry); if (cfunc->objCmdProc != NULL && cfunc->objCmdProc != proc) { Tcl_AppendResult(interp, "initialization error: C procedure ", "with name \"", name, "\" already defined", NULL); return TCL_ERROR; } if (cfunc->deleteProc != NULL) { (*cfunc->deleteProc)(cfunc->clientData); } } else { cfunc = (ItclCfunc*)ckalloc(sizeof(ItclCfunc)); cfunc->argCmdProc = NULL; } cfunc->objCmdProc = proc; cfunc->clientData = clientData; cfunc->deleteProc = deleteProc; Tcl_SetHashValue(entry, cfunc); return TCL_OK; } /* * ------------------------------------------------------------------------ * Itcl_FindC() |
︙ | ︙ | |||
240 241 242 243 244 245 246 | *argProcPtr = NULL; /* assume info won't be found */ *objProcPtr = NULL; *cDataPtr = NULL; if (interp) { procTable = (Tcl_HashTable*)Tcl_GetAssocData(interp, | | | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | *argProcPtr = NULL; /* assume info won't be found */ *objProcPtr = NULL; *cDataPtr = NULL; if (interp) { procTable = (Tcl_HashTable*)Tcl_GetAssocData(interp, "itcl_RegC", NULL); if (procTable) { entry = Tcl_FindHashEntry(procTable, name); if (entry) { cfunc = (ItclCfunc*)Tcl_GetHashValue(entry); *argProcPtr = cfunc->argCmdProc; *objProcPtr = cfunc->objCmdProc; |
︙ | ︙ | |||
266 267 268 269 270 271 272 | * * Returns a pointer to a hash table containing the list of registered * procs in the specified interpreter. If the hash table does not * already exist, it is created. * ------------------------------------------------------------------------ */ static Tcl_HashTable* | | | | | | | | | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 | * * Returns a pointer to a hash table containing the list of registered * procs in the specified interpreter. If the hash table does not * already exist, it is created. * ------------------------------------------------------------------------ */ static Tcl_HashTable* ItclGetRegisteredProcs( Tcl_Interp *interp) /* interpreter handling this registration */ { Tcl_HashTable* procTable; /* * If the registration table does not yet exist, then create it. */ procTable = (Tcl_HashTable*)Tcl_GetAssocData(interp, "itcl_RegC", NULL); if (!procTable) { procTable = (Tcl_HashTable*)ckalloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(procTable, TCL_STRING_KEYS); Tcl_SetAssocData(interp, "itcl_RegC", ItclFreeC, procTable); } return procTable; } /* * ------------------------------------------------------------------------ * ItclFreeC() * * When an interpreter is deleted, this procedure is called to * free up the associated data created by Itcl_RegisterC and * Itcl_RegisterObjC. * ------------------------------------------------------------------------ */ static void ItclFreeC( ClientData clientData, /* associated data */ Tcl_Interp *interp) /* intepreter being deleted */ { Tcl_HashTable *tablePtr = (Tcl_HashTable*)clientData; Tcl_HashSearch place; Tcl_HashEntry *entry; ItclCfunc *cfunc; entry = Tcl_FirstHashEntry(tablePtr, &place); |
︙ | ︙ |
Changes to generic/itclMethod.c.
︙ | ︙ | |||
117 118 119 120 121 122 123 | ItclShowArgs(2, "Itcl_BodyCmd", objc, objv); if (objc != 4) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " class::func arglist body\"", | | | | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | ItclShowArgs(2, "Itcl_BodyCmd", objc, objv); if (objc != 4) { token = Tcl_GetString(objv[0]); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "wrong # args: should be \"", token, " class::func arglist body\"", NULL); return TCL_ERROR; } /* * Parse the member name "namesp::namesp::class::func". * Make sure that a class name was specified, and that the * class exists. */ token = Tcl_GetString(objv[1]); Itcl_ParseNamespPath(token, &buffer, &head, &tail); if (!head || *head == '\0') { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "missing class specifier for body declaration \"", token, "\"", NULL); status = TCL_ERROR; goto bodyCmdDone; } iclsPtr = Itcl_FindClass(interp, head, /* autoload */ 1); if (iclsPtr == NULL) { status = TCL_ERROR; |
︙ | ︙ | |||
167 168 169 170 171 172 173 | } } if (imPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "function \"", tail, "\" is not defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | } } if (imPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "function \"", tail, "\" is not defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); status = TCL_ERROR; goto bodyCmdDone; } arglist = Tcl_GetString(objv[2]); body = Tcl_GetString(objv[3]); |
︙ | ︙ | |||
253 254 255 256 257 258 259 | */ token = Tcl_GetString(objv[1]); Itcl_ParseNamespPath(token, &buffer, &head, &tail); if ((head == NULL) || (*head == '\0')) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "missing class specifier for body declaration \"", token, "\"", | | | 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 | */ token = Tcl_GetString(objv[1]); Itcl_ParseNamespPath(token, &buffer, &head, &tail); if ((head == NULL) || (*head == '\0')) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "missing class specifier for body declaration \"", token, "\"", NULL); status = TCL_ERROR; goto configBodyCmdDone; } iclsPtr = Itcl_FindClass(interp, head, /* autoload */ 1); if (iclsPtr == NULL) { status = TCL_ERROR; |
︙ | ︙ | |||
283 284 285 286 287 288 289 | } } if (vlookup == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "option \"", tail, "\" is not defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 | } } if (vlookup == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "option \"", tail, "\" is not defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); status = TCL_ERROR; goto configBodyCmdDone; } ivPtr = vlookup->ivPtr; if (ivPtr->protection != ITCL_PUBLIC) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "option \"", Tcl_GetString(ivPtr->fullNamePtr), "\" is not a public configuration option", NULL); status = TCL_ERROR; goto configBodyCmdDone; } token = Tcl_GetString(objv[2]); if (Itcl_CreateMemberCode(interp, iclsPtr, NULL, token, &mcode) != TCL_OK) { status = TCL_ERROR; goto configBodyCmdDone; } ItclPreserveMemberCode(mcode); |
︙ | ︙ | |||
386 387 388 389 390 391 392 | /* * Make sure that the method name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(Tcl_GetString(namePtr),"::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad method name \"", Tcl_GetString(namePtr), "\"", | | | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 | /* * Make sure that the method name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(Tcl_GetString(namePtr),"::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad method name \"", Tcl_GetString(namePtr), "\"", NULL); Tcl_DecrRefCount(namePtr); return TCL_ERROR; } /* * Create the method definition. */ |
︙ | ︙ | |||
435 436 437 438 439 440 441 | /* * Make sure that the proc name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(Tcl_GetString(namePtr),"::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad proc name \"", Tcl_GetString(namePtr), "\"", | | | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 | /* * Make sure that the proc name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(Tcl_GetString(namePtr),"::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad proc name \"", Tcl_GetString(namePtr), "\"", NULL); return TCL_ERROR; } /* * Create the proc definition. */ if (ItclCreateMemberFunc(interp, iclsPtr, namePtr, arglist, |
︙ | ︙ | |||
496 497 498 499 500 501 502 | * same name doesn't already exist. */ hPtr = Tcl_CreateHashEntry(&iclsPtr->functions, (char *)namePtr, &newEntry); if (!newEntry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | * same name doesn't already exist. */ hPtr = Tcl_CreateHashEntry(&iclsPtr->functions, (char *)namePtr, &newEntry); if (!newEntry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } /* * Try to create the implementation for this command member. */ if (ItclCreateMemberCode(interp, iclsPtr, arglist, body, |
︙ | ︙ | |||
672 673 674 675 676 677 678 | Tcl_IncrRefCount(mcode->bodyPtr); imPtr->flags |= ITCL_CONSTRUCTOR; } if (strcmp(name, "destructor") == 0) { imPtr->flags |= ITCL_DESTRUCTOR; } | | | 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 | Tcl_IncrRefCount(mcode->bodyPtr); imPtr->flags |= ITCL_CONSTRUCTOR; } if (strcmp(name, "destructor") == 0) { imPtr->flags |= ITCL_DESTRUCTOR; } Tcl_SetHashValue(hPtr, imPtr); imPtr->refCount = 1; *imPtrPtr = imPtr; return TCL_OK; } /* |
︙ | ︙ | |||
761 762 763 764 765 766 767 | } else { argsStr = ""; } Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "argument list changed for function \"", Tcl_GetString(imPtr->fullNamePtr), "\": should be \"", argsStr, "\"", | | | 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 | } else { argsStr = ""; } Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "argument list changed for function \"", Tcl_GetString(imPtr->fullNamePtr), "\": should be \"", argsStr, "\"", NULL); Itcl_DeleteMemberCode((char*)mcode); return TCL_ERROR; } if (imPtr->flags & ITCL_CONSTRUCTOR) { /* |
︙ | ︙ | |||
794 795 796 797 798 799 800 | * Free up the old implementation and install the new one. */ ItclPreserveMemberCode(mcode); ItclReleaseMemberCode(imPtr->codePtr); imPtr->codePtr = mcode; if (mcode->flags & ITCL_IMPLEMENT_TCL) { ClientData pmPtr; | | | 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 | * Free up the old implementation and install the new one. */ ItclPreserveMemberCode(mcode); ItclReleaseMemberCode(imPtr->codePtr); imPtr->codePtr = mcode; if (mcode->flags & ITCL_IMPLEMENT_TCL) { ClientData pmPtr; imPtr->tmPtr = Itcl_NewProcClassMethod(interp, imPtr->iclsPtr->clsPtr, ItclCheckCallMethod, ItclAfterCallMethod, ItclProcErrorProc, imPtr, imPtr->namePtr, mcode->argumentPtr, mcode->bodyPtr, &pmPtr); hPtr = Tcl_CreateHashEntry(&imPtr->iclsPtr->infoPtr->procMethods, (char *)imPtr->tmPtr, &isNewEntry); if (isNewEntry) { Tcl_SetHashValue(hPtr, imPtr); |
︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 | isDone = 1; } if (!isDone) { if (!Itcl_FindC(interp, body+1, &argCmdProc, &objCmdProc, &cdata)) { Tcl_AppendResult(interp, "no registered C procedure with name \"", | | | 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 | isDone = 1; } if (!isDone) { if (!Itcl_FindC(interp, body+1, &argCmdProc, &objCmdProc, &cdata)) { Tcl_AppendResult(interp, "no registered C procedure with name \"", body+1, "\"", NULL); Itcl_DeleteMemberCode((char*)mcode); return TCL_ERROR; } /* * WARNING! WARNING! WARNING! * This is a pretty dangerous approach. What's done here is |
︙ | ︙ | |||
1199 1200 1201 1202 1203 1204 1205 | mcode = imPtr->codePtr; assert(mcode != NULL); if (!Itcl_IsMemberCodeImplemented(mcode)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "member function \"", Tcl_GetString(imPtr->fullNamePtr), "\" is not defined and cannot be autoloaded", | | | | | | 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 | mcode = imPtr->codePtr; assert(mcode != NULL); if (!Itcl_IsMemberCodeImplemented(mcode)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "member function \"", Tcl_GetString(imPtr->fullNamePtr), "\" is not defined and cannot be autoloaded", NULL); return TCL_ERROR; } return TCL_OK; } static int CallItclObjectCmd( ClientData data[], Tcl_Interp *interp, int result) { Tcl_Object oPtr; ItclMemberFunc *imPtr = (ItclMemberFunc *)data[0]; ItclObject *ioPtr = (ItclObject *)data[1]; int objc = PTR2INT(data[2]); Tcl_Obj **objv = (Tcl_Obj **)data[3]; ItclShowArgs(1, "CallItclObjectCmd", objc, objv); if (ioPtr != NULL) { ioPtr->hadConstructorError = 0; } if (imPtr->flags & (ITCL_CONSTRUCTOR|ITCL_DESTRUCTOR)) { oPtr = ioPtr->oPtr; |
︙ | ︙ | |||
1306 1307 1308 1309 1310 1311 1312 | result = (*mcode->cfunc.objCmd)(mcode->clientData, interp, objc, objv); } else { if ((mcode->flags & ITCL_IMPLEMENT_ARGCMD) != 0) { char **argv; argv = (char**)ckalloc( (unsigned)(objc*sizeof(char*)) ); for (i=0; i < objc; i++) { | | | 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 | result = (*mcode->cfunc.objCmd)(mcode->clientData, interp, objc, objv); } else { if ((mcode->flags & ITCL_IMPLEMENT_ARGCMD) != 0) { char **argv; argv = (char**)ckalloc( (unsigned)(objc*sizeof(char*)) ); for (i=0; i < objc; i++) { argv[i] = Tcl_GetString(objv[i]); } result = (*mcode->cfunc.argCmd)(mcode->clientData, interp, objc, (const char **)argv); ckfree((char*)argv); } |
︙ | ︙ | |||
1462 1463 1464 1465 1466 1467 1468 | { Tcl_CallFrame *framePtr = Itcl_GetUplevelCallFrame(interp, 0); ItclObjectInfo *infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)framePtr); Itcl_Stack *stackPtr = (Itcl_Stack *) Tcl_GetHashValue(hPtr); | | | 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 | { Tcl_CallFrame *framePtr = Itcl_GetUplevelCallFrame(interp, 0); ItclObjectInfo *infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)framePtr); Itcl_Stack *stackPtr = (Itcl_Stack *) Tcl_GetHashValue(hPtr); ItclCallContext *contextPtr = (ItclCallContext *)Itcl_PopStack(stackPtr); if (Itcl_GetStackSize(stackPtr) > 0) { Tcl_Panic("frame context stack not empty!"); } Itcl_DeleteStack(stackPtr); ckfree((char *) stackPtr); Tcl_DeleteHashEntry(hPtr); |
︙ | ︙ | |||
1495 1496 1497 1498 1499 1500 1501 | ItclObjectInfo *infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)framePtr); if (hPtr) { /* Frame maps to a context stack. */ Itcl_Stack *stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); | | | 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 | ItclObjectInfo *infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)framePtr); if (hPtr) { /* Frame maps to a context stack. */ Itcl_Stack *stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); ItclCallContext *contextPtr = (ItclCallContext *)Itcl_PeekStack(stackPtr); assert(contextPtr); if (contextPtr->objectFlags & ITCL_OBJECT_ROOT_METHOD) { ItclObject *ioPtr = contextPtr->ioPtr; *iclsPtrPtr = ioPtr->iclsPtr; |
︙ | ︙ | |||
1608 1609 1610 1611 1612 1613 1614 | Tcl_AppendToObj(objPtr, Tcl_GetString(imPtr->fullNamePtr), -1); } } else { if (contextIoPtr && contextIoPtr->accessCmd) { name = (char *) Tcl_GetCommandName( contextIoPtr->iclsPtr->interp, contextIoPtr->accessCmd); Tcl_AppendStringsToObj(objPtr, name, " ", | | | | 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 | Tcl_AppendToObj(objPtr, Tcl_GetString(imPtr->fullNamePtr), -1); } } else { if (contextIoPtr && contextIoPtr->accessCmd) { name = (char *) Tcl_GetCommandName( contextIoPtr->iclsPtr->interp, contextIoPtr->accessCmd); Tcl_AppendStringsToObj(objPtr, name, " ", Tcl_GetString(imPtr->namePtr), NULL); } else { Tcl_AppendStringsToObj(objPtr, "<object> ", Tcl_GetString(imPtr->namePtr), NULL); } } } else { Tcl_AppendToObj(objPtr, Tcl_GetString(imPtr->fullNamePtr), -1); } /* |
︙ | ︙ | |||
1689 1690 1691 1692 1693 1694 1695 | iclsPtr = imPtr->iclsPtr; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { return TCL_ERROR; } if (ioPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", | | | 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 | iclsPtr = imPtr->iclsPtr; if (Itcl_GetContext(interp, &iclsPtr, &ioPtr) != TCL_OK) { return TCL_ERROR; } if (ioPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", NULL); return TCL_ERROR; } /* * Make sure that this command member can be accessed from * the current namespace context. * That is now done in ItclMapMethodNameProc !! |
︙ | ︙ | |||
1778 1779 1780 1781 1782 1783 1784 | * the current namespace context. */ if (imPtr->protection != ITCL_PUBLIC) { if (!Itcl_CanAccessFunc(imPtr, Tcl_GetCurrentNamespace(interp))) { ItclMemberFunc *imPtr2 = NULL; Tcl_HashEntry *hPtr; Tcl_ObjectContext context; | | | | | | | 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 | * the current namespace context. */ if (imPtr->protection != ITCL_PUBLIC) { if (!Itcl_CanAccessFunc(imPtr, Tcl_GetCurrentNamespace(interp))) { ItclMemberFunc *imPtr2 = NULL; Tcl_HashEntry *hPtr; Tcl_ObjectContext context; context = (Tcl_ObjectContext)Itcl_GetCallFrameClientData(interp); if (context == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't access \"", Tcl_GetString(imPtr->fullNamePtr), "\": ", Itcl_ProtectionStr(imPtr->protection), " function", NULL); return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&imPtr->iclsPtr->infoPtr->procMethods, (char *)Tcl_ObjectContextMethod(context)); if (hPtr != NULL) { imPtr2 = (ItclMemberFunc *)Tcl_GetHashValue(hPtr); } if ((imPtr->protection & ITCL_PRIVATE) && (imPtr2 != NULL) && (imPtr->iclsPtr->nsPtr != imPtr2->iclsPtr->nsPtr)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid command name \"", Tcl_GetString(objv[0]), "\"", NULL); return TCL_ERROR; } Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't access \"", Tcl_GetString(imPtr->fullNamePtr), "\": ", Itcl_ProtectionStr(imPtr->protection), " function", NULL); return TCL_ERROR; } } /* * Execute the code for the proc. Be careful to protect * the proc in case it gets deleted during execution. */ ItclPreserveIMF(imPtr); result = Itcl_EvalMemberCode(interp, imPtr, NULL, objc, objv); ItclReleaseIMF(imPtr); return result; } /* ARGSUSED */ int |
︙ | ︙ | |||
1836 1837 1838 1839 1840 1841 1842 | static int CallInvokeMethodIfExists( ClientData data[], Tcl_Interp *interp, int result) { | | | | | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 | static int CallInvokeMethodIfExists( ClientData data[], Tcl_Interp *interp, int result) { ItclClass *iclsPtr = (ItclClass *)data[0]; ItclObject *contextObj = (ItclObject *)data[1]; int objc = PTR2INT(data[2]); Tcl_Obj *const *objv = (Tcl_Obj *const *)data[3]; result = Itcl_InvokeMethodIfExists(interp, "constructor", iclsPtr, contextObj, objc, (Tcl_Obj* const*)objv); if (result != TCL_OK) { return TCL_ERROR; } |
︙ | ︙ | |||
2000 2001 2002 2003 2004 2005 2006 | imPtr = (ItclMemberFunc*)Tcl_GetHashValue(hPtr); /* * Prepend the method name to the list of arguments. */ cmdlinePtr = Itcl_CreateArgs(interp, name, objc, objv); | | | 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 | imPtr = (ItclMemberFunc*)Tcl_GetHashValue(hPtr); /* * Prepend the method name to the list of arguments. */ cmdlinePtr = Itcl_CreateArgs(interp, name, objc, objv); (void) Tcl_ListObjGetElements(NULL, cmdlinePtr, &cmdlinec, &cmdlinev); ItclShowArgs(1, "EMC", cmdlinec, cmdlinev); /* * Execute the code for the method. Be careful to protect * the method in case it gets deleted during execution. */ |
︙ | ︙ | |||
2127 2128 2129 2130 2131 2132 2133 | iclsPtr = resolveInfoPtr->iclsPtr; } infoPtr = iclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return NULL; } | | | 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 | iclsPtr = resolveInfoPtr->iclsPtr; } infoPtr = iclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return NULL; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); objPtr = Tcl_NewStringObj(cmdName, -1); hPtr = Tcl_FindHashEntry(&iclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr == NULL) { if (strcmp(cmdName, "@itcl-builtin-cget") == 0) { return Tcl_FindCommand(interp, "::itcl::builtin::cget", NULL, 0); } |
︙ | ︙ | |||
2244 2245 2246 2247 2248 2249 2250 | } else { ioPtr = NULL; iclsPtr = resolveInfoPtr->iclsPtr; } infoPtr = iclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr != NULL) { | | | | 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 | } else { ioPtr = NULL; iclsPtr = resolveInfoPtr->iclsPtr; } infoPtr = iclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr != NULL) { iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } hPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, varName); if (hPtr == NULL) { /* no class/object variable */ return NULL; } ivlPtr = (ItclVarLookup *)Tcl_GetHashValue(hPtr); if (ivlPtr == NULL) { return NULL; } if (!ivlPtr->accessible) { return NULL; } |
︙ | ︙ | |||
2276 2277 2278 2279 2280 2281 2282 | if (ioPtr != NULL) { hPtr = Tcl_FindHashEntry(&ioPtr->objectVariables, (char *)ivlPtr->ivPtr); } } } if (hPtr != NULL) { | | | 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 | if (ioPtr != NULL) { hPtr = Tcl_FindHashEntry(&ioPtr->objectVariables, (char *)ivlPtr->ivPtr); } } } if (hPtr != NULL) { varPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); } return varPtr; } /* * ------------------------------------------------------------------------ * ItclCheckCallProc() |
︙ | ︙ | |||
2369 2370 2371 2372 2373 2374 2375 | Tcl_AppendResult(interp, "ItclCheckCallMethod cannot get context object (NULL)", " for ", Tcl_GetString(imPtr->fullNamePtr), NULL); result = TCL_ERROR; goto finishReturn; } | | | | 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 | Tcl_AppendResult(interp, "ItclCheckCallMethod cannot get context object (NULL)", " for ", Tcl_GetString(imPtr->fullNamePtr), NULL); result = TCL_ERROR; goto finishReturn; } oPtr = Tcl_ObjectContextObject(contextPtr); ioPtr = (ItclObject *)Tcl_ObjectGetMetadata(oPtr, imPtr->iclsPtr->infoPtr->object_meta_type); } if ((imPtr->codePtr != NULL) && (imPtr->codePtr->flags & ITCL_IMPLEMENT_NONE)) { Tcl_AppendResult(interp, "member function \"", Tcl_GetString(imPtr->fullNamePtr), "\" is not defined and cannot be autoloaded", NULL); |
︙ | ︙ | |||
2414 2415 2416 2417 2418 2419 2420 | } isNew = 0; callContextPtr = NULL; currNsPtr = Tcl_GetCurrentNamespace(interp); if (ioPtr != NULL) { hPtr = Tcl_CreateHashEntry(&ioPtr->contextCache, (char *)imPtr, &isNew); if (!isNew) { | | | 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 | } isNew = 0; callContextPtr = NULL; currNsPtr = Tcl_GetCurrentNamespace(interp); if (ioPtr != NULL) { hPtr = Tcl_CreateHashEntry(&ioPtr->contextCache, (char *)imPtr, &isNew); if (!isNew) { callContextPtr2 = (ItclCallContext *)Tcl_GetHashValue(hPtr); if (callContextPtr2->refCount == 0) { callContextPtr = callContextPtr2; callContextPtr->objectFlags = ioPtr->flags; callContextPtr->nsPtr = Tcl_GetCurrentNamespace(interp); callContextPtr->ioPtr = ioPtr; callContextPtr->imPtr = imPtr; callContextPtr->refCount = 1; |
︙ | ︙ | |||
2532 2533 2534 2535 2536 2537 2538 | ItclObjectInfo *infoPtr = imPtr->infoPtr; Tcl_CallFrame *framePtr; Itcl_Stack *stackPtr; hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)contextPtr); assert(hPtr); stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); | | | | 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 | ItclObjectInfo *infoPtr = imPtr->infoPtr; Tcl_CallFrame *framePtr; Itcl_Stack *stackPtr; hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)contextPtr); assert(hPtr); stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); framePtr = (Tcl_CallFrame *)Itcl_PopStack(stackPtr); if (Itcl_GetStackSize(stackPtr) == 0) { Itcl_DeleteStack(stackPtr); ckfree((char *) stackPtr); Tcl_DeleteHashEntry(hPtr); } hPtr = Tcl_FindHashEntry(&infoPtr->frameContext, (char *)framePtr); assert(hPtr); stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); callContextPtr = (ItclCallContext *)Itcl_PopStack(stackPtr); if (Itcl_GetStackSize(stackPtr) == 0) { Itcl_DeleteStack(stackPtr); ckfree((char *) stackPtr); Tcl_DeleteHashEntry(hPtr); } } if (callContextPtr == NULL) { |
︙ | ︙ | |||
2637 2638 2639 2640 2641 2642 2643 | if (hPtr == NULL) { /* Can this happen? */ return; } /* Frame maps to a context stack. */ stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); | | | 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 | if (hPtr == NULL) { /* Can this happen? */ return; } /* Frame maps to a context stack. */ stackPtr = (Itcl_Stack *)Tcl_GetHashValue(hPtr); callContextPtr = (ItclCallContext *)Itcl_PeekStack(stackPtr); if (callContextPtr == NULL) { return; } currIclsPtr = NULL; objPtr = NULL; |
︙ | ︙ |
Changes to generic/itclObject.c.
︙ | ︙ | |||
128 129 130 131 132 133 134 | ObjectRenamedTrace( ClientData clientData, /* The object being deleted. */ Tcl_Interp *interp, /* The interpreter containing the object. */ const char *oldName, /* What the object was (last) called. */ const char *newName, /* Always NULL ??. not for itk!! */ int flags) /* Why was the object deleted? */ { | | | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | ObjectRenamedTrace( ClientData clientData, /* The object being deleted. */ Tcl_Interp *interp, /* The interpreter containing the object. */ const char *oldName, /* What the object was (last) called. */ const char *newName, /* Always NULL ??. not for itk!! */ int flags) /* Why was the object deleted? */ { ItclObject *ioPtr = (ItclObject *)clientData; Itcl_InterpState istate; if (newName != NULL) { /* FIXME should enter the new name in the hashtables for objects etc. */ return; } if (ioPtr->flags & ITCL_OBJECT_CLASS_DESTRUCTED) { |
︙ | ︙ | |||
450 451 452 453 454 455 456 | TCL_TRACE_RENAME|TCL_TRACE_DELETE, ObjectRenamedTrace, ioPtr); Tcl_DecrRefCount(tmp); } Tcl_ObjectSetMethodNameMapper(ioPtr->oPtr, ItclMapMethodNameProc); ioPtr->accessCmd = Tcl_GetObjectCommand(ioPtr->oPtr); Tcl_GetCommandInfoFromToken(ioPtr->accessCmd, &cmdInfo); | | | | | | 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | TCL_TRACE_RENAME|TCL_TRACE_DELETE, ObjectRenamedTrace, ioPtr); Tcl_DecrRefCount(tmp); } Tcl_ObjectSetMethodNameMapper(ioPtr->oPtr, ItclMapMethodNameProc); ioPtr->accessCmd = Tcl_GetObjectCommand(ioPtr->oPtr); Tcl_GetCommandInfoFromToken(ioPtr->accessCmd, &cmdInfo); cmdInfo.deleteProc = ItclDestroyObject; cmdInfo.deleteData = ioPtr; Tcl_SetCommandInfoFromToken(ioPtr->accessCmd, &cmdInfo); ioPtr->resolvePtr = (Tcl_Resolve *)ckalloc(sizeof(Tcl_Resolve)); ioPtr->resolvePtr->cmdProcPtr = Itcl_CmdAliasProc; ioPtr->resolvePtr->varProcPtr = Itcl_VarAliasProc; resolveInfoPtr = (ItclResolveInfo *)ckalloc(sizeof(ItclResolveInfo)); memset (resolveInfoPtr, 0, sizeof(ItclResolveInfo)); resolveInfoPtr->flags = ITCL_RESOLVE_OBJECT; resolveInfoPtr->ioPtr = ioPtr; ioPtr->resolvePtr->clientData = resolveInfoPtr; Tcl_ObjectSetMetadata(ioPtr->oPtr, iclsPtr->infoPtr->object_meta_type, ioPtr); /* make the object known, if it is used in the constructor already! */ hPtr = Tcl_CreateHashEntry(&iclsPtr->infoPtr->objectCmds, (char*)ioPtr->accessCmd, &newEntry); Tcl_SetHashValue(hPtr, ioPtr); hPtr = Tcl_CreateHashEntry(&iclsPtr->infoPtr->objects, (char*)ioPtr, &newEntry); Tcl_SetHashValue(hPtr, ioPtr); /* Use the TclOO object namespaces as a unique key in case the * object is renamed. Used by mytypemethod, etc. */ hPtr = Tcl_CreateHashEntry(&iclsPtr->infoPtr->instances, (Tcl_GetObjectNamespace(ioPtr->oPtr))->fullName, &newEntry); Tcl_SetHashValue(hPtr, ioPtr); /* * Now construct the object. Look for a constructor in the * most-specific class, and if there is one, invoke it. * This will cause a chain reaction, making sure that all * base classes constructors are invoked as well, in order * from least- to most-specific. Any constructors that are |
︙ | ︙ | |||
633 634 635 636 637 638 639 | result = DelegationInstall(interp, ioPtr, iclsPtr); if (result != TCL_OK) { goto errorReturn; } } hPtr = Tcl_CreateHashEntry(&iclsPtr->infoPtr->objectCmds, (char*)ioPtr->accessCmd, &newEntry); | | | | | 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 | result = DelegationInstall(interp, ioPtr, iclsPtr); if (result != TCL_OK) { goto errorReturn; } } hPtr = Tcl_CreateHashEntry(&iclsPtr->infoPtr->objectCmds, (char*)ioPtr->accessCmd, &newEntry); Tcl_SetHashValue(hPtr, ioPtr); hPtr = Tcl_CreateHashEntry(&iclsPtr->infoPtr->objects, (char*)ioPtr, &newEntry); Tcl_SetHashValue(hPtr, ioPtr); /* * This is an inelegant hack, left behind until the need for it * can be eliminated by getting the inheritance tree right. */ if (iclsPtr->flags & (ITCL_ECLASS|ITCL_TYPE|ITCL_WIDGET|ITCL_WIDGETADAPTOR)) { Tcl_NewInstanceMethod(interp, ioPtr->oPtr, Tcl_NewStringObj("unknown", -1), 0, &itclRootMethodType, (void *)ItclUnknownGuts); } if (iclsPtr->flags & (ITCL_TYPE|ITCL_WIDGETADAPTOR)) { Tcl_Obj *objPtr = Tcl_NewObj(); Tcl_GetCommandFullName(interp, ioPtr->accessCmd, objPtr); if (iclsPtr->flags & ITCL_WIDGETADAPTOR) { /* skip over the leading :: */ |
︙ | ︙ | |||
838 839 840 841 842 843 844 | if (Itcl_PushCallFrame(interp, &frame, varNsPtr2, /*isProcCallFrame*/0) != TCL_OK) { goto errorCleanup2; } Tcl_TraceVar2(interp, "itcl_options", NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, | | | | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 | if (Itcl_PushCallFrame(interp, &frame, varNsPtr2, /*isProcCallFrame*/0) != TCL_OK) { goto errorCleanup2; } Tcl_TraceVar2(interp, "itcl_options", NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceOptionVar, ioPtr); Itcl_PopCallFrame(interp); if (Itcl_PushCallFrame(interp, &frame, varNsPtr, /*isProcCallFrame*/0) != TCL_OK) { goto errorCleanup2; } hPtr = Tcl_NextHashEntry(&place); continue; } if (ivPtr->flags & ITCL_COMPONENT_VAR) { hPtr2 = Tcl_FindHashEntry(&ivPtr->iclsPtr->components, (char *)ivPtr->namePtr); if (hPtr2 == NULL) { Tcl_AppendResult(interp, "cannot find component \"", Tcl_GetString(ivPtr->namePtr), "\" in class \"", Tcl_GetString(ivPtr->iclsPtr->namePtr), NULL); goto errorCleanup; } icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr2); if (icPtr->flags & ITCL_COMPONENT_INHERIT) { if (inheritComponentName != NULL) { Tcl_AppendResult(interp, "object \"", Tcl_GetString(ioPtr->namePtr), "\" can only have one component with inherit.", " Had already component \"", inheritComponentName, |
︙ | ︙ | |||
914 915 916 917 918 919 920 | " variable \"", varNsPtr->fullName, "::", varName, "\"\n", NULL); goto errorCleanup; } if (ivPtr->flags & ITCL_THIS_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceThisVar, | | | | | | | | 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 | " variable \"", varNsPtr->fullName, "::", varName, "\"\n", NULL); goto errorCleanup; } if (ivPtr->flags & ITCL_THIS_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceThisVar, ioPtr); isDone = 1; } if (!isDone && ivPtr->flags & ITCL_TYPE_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceTypeVar, ioPtr); isDone = 1; } if (!isDone && ivPtr->flags & ITCL_SELF_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceSelfVar, ioPtr); isDone = 1; } if (!isDone && ivPtr->flags & ITCL_SELFNS_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceSelfnsVar, ioPtr); isDone = 1; } if (!isDone && ivPtr->flags & ITCL_WIN_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceWinVar, ioPtr); isDone = 1; } } else { if (ivPtr->flags & ITCL_HULL_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceItclHullVar, ioPtr); } else { if (ivPtr->init != NULL) { if (Tcl_SetVar2(interp, Tcl_GetString(ivPtr->namePtr), NULL, Tcl_GetString(ivPtr->init), TCL_NAMESPACE_ONLY) == NULL) { goto errorCleanup; |
︙ | ︙ | |||
979 980 981 982 983 984 985 | val = Tcl_SetVar2(interp, Tcl_DStringValue(&buffer3), argv[i], argv[i + 1], TCL_NAMESPACE_ONLY); if (!val) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot initialize variable \"", Tcl_GetString(ivPtr->namePtr), "\"", | | | | | | | | 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 | val = Tcl_SetVar2(interp, Tcl_DStringValue(&buffer3), argv[i], argv[i + 1], TCL_NAMESPACE_ONLY); if (!val) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot initialize variable \"", Tcl_GetString(ivPtr->namePtr), "\"", NULL); return TCL_ERROR; } i++; } Tcl_DStringFree(&buffer3); ckfree((char *)argv); } } } } else { if (ivPtr->flags & ITCL_HULL_VAR) { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceItclHullVar, ioPtr); } hPtr2 = Tcl_FindHashEntry(&iclsPtr2->classCommons, (char *)ivPtr); if (hPtr2 == NULL) { goto errorCleanup; } varPtr = (Tcl_Var)Tcl_GetHashValue(hPtr2); hPtr2 = Tcl_CreateHashEntry(&ioPtr->objectVariables, (char *)ivPtr, &isNew); if (isNew) { Itcl_PreserveVar(varPtr); Tcl_SetHashValue(hPtr2, varPtr); } if (ivPtr->flags & ITCL_COMPONENT_VAR) { if (ivPtr->flags & ITCL_COMMON) { Tcl_Obj *objPtr2; objPtr2 = Tcl_NewStringObj(ITCL_VARIABLES_NAMESPACE, -1); Tcl_AppendToObj(objPtr2, (Tcl_GetObjectNamespace( ivPtr->iclsPtr->oPtr))->fullName, -1); Tcl_AppendToObj(objPtr2, "::", -1); Tcl_AppendToObj(objPtr2, varName, -1); /* itcl_hull is traced in itclParse.c */ if (strcmp(varName, "itcl_hull") == 0) { Tcl_TraceVar2(interp, Tcl_GetString(objPtr2), NULL, TCL_TRACE_WRITES, ItclTraceItclHullVar, ioPtr); } else { Tcl_TraceVar2(interp, Tcl_GetString(objPtr2), NULL, TCL_TRACE_WRITES, ItclTraceComponentVar, ioPtr); } Tcl_DecrRefCount(objPtr2); } else { Tcl_TraceVar2(interp, varName, NULL, TCL_TRACE_WRITES, ItclTraceComponentVar, ioPtr); } } } hPtr = Tcl_NextHashEntry(&place); } Itcl_PopCallFrame(interp); iclsPtr2 = Itcl_AdvanceHierIter(&hier); |
︙ | ︙ | |||
1129 1130 1131 1132 1133 1134 1135 | TCL_NAMESPACE_ONLY) == NULL) { Itcl_PopCallFrame(interp); return TCL_ERROR; } Tcl_TraceVar2(interp, "itcl_options", NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, | | | 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 | TCL_NAMESPACE_ONLY) == NULL) { Itcl_PopCallFrame(interp); return TCL_ERROR; } Tcl_TraceVar2(interp, "itcl_options", NULL, TCL_TRACE_READS|TCL_TRACE_WRITES, ItclTraceOptionVar, ioPtr); } Itcl_PopCallFrame(interp); } hPtr = Tcl_NextHashEntry(&place); } /* now check for options which are delegated */ hPtr = Tcl_FirstHashEntry(&iclsPtr2->delegatedOptions, &place); |
︙ | ︙ | |||
1297 1298 1299 1300 1301 1302 1303 | static int FinalizeDeleteObject( ClientData data[], Tcl_Interp *interp, int result) { | | | | 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 | static int FinalizeDeleteObject( ClientData data[], Tcl_Interp *interp, int result) { ItclObject *contextIoPtr = (ItclObject *)data[0]; if (result == TCL_OK) { ItclDeleteObjectVariablesNamespace(interp, contextIoPtr); Tcl_ResetResult(interp); } Tcl_DeleteHashTable(contextIoPtr->destructed); ckfree((char*)contextIoPtr->destructed); contextIoPtr->destructed = NULL; return result; } static int CallDestructBase( ClientData data[], Tcl_Interp *interp, int result) { Tcl_Obj *objPtr; ItclObject *contextIoPtr = (ItclObject *)data[0]; int flags = PTR2INT(data[1]); if (result != TCL_OK) { return result; } result = ItclDestructBase(interp, contextIoPtr, contextIoPtr->iclsPtr, flags); |
︙ | ︙ | |||
1371 1372 1373 1374 1375 1376 1377 | * being destructed. Flag an error, unless errors are being * ignored. */ if (contextIoPtr->destructed) { if ((flags & ITCL_IGNORE_ERRS) == 0) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't delete an object while it is being destructed", | | | 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 | * being destructed. Flag an error, unless errors are being * ignored. */ if (contextIoPtr->destructed) { if ((flags & ITCL_IGNORE_ERRS) == 0) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't delete an object while it is being destructed", NULL); return TCL_ERROR; } return TCL_OK; } result = TCL_OK; if (contextIoPtr->oPtr != NULL) { |
︙ | ︙ | |||
1439 1440 1441 1442 1443 1444 1445 | /* * Look for a destructor in this class, and if found, * invoke it. */ if (Tcl_FindHashEntry(contextIoPtr->destructed, (char *)contextIclsPtr->namePtr) == NULL) { result = Itcl_InvokeMethodIfExists(interp, "destructor", | | | 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 | /* * Look for a destructor in this class, and if found, * invoke it. */ if (Tcl_FindHashEntry(contextIoPtr->destructed, (char *)contextIclsPtr->namePtr) == NULL) { result = Itcl_InvokeMethodIfExists(interp, "destructor", contextIclsPtr, contextIoPtr, 0, NULL); if (result != TCL_OK) { return TCL_ERROR; } } /* * Scan through the list of base classes recursively and destruct |
︙ | ︙ | |||
1513 1514 1515 1516 1517 1518 1519 | * the appropriate command handler. */ cmd = Tcl_FindCommand(interp, cmdName, contextNs, /* flags */ 0); if (cmd != NULL && Itcl_IsObject(cmd)) { if (Tcl_GetCommandInfoFromToken(cmd, &cmdInfo) != 1) { *roPtr = NULL; } | | | 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 | * the appropriate command handler. */ cmd = Tcl_FindCommand(interp, cmdName, contextNs, /* flags */ 0); if (cmd != NULL && Itcl_IsObject(cmd)) { if (Tcl_GetCommandInfoFromToken(cmd, &cmdInfo) != 1) { *roPtr = NULL; } *roPtr = (ItclObject *)cmdInfo.deleteData; } else { *roPtr = NULL; } ckfree(cmdName); return TCL_OK; |
︙ | ︙ | |||
1629 1630 1631 1632 1633 1634 1635 | * Make sure that the current namespace context includes an * object that is being manipulated. */ if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", | | | | | 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 | * Make sure that the current namespace context includes an * object that is being manipulated. */ if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", NULL); return NULL; } /* get the variable definition to check if that is an ITCL_COMMON */ if (contextIclsPtr == NULL) { iclsPtr = contextIoPtr->iclsPtr; } else { iclsPtr = contextIclsPtr; } ivPtr = NULL; hPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, (char *)name1); if (hPtr != NULL) { vlookup = (ItclVarLookup *)Tcl_GetHashValue(hPtr); ivPtr = vlookup->ivPtr; /* * Install the object context and access the data member * like any other variable. */ hPtr = Tcl_FindHashEntry(&contextIoPtr->objectVariables, (char *)ivPtr); if (hPtr) { Tcl_Obj *varName = Tcl_NewObj(); Tcl_Var varPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); Tcl_GetVariableFullName(interp, varPtr, varName); val = Tcl_GetVar2(interp, Tcl_GetString(varName), name2, TCL_LEAVE_ERR_MSG); Tcl_DecrRefCount(varName); if (val) { return val; |
︙ | ︙ | |||
1742 1743 1744 1745 1746 1747 1748 | * Make sure that the current namespace context includes an * object that is being manipulated. */ if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", | | | 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 | * Make sure that the current namespace context includes an * object that is being manipulated. */ if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", NULL); return NULL; } /* * Install the object context and access the data member * like any other variable. */ |
︙ | ︙ | |||
1847 1848 1849 1850 1851 1852 1853 | * Make sure that the current namespace context includes an * object that is being manipulated. */ if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", | | | | | 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 | * Make sure that the current namespace context includes an * object that is being manipulated. */ if (contextIoPtr == NULL) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot access object-specific info without an object context", NULL); return NULL; } /* get the variable definition to check if that is an ITCL_COMMON */ if (contextIclsPtr == NULL) { iclsPtr = contextIoPtr->iclsPtr; } else { iclsPtr = contextIclsPtr; } hPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, (char *)name1); if (hPtr != NULL) { vlookup = (ItclVarLookup *)Tcl_GetHashValue(hPtr); ivPtr = vlookup->ivPtr; } else { return NULL; } /* * Install the object context and access the data member * like any other variable. */ hPtr = Tcl_FindHashEntry(&contextIoPtr->objectVariables, (char *)ivPtr); if (hPtr) { Tcl_Obj *varName = Tcl_NewObj(); Tcl_Var varPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); Tcl_GetVariableFullName(interp, varPtr, varName); val = Tcl_SetVar2(interp, Tcl_GetString(varName), name2, value, TCL_LEAVE_ERR_MSG); Tcl_DecrRefCount(varName); return val; } |
︙ | ︙ | |||
1957 1958 1959 1960 1961 1962 1963 | ItclObjectInfo * infoPtr = NULL; char *name; int ignore; int cmp; if (contextIoPtr == NULL) { resultPtr = Tcl_GetObjResult(interp); | | | | 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 | ItclObjectInfo * infoPtr = NULL; char *name; int ignore; int cmp; if (contextIoPtr == NULL) { resultPtr = Tcl_GetObjResult(interp); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); if (infoPtr == NULL) { Tcl_AppendResult(interp, " PANIC cannot get Itcl AssocData in ItclReportObjectUsage", NULL); return; } if (contextNsPtr == NULL) { Tcl_AppendResult(interp, " PANIC cannot get contextNsPtr in ItclReportObjectUsage", NULL); return; } entry = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)contextNsPtr); if (entry) { iclsPtr = (ItclClass *)Tcl_GetHashValue(entry); } if (iclsPtr == NULL) { Tcl_AppendResult(interp, " PANIC cannot get class from contextNsPtr ItclReportObjectUsage", NULL); return; } } else { |
︙ | ︙ | |||
2035 2036 2037 2038 2039 2040 2041 | if (imPtr) { elem = Itcl_FirstListElem(&cmdList); while (elem) { cmpFunc = (ItclMemberFunc*)Itcl_GetListValue(elem); cmp = strcmp(Tcl_GetString(imPtr->namePtr), Tcl_GetString(cmpFunc->namePtr)); if (cmp < 0) { | | | | 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 | if (imPtr) { elem = Itcl_FirstListElem(&cmdList); while (elem) { cmpFunc = (ItclMemberFunc*)Itcl_GetListValue(elem); cmp = strcmp(Tcl_GetString(imPtr->namePtr), Tcl_GetString(cmpFunc->namePtr)); if (cmp < 0) { Itcl_InsertListElem(elem, imPtr); imPtr = NULL; break; } else { if (cmp == 0) { imPtr = NULL; break; } } elem = Itcl_NextListElem(elem); } if (imPtr) { Itcl_AppendList(&cmdList, imPtr); } } entry = Tcl_NextHashEntry(&place); } /* * Add a series of statements showing usage info. |
︙ | ︙ | |||
2459 2460 2461 2462 2463 2464 2465 | if (ioPtr->noComponentTrace) { return NULL; } /* need to redo the delegation for this component !! */ if (hPtr == NULL) { return (char *)" INTERNAL ERROR cannot get component to write to"; } | | | 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 | if (ioPtr->noComponentTrace) { return NULL; } /* need to redo the delegation for this component !! */ if (hPtr == NULL) { return (char *)" INTERNAL ERROR cannot get component to write to"; } icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); val = ItclGetInstanceVar(interp, name1, NULL, ioPtr, ioPtr->iclsPtr); if ((val == NULL) || (strlen(val) == 0)) { return (char *)" INTERNAL ERROR cannot get value for component"; } componentValuePtr = Tcl_NewStringObj(val, -1); Tcl_IncrRefCount(componentValuePtr); |
︙ | ︙ | |||
2548 2549 2550 2551 2552 2553 2554 | } objPtr = Tcl_NewStringObj(name1, -1); hPtr = Tcl_FindHashEntry(&ioPtr->iclsPtr->variables, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr == NULL) { return (char *)"INTERNAL ERROR cannot find itcl_hull variable in class definition!!"; } | | | 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 | } objPtr = Tcl_NewStringObj(name1, -1); hPtr = Tcl_FindHashEntry(&ioPtr->iclsPtr->variables, (char *)objPtr); Tcl_DecrRefCount(objPtr); if (hPtr == NULL) { return (char *)"INTERNAL ERROR cannot find itcl_hull variable in class definition!!"; } ivPtr = (ItclVariable *)Tcl_GetHashValue(hPtr); /* * Handle write traces */ if ((flags & TCL_TRACE_WRITES) != 0) { if (ivPtr->initted == 0) { ivPtr->initted = 1; return NULL; |
︙ | ︙ | |||
2683 2684 2685 2686 2687 2688 2689 | ckfree((char*)ioPtr->destructed); } ItclDeleteObjectsDictInfo(ioPtr->interp, ioPtr); /* * Delete all context definitions. */ while (1) { | | | | | | | | 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 | ckfree((char*)ioPtr->destructed); } ItclDeleteObjectsDictInfo(ioPtr->interp, ioPtr); /* * Delete all context definitions. */ while (1) { hPtr = Tcl_FirstHashEntry(&ioPtr->contextCache, &place); if (hPtr == NULL) { break; } callContextPtr = (ItclCallContext *)Tcl_GetHashValue(hPtr); Tcl_DeleteHashEntry(hPtr); ckfree((char *)callContextPtr); } FOREACH_HASH_VALUE(var, &ioPtr->objectVariables) { Itcl_ReleaseVar(var); } Tcl_DeleteHashTable(&ioPtr->contextCache); Tcl_DeleteHashTable(&ioPtr->objectVariables); |
︙ | ︙ | |||
2731 2732 2733 2734 2735 2736 2737 | static int CallPublicObjectCmd( ClientData data[], Tcl_Interp *interp, int result) { | | | | | 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 | static int CallPublicObjectCmd( ClientData data[], Tcl_Interp *interp, int result) { Tcl_Object *oPtr = (Tcl_Object *)data[0]; Tcl_Class clsPtr = (Tcl_Class)data[1]; Tcl_Obj *const *objv = (Tcl_Obj *const *)data[3]; int objc = PTR2INT(data[2]); ItclShowArgs(1, "CallPublicObjectCmd", objc, objv); result = Itcl_PublicObjectCmd(oPtr, interp, clsPtr, objc, objv); ItclShowArgs(1, "CallPublicObjectCmd DONE", objc, objv); return result; } |
︙ | ︙ | |||
2909 2910 2911 2912 2913 2914 2915 | ItclShowArgs(1, "run CallPublicObjectCmd1", objc+incr, newObjv); Tcl_NRAddCallback(interp, CallPublicObjectCmd, oPtr, clsPtr, INT2PTR(objc+incr), newObjv); } else { ItclShowArgs(1, "run CallPublicObjectCmd2", objc, objv); Tcl_NRAddCallback(interp, CallPublicObjectCmd, oPtr, clsPtr, | | | 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 | ItclShowArgs(1, "run CallPublicObjectCmd1", objc+incr, newObjv); Tcl_NRAddCallback(interp, CallPublicObjectCmd, oPtr, clsPtr, INT2PTR(objc+incr), newObjv); } else { ItclShowArgs(1, "run CallPublicObjectCmd2", objc, objv); Tcl_NRAddCallback(interp, CallPublicObjectCmd, oPtr, clsPtr, INT2PTR(objc), (void *)objv); } result = Itcl_NRRunCallbacks(interp, callbackPtr); if (methodNamePtr != NULL) { ckfree((char *)newObjv); Tcl_DecrRefCount(methodNamePtr); } |
︙ | ︙ | |||
2985 2986 2987 2988 2989 2990 2991 | ITCL_INTERP_DATA, NULL); } /* as a last chance try with className in hash table */ objPtr = Tcl_NewStringObj(className, -1); Tcl_IncrRefCount(objPtr); hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objPtr); if (hPtr != NULL) { | | | 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 | ITCL_INTERP_DATA, NULL); } /* as a last chance try with className in hash table */ objPtr = Tcl_NewStringObj(className, -1); Tcl_IncrRefCount(objPtr); hPtr = Tcl_FindHashEntry(&infoPtr->nameClasses, (char *)objPtr); if (hPtr != NULL) { iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } else { iclsPtr = NULL; } Tcl_DecrRefCount(objPtr); return iclsPtr; } |
︙ | ︙ | |||
3106 3107 3108 3109 3110 3111 3112 | if (!Itcl_CanAccessFunc(imPtr, nsPtr)) { char *token = Tcl_GetString(imPtr->namePtr); if ((*token != 'i') || (strcmp(token, "info") != 0)) { /* needed for test protect-2.5 */ ItclMemberFunc *imPtr2 = NULL; Tcl_HashEntry *hPtr; Tcl_ObjectContext context; | | | | 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 | if (!Itcl_CanAccessFunc(imPtr, nsPtr)) { char *token = Tcl_GetString(imPtr->namePtr); if ((*token != 'i') || (strcmp(token, "info") != 0)) { /* needed for test protect-2.5 */ ItclMemberFunc *imPtr2 = NULL; Tcl_HashEntry *hPtr; Tcl_ObjectContext context; context = (Tcl_ObjectContext)Itcl_GetCallFrameClientData(interp); if (context != NULL) { hPtr = Tcl_FindHashEntry( &imPtr->iclsPtr->infoPtr->procMethods, (char *)Tcl_ObjectContextMethod(context)); if (hPtr != NULL) { imPtr2 = (ItclMemberFunc *)Tcl_GetHashValue(hPtr); } if ((imPtr->protection & ITCL_PRIVATE) && (imPtr2 != NULL) && (imPtr->iclsPtr->nsPtr != imPtr2->iclsPtr->nsPtr)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid command name \"", token, |
︙ | ︙ | |||
3135 3136 3137 3138 3139 3140 3141 | Tcl_Obj * objPtr; ItclMemberFunc *imPtr2 = NULL; ItclCmdLookup *clookupPtr; objPtr = Tcl_NewStringObj(token, -1); hPtr = Tcl_FindHashEntry(&iclsPtr->resolveCmds, (char *)objPtr); if (hPtr != NULL) { | | | | 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 | Tcl_Obj * objPtr; ItclMemberFunc *imPtr2 = NULL; ItclCmdLookup *clookupPtr; objPtr = Tcl_NewStringObj(token, -1); hPtr = Tcl_FindHashEntry(&iclsPtr->resolveCmds, (char *)objPtr); if (hPtr != NULL) { clookupPtr = (ItclCmdLookup *)Tcl_GetHashValue(hPtr); imPtr2 = clookupPtr->imPtr; } if ((imPtr->protection & ITCL_PRIVATE) && (imPtr2 != NULL) && (imPtr->iclsPtr->nsPtr == imPtr2->iclsPtr->nsPtr)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "invalid command name \"", token, "\"", NULL); return TCL_ERROR; } } else { Tcl_AppendResult(interp, "bad option \"", token, "\": should be one of...", NULL); ItclReportObjectUsage(interp, ioPtr, nsPtr, nsPtr); return TCL_ERROR; } } } } |
︙ | ︙ | |||
3481 3482 3483 3484 3485 3486 3487 | search = search2; } else { hPtr2 = Tcl_FindHashEntry(&iclsPtr->options, (char *)idoPtr->namePtr); if (hPtr2 == NULL) { ioptPtr = NULL; } else { | | | 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 | search = search2; } else { hPtr2 = Tcl_FindHashEntry(&iclsPtr->options, (char *)idoPtr->namePtr); if (hPtr2 == NULL) { ioptPtr = NULL; } else { ioptPtr = (ItclOption *)Tcl_GetHashValue(hPtr2); ioptPtr->idoPtr = idoPtr; } idoPtr->ioptPtr = ioptPtr; } } return TCL_OK; } |
︙ | ︙ | |||
3742 3743 3744 3745 3746 3747 3748 | Tcl_HashEntry *hPtr; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(((Namespace *)nsPtr)->interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&(infoPtr->namespaceClasses), nsPtr); if (hPtr == NULL) { return NULL; } | | | 3742 3743 3744 3745 3746 3747 3748 3749 3750 | Tcl_HashEntry *hPtr; infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(((Namespace *)nsPtr)->interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&(infoPtr->namespaceClasses), nsPtr); if (hPtr == NULL) { return NULL; } return (ItclClass *)Tcl_GetHashValue(hPtr); } |
Changes to generic/itclParse.c.
︙ | ︙ | |||
194 195 196 197 198 199 200 | int i; /* * Create the "itcl::parser" namespace used to parse class * definitions. */ parserNs = Tcl_CreateNamespace(interp, "::itcl::parser", | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 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 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 | int i; /* * Create the "itcl::parser" namespace used to parse class * definitions. */ parserNs = Tcl_CreateNamespace(interp, "::itcl::parser", infoPtr, Itcl_ReleaseData); if (!parserNs) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), " (cannot initialize itcl parser)", NULL); return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Add commands for parsing class definitions. */ Tcl_DStringInit(&buffer); for (i=0 ; parseCmds[i].name ; i++) { Tcl_DStringAppend(&buffer, "::itcl::parser::", 16); Tcl_DStringAppend(&buffer, parseCmds[i].name, -1); Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer), parseCmds[i].objProc, infoPtr, NULL); Tcl_DStringFree(&buffer); } for (i=0 ; protectionCmds[i].name ; i++) { Tcl_DStringAppend(&buffer, "::itcl::parser::", 16); Tcl_DStringAppend(&buffer, protectionCmds[i].name, -1); pInfoPtr = (ProtectionCmdInfo*)ckalloc(sizeof(ProtectionCmdInfo)); pInfoPtr->pLevel = protectionCmds[i].protection; pInfoPtr->infoPtr = infoPtr; Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer), protectionCmds[i].objProc, pInfoPtr, (Tcl_CmdDeleteProc*) ItclFreeParserCommandData); Tcl_DStringFree(&buffer); } /* * Set the runtime variable resolver for the parser namespace, * to control access to "common" data members while parsing * the class definition. */ if (infoPtr->useOldResolvers) { ItclSetParserResolver(parserNs); } /* * Install the "class" command for defining new classes. */ Tcl_CreateObjCommand(interp, "::itcl::class", Itcl_ClassCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::body", Itcl_BodyCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "::itcl::configbody", Itcl_ConfigBodyCmd, NULL, NULL); Itcl_EventuallyFree(infoPtr, (Tcl_FreeProc *) ItclDelObjectInfo); /* * Create the "itcl::find" command for high-level queries. */ if (Itcl_CreateEnsemble(interp, "::itcl::find") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::find", "classes", "?pattern?", Itcl_FindClassesCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::find", "objects", "?-class className? ?-isa className? ?pattern?", Itcl_FindObjectsCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Create the "itcl::delete" command to delete objects * and classes. */ if (Itcl_CreateEnsemble(interp, "::itcl::delete") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::delete", "class", "name ?name...?", Itcl_DelClassCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::delete", "object", "name ?name...?", Itcl_DelObjectCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::delete", "ensemble", "name ?name...?", Itcl_EnsembleDeleteCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Create the "itcl::is" command to test object * and classes existence. */ if (Itcl_CreateEnsemble(interp, "::itcl::is") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::is", "class", "name", Itcl_IsClassCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::is", "object", "?-class classname? name", Itcl_IsObjectCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Add "code" and "scope" commands for handling scoped values. */ Tcl_CreateObjCommand(interp, "::itcl::code", Itcl_CodeCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "::itcl::scope", Itcl_ScopeCmd, NULL, NULL); /* * Add the "filter" commands (add/delete) */ if (Itcl_CreateEnsemble(interp, "::itcl::filter") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::filter", "add", "objectOrClass filter ? ... ?", Itcl_FilterAddCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::filter", "delete", "objectOrClass filter ? ... ?", Itcl_FilterDeleteCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Add the "forward" commands (add/delete) */ if (Itcl_CreateEnsemble(interp, "::itcl::forward") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::forward", "add", "objectOrClass srcCommand targetCommand ? options ... ?", Itcl_ForwardAddCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::forward", "delete", "objectOrClass targetCommand ? ... ?", Itcl_ForwardDeleteCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Add the "mixin" (add/delete) commands. */ if (Itcl_CreateEnsemble(interp, "::itcl::mixin") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::mixin", "add", "objectOrClass class ? class ... ?", Itcl_MixinAddCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::mixin", "delete", "objectOrClass class ? class ... ?", Itcl_MixinDeleteCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); /* * Add commands for handling import stubs at the Tcl level. */ if (Itcl_CreateEnsemble(interp, "::itcl::import::stub") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::import::stub", "create", "name", Itcl_StubCreateCmd, NULL, NULL) != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::import::stub", "exists", "name", Itcl_StubExistsCmd, NULL, NULL) != TCL_OK) { return TCL_ERROR; } Tcl_CreateObjCommand(interp, "::itcl::type", Itcl_TypeClassCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::widget", Itcl_WidgetCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::widgetadaptor", Itcl_WidgetAdaptorCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::nwidget", Itcl_NWidgetCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::addoption", Itcl_AddOptionCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::addobjectoption", Itcl_AddObjectOptionCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::adddelegatedoption", Itcl_AddDelegatedOptionCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::adddelegatedmethod", Itcl_AddDelegatedFunctionCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::addcomponent", Itcl_AddComponentCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::setcomponent", Itcl_SetComponentCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, "::itcl::extendedclass", Itcl_ExtendedClassCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); Tcl_CreateObjCommand(interp, ITCL_COMMANDS_NAMESPACE "::genericclass", ItclGenericClassCmd, infoPtr, Itcl_ReleaseData); Itcl_PreserveData(infoPtr); /* * Add the "delegate" (method/option) commands. */ if (Itcl_CreateEnsemble(interp, "::itcl::parser::delegate") != TCL_OK) { return TCL_ERROR; } if (Itcl_AddEnsemblePart(interp, "::itcl::parser::delegate", "method", "name to targetName as scipt using script", Itcl_ClassDelegateMethodCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::parser::delegate", "typemethod", "name to targetName as scipt using script", Itcl_ClassDelegateTypeMethodCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); if (Itcl_AddEnsemblePart(interp, "::itcl::parser::delegate", "option", "option to targetOption as script", Itcl_ClassDelegateOptionCmd, infoPtr, Itcl_ReleaseData) != TCL_OK) { return TCL_ERROR; } Itcl_PreserveData(infoPtr); return TCL_OK; } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
665 666 667 668 669 670 671 | static int CallAfterCallMethod( ClientData data[], Tcl_Interp *interp, int result) { ClientData clientData = data[0]; | | | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 | static int CallAfterCallMethod( ClientData data[], Tcl_Interp *interp, int result) { ClientData clientData = data[0]; Tcl_ObjectContext context = (Tcl_ObjectContext)data[1]; return ItclAfterCallMethod(clientData, interp, context, NULL, result); } static int ObjCallProc( ClientData clientData, |
︙ | ︙ | |||
748 749 750 751 752 753 754 | noCleanup = 0; /* * Find the namespace to use as a parser for the class definition. * If for some reason it is destroyed, bail out here. */ parserNs = Tcl_FindNamespace(interp, "::itcl::parser", | | | 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | noCleanup = 0; /* * Find the namespace to use as a parser for the class definition. * If for some reason it is destroyed, bail out here. */ parserNs = Tcl_FindNamespace(interp, "::itcl::parser", NULL, TCL_LEAVE_ERR_MSG); if (parserNs == NULL) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (while parsing class definition for \"%s\")", className)); return TCL_ERROR; } |
︙ | ︙ | |||
795 796 797 798 799 800 801 | } /* * Push this class onto the class definition stack so that it * becomes the current context for all commands in the parser. * Activate the parser and evaluate the class definition. */ | | | 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 | } /* * Push this class onto the class definition stack so that it * becomes the current context for all commands in the parser. * Activate the parser and evaluate the class definition. */ Itcl_PushStack(iclsPtr, &infoPtr->clsStack); result = Itcl_PushCallFrame(interp, &frame, parserNs, /* isProcCallFrame */ 0); Itcl_SetCallFrameResolver(interp, iclsPtr->resolvePtr); if (result == TCL_OK) { result = Tcl_EvalObjEx(interp, objv[2], 0); |
︙ | ︙ | |||
876 877 878 879 880 881 882 | argumentPtr = imPtr->codePtr->argumentPtr; bodyPtr = imPtr->codePtr->bodyPtr; if (imPtr->codePtr->flags & ITCL_IMPLEMENT_OBJCMD) { /* Implementation of this member is coded in C expecting Tcl_Obj */ imPtr->tmPtr = Tcl_NewMethod(interp, iclsPtr->clsPtr, imPtr->namePtr, | | | | | 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 | argumentPtr = imPtr->codePtr->argumentPtr; bodyPtr = imPtr->codePtr->bodyPtr; if (imPtr->codePtr->flags & ITCL_IMPLEMENT_OBJCMD) { /* Implementation of this member is coded in C expecting Tcl_Obj */ imPtr->tmPtr = Tcl_NewMethod(interp, iclsPtr->clsPtr, imPtr->namePtr, 1, &itclObjMethodType, imPtr); ItclPreserveIMF(imPtr); if (iclsPtr->flags & (ITCL_TYPE|ITCL_WIDGET|ITCL_WIDGETADAPTOR)) { imPtr->tmPtr = Tcl_NewInstanceMethod(interp, iclsPtr->oPtr, imPtr->namePtr, 1, &itclObjMethodType, imPtr); ItclPreserveIMF(imPtr); } } else if (imPtr->codePtr->flags & ITCL_IMPLEMENT_ARGCMD) { /* Implementation of this member is coded in C expecting (char *) */ imPtr->tmPtr = Tcl_NewMethod(interp, iclsPtr->clsPtr, imPtr->namePtr, 1, &itclArgMethodType, imPtr); ItclPreserveIMF(imPtr); } else { if (imPtr->codePtr->flags & ITCL_BUILTIN) { |
︙ | ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | } if (!isDone) { Tcl_AppendToObj(bodyPtr, Tcl_GetString(imPtr->codePtr->bodyPtr), -1); } Tcl_AppendToObj(bodyPtr, " {*}$args]", -1); } | | | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 | } if (!isDone) { Tcl_AppendToObj(bodyPtr, Tcl_GetString(imPtr->codePtr->bodyPtr), -1); } Tcl_AppendToObj(bodyPtr, " {*}$args]", -1); } imPtr->tmPtr = Itcl_NewProcClassMethod(interp, iclsPtr->clsPtr, ItclCheckCallMethod, ItclAfterCallMethod, ItclProcErrorProc, imPtr, imPtr->namePtr, argumentPtr, bodyPtr, &pmPtr); hPtr2 = Tcl_CreateHashEntry(&iclsPtr->infoPtr->procMethods, (char *)imPtr->tmPtr, &isNewEntry); if (isNewEntry) { Tcl_SetHashValue(hPtr2, imPtr); |
︙ | ︙ | |||
1075 1076 1077 1078 1079 1080 1081 | /* * We're overwriting the tmPtr field, so yank out the * entry in the procMethods map based on the old one. */ if (isNewEntry) { Tcl_DeleteHashEntry(hPtr2); } | | | 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 | /* * We're overwriting the tmPtr field, so yank out the * entry in the procMethods map based on the old one. */ if (isNewEntry) { Tcl_DeleteHashEntry(hPtr2); } imPtr->tmPtr = Itcl_NewProcMethod(interp, iclsPtr->oPtr, ItclCheckCallMethod, ItclAfterCallMethod, ItclProcErrorProc, imPtr, imPtr->namePtr, argumentPtr, bodyPtr, &pmPtr); } } if ((imPtr->flags & ITCL_COMMON) == 0) { imPtr->accessCmd = Tcl_CreateObjCommand(interp, |
︙ | ︙ | |||
1323 1324 1325 1326 1327 1328 1329 | elem = Itcl_FirstListElem(&iclsPtr->bases); if (elem != NULL) { Tcl_AppendToObj(Tcl_GetObjResult(interp), "inheritance \"", -1); while (elem) { cdPtr = (ItclClass*)Itcl_GetListValue(elem); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), | | | | 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 | elem = Itcl_FirstListElem(&iclsPtr->bases); if (elem != NULL) { Tcl_AppendToObj(Tcl_GetObjResult(interp), "inheritance \"", -1); while (elem) { cdPtr = (ItclClass*)Itcl_GetListValue(elem); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), Tcl_GetString(cdPtr->namePtr), " ", NULL); elem = Itcl_NextListElem(elem); } Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\" already defined for class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } /* * Validate each base class and add it to the "bases" list. */ result = Itcl_PushCallFrame(interp, &frame, iclsPtr->nsPtr->parentPtr, |
︙ | ︙ | |||
1365 1366 1367 1368 1369 1370 1371 | Tcl_IncrRefCount(resultPtr); errmsg = Tcl_GetStringFromObj(resultPtr, &errlen); Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot inherit from \"", token, "\"", | | | | | | | 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 | Tcl_IncrRefCount(resultPtr); errmsg = Tcl_GetStringFromObj(resultPtr, &errlen); Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot inherit from \"", token, "\"", NULL); if (errlen > 0) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), " (", errmsg, ")", NULL); } Tcl_DecrRefCount(resultPtr); goto inheritError; } /* * Make sure that the base class is not the same as the * class that is being built. */ if (baseClsPtr == iclsPtr) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "class \"", Tcl_GetString(iclsPtr->namePtr), "\" cannot inherit from itself", NULL); goto inheritError; } Itcl_AppendList(&iclsPtr->bases, baseClsPtr); ItclPreserveClass(baseClsPtr); } /* * Scan through the inheritance list to make sure that no * class appears twice. */ elem = Itcl_FirstListElem(&iclsPtr->bases); while (elem) { elem2 = Itcl_NextListElem(elem); while (elem2) { if (Itcl_GetListValue(elem) == Itcl_GetListValue(elem2)) { cdPtr = (ItclClass*)Itcl_GetListValue(elem); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "class \"", iclsPtr->fullNamePtr, "\" cannot inherit base class \"", cdPtr->fullNamePtr, "\" more than once", NULL); goto inheritError; } elem2 = Itcl_NextListElem(elem2); } elem = Itcl_NextListElem(elem); } |
︙ | ︙ | |||
1445 1446 1447 1448 1449 1450 1451 | Tcl_Obj *resultPtr = Tcl_GetObjResult(interp); badCdPtr = cdPtr; Tcl_AppendStringsToObj(resultPtr, "class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\" inherits base class \"", Tcl_GetString(badCdPtr->fullNamePtr), "\" more than once:", | | | | | | | 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 | Tcl_Obj *resultPtr = Tcl_GetObjResult(interp); badCdPtr = cdPtr; Tcl_AppendStringsToObj(resultPtr, "class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\" inherits base class \"", Tcl_GetString(badCdPtr->fullNamePtr), "\" more than once:", NULL); cdPtr = iclsPtr; Itcl_InitStack(&stack); Itcl_PushStack(cdPtr, &stack); /* * Show paths leading to bad base class */ while (Itcl_GetStackSize(&stack) > 0) { cdPtr = (ItclClass*)Itcl_PopStack(&stack); if (cdPtr == badCdPtr) { Tcl_AppendToObj(resultPtr, "\n ", -1); for (i=0; i < Itcl_GetStackSize(&stack); i++) { if (Itcl_GetStackValue(&stack, i) == NULL) { cdPtr = (ItclClass*)Itcl_GetStackValue(&stack, i-1); Tcl_AppendStringsToObj(resultPtr, Tcl_GetString(cdPtr->namePtr), "->", NULL); } } Tcl_AppendToObj(resultPtr, Tcl_GetString(badCdPtr->namePtr), -1); } else if (!cdPtr) { (void)Itcl_PopStack(&stack); } else { elem = Itcl_LastListElem(&cdPtr->bases); if (elem) { Itcl_PushStack(cdPtr, &stack); Itcl_PushStack(NULL, &stack); while (elem) { Itcl_PushStack(Itcl_GetListValue(elem), &stack); elem = Itcl_PrevListElem(elem); } } } } |
︙ | ︙ | |||
1507 1508 1509 1510 1511 1512 1513 | Tcl_DStringAppend(&buffer, " superclass", -1); while (elem) { baseClsPtr = (ItclClass*)Itcl_GetListValue(elem); haveClasses++; Tcl_DStringAppend(&buffer, " ", -1); Tcl_DStringAppend(&buffer, Tcl_GetString(baseClsPtr->fullNamePtr), -1); | | | 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 | Tcl_DStringAppend(&buffer, " superclass", -1); while (elem) { baseClsPtr = (ItclClass*)Itcl_GetListValue(elem); haveClasses++; Tcl_DStringAppend(&buffer, " ", -1); Tcl_DStringAppend(&buffer, Tcl_GetString(baseClsPtr->fullNamePtr), -1); Itcl_AppendList(&baseClsPtr->derived, iclsPtr); ItclPreserveClass(iclsPtr); elem = Itcl_NextListElem(elem); } Itcl_PopCallFrame(interp); if (haveClasses) { result = Tcl_EvalEx(interp, Tcl_DStringValue(&buffer), -1, 0); |
︙ | ︙ | |||
1671 1672 1673 1674 1675 1676 1677 | return TCL_ERROR; } namePtr = objv[0]; if (Tcl_FindHashEntry(&iclsPtr->functions, (char *)objv[0])) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 | return TCL_ERROR; } namePtr = objv[0]; if (Tcl_FindHashEntry(&iclsPtr->functions, (char *)objv[0])) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } /* * If there is an object initialization statement, pick this * out and take the last argument as the constructor body. */ |
︙ | ︙ | |||
1738 1739 1740 1741 1742 1743 1744 | namePtr = objv[0]; body = Tcl_GetString(objv[1]); if (Tcl_FindHashEntry(&iclsPtr->functions, (char *)namePtr)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | | 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 | namePtr = objv[0]; body = Tcl_GetString(objv[1]); if (Tcl_FindHashEntry(&iclsPtr->functions, (char *)namePtr)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } if (Itcl_CreateMethod(interp, iclsPtr, namePtr, NULL, body) != TCL_OK) { return TCL_ERROR; } return TCL_OK; } /* |
︙ | ︙ | |||
1954 1955 1956 1957 1958 1959 1960 | iclsPtr->infoPtr->functionFlags = ITCL_TYPE_METHOD; if (Itcl_CreateProc(interp, iclsPtr, namePtr, arglist, body) != TCL_OK) { iclsPtr->infoPtr->functionFlags = 0; return TCL_ERROR; } iclsPtr->infoPtr->functionFlags = 0; hPtr = Tcl_FindHashEntry(&iclsPtr->functions, (char *)namePtr); | | | 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 | iclsPtr->infoPtr->functionFlags = ITCL_TYPE_METHOD; if (Itcl_CreateProc(interp, iclsPtr, namePtr, arglist, body) != TCL_OK) { iclsPtr->infoPtr->functionFlags = 0; return TCL_ERROR; } iclsPtr->infoPtr->functionFlags = 0; hPtr = Tcl_FindHashEntry(&iclsPtr->functions, (char *)namePtr); imPtr = (ItclMemberFunc *)Tcl_GetHashValue(hPtr); imPtr->flags |= ITCL_TYPE_METHOD; return TCL_OK; } /* * ------------------------------------------------------------------------ * Itcl_ClassVariableCmd() |
︙ | ︙ | |||
2042 2043 2044 2045 2046 2047 2048 | * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ namePtr = objv[1]; if (strstr(Tcl_GetString(namePtr), "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad variable name \"", Tcl_GetString(namePtr), "\"", | | | 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 | * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ namePtr = objv[1]; if (strstr(Tcl_GetString(namePtr), "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad variable name \"", Tcl_GetString(namePtr), "\"", NULL); return TCL_ERROR; } init = NULL; config = NULL; if (!haveArrayInit) { if (objc >= 3) { |
︙ | ︙ | |||
2160 2161 2162 2163 2164 2165 2166 | Tcl_DStringValue(&buffer), NULL, initStr, TCL_NAMESPACE_ONLY); if (!val) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot initialize common variable \"", Tcl_GetString(ivPtr->namePtr), "\"", | | | | 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 | Tcl_DStringValue(&buffer), NULL, initStr, TCL_NAMESPACE_ONLY); if (!val) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot initialize common variable \"", Tcl_GetString(ivPtr->namePtr), "\"", NULL); return TCL_ERROR; } } if (ivPtr->arrayInitPtr != NULL) { int i; int argc; const char **argv; const char *val; Tcl_DStringAppend(&buffer, "::", -1); Tcl_DStringAppend(&buffer, Tcl_GetString(ivPtr->namePtr), -1); result = Tcl_SplitList(interp, Tcl_GetString(ivPtr->arrayInitPtr), &argc, &argv); for (i = 0; i < argc; i++) { val = Tcl_SetVar2(interp, Tcl_DStringValue(&buffer), argv[i], argv[i + 1], TCL_NAMESPACE_ONLY); if (!val) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot initialize common variable \"", Tcl_GetString(ivPtr->namePtr), "\"", NULL); return TCL_ERROR; } i++; } ckfree((char *)argv); } Tcl_DStringFree(&buffer); |
︙ | ︙ | |||
2266 2267 2268 2269 2270 2271 2272 | * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ namePtr = objv[1]; if (strstr(Tcl_GetString(namePtr), "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad variable name \"", Tcl_GetString(namePtr), "\"", | | | | 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 | * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ namePtr = objv[1]; if (strstr(Tcl_GetString(namePtr), "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad variable name \"", Tcl_GetString(namePtr), "\"", NULL); return TCL_ERROR; } initStr = NULL; if (!haveArrayInit) { if (objc >= 3) { initStr = Tcl_GetString(objv[2]); } } if (Itcl_CreateVariable(interp, iclsPtr, namePtr, initStr, NULL, &ivPtr) != TCL_OK) { return TCL_ERROR; } if (protection != 0) { ivPtr->protection = protection; } if (haveArrayInit) { |
︙ | ︙ | |||
2788 2789 2790 2791 2792 2793 2794 | /* * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(name, "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option name \"", name, | | | | 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 | /* * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(name, "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option name \"", name, "\", option names must not contain \"::\"", NULL); result = TCL_ERROR; goto errorOut; } if (strstr(name, " ")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option name \"", name, "\", option names must not contain \" \"", NULL); result = TCL_ERROR; goto errorOut; } cp = name; while (*cp) { if (isupper(UCHAR(*cp))) { Tcl_AppendResult(interp, "bad option name \"", name, "\" ", |
︙ | ︙ | |||
3001 3002 3003 3004 3005 3006 3007 | Tcl_InitObjHashTable(&icPtr->keptOptions); icPtr->namePtr = componentPtr; Tcl_IncrRefCount(icPtr->namePtr); icPtr->ivPtr = ivPtr; Tcl_SetHashValue(hPtr, icPtr); ItclAddClassVariableDictInfo(interp, iclsPtr, ivPtr); } else { | | | 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 | Tcl_InitObjHashTable(&icPtr->keptOptions); icPtr->namePtr = componentPtr; Tcl_IncrRefCount(icPtr->namePtr); icPtr->ivPtr = ivPtr; Tcl_SetHashValue(hPtr, icPtr); ItclAddClassVariableDictInfo(interp, iclsPtr, ivPtr); } else { icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); } *icPtrPtr = icPtr; return TCL_OK; } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
3449 3450 3451 3452 3453 3454 3455 | return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&iclsPtr->components, (char *)componentPtr); } } if (hPtr != NULL) { | | | 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 | return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&iclsPtr->components, (char *)componentPtr); } } if (hPtr != NULL) { icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); } if (*methodName != '*') { /* FIXME !!! */ /* check for locally defined method */ hPtr = NULL; if (ioPtr != NULL) { } else { |
︙ | ︙ | |||
3621 3622 3623 3624 3625 3626 3627 | /* * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(option, "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option name \"", option, | | | | 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 | /* * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ if (strstr(option, "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option name \"", option, "\", option names must not contain \"::\"", NULL); ckfree((char *)argv); return TCL_ERROR; } if (strstr(option, " ")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad option name \"", option, "\", option names must not contain \" \"", NULL); ckfree((char *)argv); return TCL_ERROR; } cp = option; while (*cp) { if (isupper(UCHAR(*cp))) { Tcl_AppendResult(interp, "bad option name \"", option, "\" ", |
︙ | ︙ | |||
3743 3744 3745 3746 3747 3748 3749 | goto errorOut1; } hPtr = Tcl_FindHashEntry(&iclsPtr->components, (char *)componentPtr); } } if (hPtr != NULL) { | | | 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 | goto errorOut1; } hPtr = Tcl_FindHashEntry(&iclsPtr->components, (char *)componentPtr); } } if (hPtr != NULL) { icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); } if (*option != '*') { /* FIXME !!! */ /* check for valid option name */ if (ioPtr != NULL) { hPtr = Tcl_FindHashEntry(&ioPtr->objectOptions, (char *)optionNamePtr); |
︙ | ︙ | |||
3793 3794 3795 3796 3797 3798 3799 | Tcl_IncrRefCount(idoPtr->classNamePtr); Tcl_DecrRefCount(classNamePtr); } else { idoPtr->namePtr = optionNamePtr; } Itcl_PreserveData(idoPtr); | | | 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 | Tcl_IncrRefCount(idoPtr->classNamePtr); Tcl_DecrRefCount(classNamePtr); } else { idoPtr->namePtr = optionNamePtr; } Itcl_PreserveData(idoPtr); Itcl_EventuallyFree(idoPtr, (Tcl_FreeProc *) ItclDeleteDelegatedOption); idoPtr->icPtr = icPtr; idoPtr->asPtr = targetPtr; if (idoPtr->asPtr != NULL) { Tcl_IncrRefCount(idoPtr->asPtr); } if (exceptionsPtr != NULL) { ckfree((char *)argv); |
︙ | ︙ | |||
4013 4014 4015 4016 4017 4018 4019 | hPtr = Tcl_FindHashEntry(&iclsPtr->components, (char *)componentPtr); if (hPtr == NULL) { if (ItclCreateComponent(interp, iclsPtr, componentPtr, ITCL_COMMON, &icPtr) != TCL_OK) { return TCL_ERROR; } } else { | | | 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 | hPtr = Tcl_FindHashEntry(&iclsPtr->components, (char *)componentPtr); if (hPtr == NULL) { if (ItclCreateComponent(interp, iclsPtr, componentPtr, ITCL_COMMON, &icPtr) != TCL_OK) { return TCL_ERROR; } } else { icPtr = (ItclComponent *)Tcl_GetHashValue(hPtr); } } else { icPtr = NULL; } idmPtr = (ItclDelegatedFunction *)ckalloc(sizeof(ItclDelegatedFunction)); memset(idmPtr, 0, sizeof(ItclDelegatedFunction)); Tcl_InitObjHashTable(&idmPtr->exceptions); |
︙ | ︙ | |||
4191 4192 4193 4194 4195 4196 4197 | * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ namePtr = objv[1]; if (strstr(Tcl_GetString(namePtr), "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad variable name \"", Tcl_GetString(namePtr), "\"", | | | 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 | * Make sure that the variable name does not contain anything * goofy like a "::" scope qualifier. */ namePtr = objv[1]; if (strstr(Tcl_GetString(namePtr), "::")) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad variable name \"", Tcl_GetString(namePtr), "\"", NULL); return TCL_ERROR; } defaultPtr = NULL; callbackPtr = NULL; for (i=2;i<objc;i++) { foundOpt = 0; |
︙ | ︙ | |||
4294 4295 4296 4297 4298 4299 4300 | } namePtr = objv[0]; if (iclsPtr->typeConstructorPtr != NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", | | | 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 | } namePtr = objv[0]; if (iclsPtr->typeConstructorPtr != NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", Tcl_GetString(namePtr), "\" already defined in class \"", Tcl_GetString(iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } iclsPtr->typeConstructorPtr = Tcl_NewStringObj(Tcl_GetString(objv[1]), -1); Tcl_IncrRefCount(iclsPtr->typeConstructorPtr); return TCL_OK; } |
Changes to generic/itclResolve.c.
︙ | ︙ | |||
77 78 79 80 81 82 83 | } infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return TCL_CONTINUE; } | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | } infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return TCL_CONTINUE; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * If the command is a member function */ imPtr = NULL; objPtr = Tcl_NewStringObj(name, -1); hPtr = Tcl_FindHashEntry(&iclsPtr->resolveCmds, (char *)objPtr); Tcl_DecrRefCount(objPtr); |
︙ | ︙ | |||
200 201 202 203 204 205 206 | if (isCmdDeleted) { imPtr->accessCmd = NULL; if ((flags & TCL_LEAVE_ERR_MSG) != 0) { Tcl_AppendResult(interp, "can't access \"", name, "\": deleted or redefined\n", "(use the \"body\" command to redefine methods/procs)", | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | if (isCmdDeleted) { imPtr->accessCmd = NULL; if ((flags & TCL_LEAVE_ERR_MSG) != 0) { Tcl_AppendResult(interp, "can't access \"", name, "\": deleted or redefined\n", "(use the \"body\" command to redefine methods/procs)", NULL); } return TCL_ERROR; /* disallow access! */ } *rPtr = imPtr->accessCmd; return TCL_OK; } |
︙ | ︙ | |||
267 268 269 270 271 272 273 | infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return TCL_CONTINUE; } | | | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return TCL_CONTINUE; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * See if the variable is a known data member and accessible. */ hPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, name); if (hPtr == NULL) { return TCL_CONTINUE; |
︙ | ︙ | |||
290 291 292 293 294 295 296 | * If this is a common data member, then its variable * is easy to find. Return it directly. */ if ((vlookup->ivPtr->flags & ITCL_COMMON) != 0) { hPtr = Tcl_FindHashEntry(&vlookup->ivPtr->iclsPtr->classCommons, (char *)vlookup->ivPtr); if (hPtr != NULL) { | | | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | * If this is a common data member, then its variable * is easy to find. Return it directly. */ if ((vlookup->ivPtr->flags & ITCL_COMMON) != 0) { hPtr = Tcl_FindHashEntry(&vlookup->ivPtr->iclsPtr->classCommons, (char *)vlookup->ivPtr); if (hPtr != NULL) { *rPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); return TCL_OK; } } /* * If this is an instance variable, then we have to * find the object context, |
︙ | ︙ | |||
380 381 382 383 384 385 386 | Tcl_DStringFree(&buffer); if (varPtr != NULL) { *rPtr = varPtr; return TCL_OK; } } if (hPtr != NULL) { | | | 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | Tcl_DStringFree(&buffer); if (varPtr != NULL) { *rPtr = varPtr; return TCL_OK; } } if (hPtr != NULL) { *rPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); return TCL_OK; } return TCL_CONTINUE; } /* |
︙ | ︙ | |||
428 429 430 431 432 433 434 | infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return TCL_CONTINUE; } | | | 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 | infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr == NULL) { return TCL_CONTINUE; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * Copy the name to local storage so we can NULL terminate it. * If the name is long, allocate extra space for it. */ if ((unsigned int)length < sizeof(storage)) { buffer = storage; } else { |
︙ | ︙ | |||
504 505 506 507 508 509 510 | * If this is a common data member, then the associated * variable is known directly. */ if ((vlookup->ivPtr->flags & ITCL_COMMON) != 0) { hPtr = Tcl_FindHashEntry(&vlookup->ivPtr->iclsPtr->classCommons, (char *)vlookup->ivPtr); if (hPtr != NULL) { | | | 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 | * If this is a common data member, then the associated * variable is known directly. */ if ((vlookup->ivPtr->flags & ITCL_COMMON) != 0) { hPtr = Tcl_FindHashEntry(&vlookup->ivPtr->iclsPtr->classCommons, (char *)vlookup->ivPtr); if (hPtr != NULL) { return (Tcl_Var)Tcl_GetHashValue(hPtr); } } /* * Otherwise, get the current object context and find the * variable in its data table. * |
︙ | ︙ | |||
660 661 662 663 664 665 666 | if ((vlookup->ivPtr->flags & ITCL_COMMON) != 0) { if (!vlookup->accessible) { Tcl_AppendResult(interp, "can't access \"", name, "\": ", Itcl_ProtectionStr(vlookup->ivPtr->protection), " variable", | | | | | | 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 | if ((vlookup->ivPtr->flags & ITCL_COMMON) != 0) { if (!vlookup->accessible) { Tcl_AppendResult(interp, "can't access \"", name, "\": ", Itcl_ProtectionStr(vlookup->ivPtr->protection), " variable", NULL); return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&vlookup->ivPtr->iclsPtr->classCommons, (char *)vlookup->ivPtr); if (hPtr != NULL) { *rPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); return TCL_OK; } } } /* * If the variable is not recognized, return TCL_CONTINUE and * let lookup continue via the normal name resolution rules. * This is important for variables like "errorInfo" * that might get set while the parser namespace is active. */ return TCL_CONTINUE; } int ItclSetParserResolver( Tcl_Namespace *nsPtr) { Itcl_SetNamespaceResolvers(nsPtr, NULL, Itcl_ParseVarResolver, NULL); return TCL_OK; } |
Changes to generic/itclStubLib.c.
︙ | ︙ | |||
41 42 43 44 45 46 47 | ClientData clientData = NULL; const ItclStubs *stubsPtr; const ItclIntStubs *intStubsPtr; const char *actualVersion; actualVersion = Tcl_PkgRequireEx(interp, packageName, version, exact, &clientData); | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | ClientData clientData = NULL; const ItclStubs *stubsPtr; const ItclIntStubs *intStubsPtr; const char *actualVersion; actualVersion = Tcl_PkgRequireEx(interp, packageName, version, exact, &clientData); stubsPtr = (const ItclStubs *)clientData; if ((actualVersion == NULL) || (clientData == NULL)) { return NULL; } intStubsPtr = stubsPtr->hooks ? stubsPtr->hooks->itclIntStubs : NULL; if (!stubsPtr || !intStubsPtr) { |
︙ | ︙ |
Changes to generic/itclStubs.c.
︙ | ︙ | |||
81 82 83 84 85 86 87 | /* * Create a stub command with the characteristic ItclDeleteStub * procedure. That way, we can recognize this command later * on as a stub. Save the cmd token as client data, so we can * get the full name of this command later on. */ cmdPtr = Tcl_CreateObjCommand(interp, cmdName, | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | /* * Create a stub command with the characteristic ItclDeleteStub * procedure. That way, we can recognize this command later * on as a stub. Save the cmd token as client data, so we can * get the full name of this command later on. */ cmdPtr = Tcl_CreateObjCommand(interp, cmdName, ItclHandleStubCmd, NULL, (Tcl_CmdDeleteProc*)ItclDeleteStub); Tcl_GetCommandInfoFromToken(cmdPtr, &cmdInfo); cmdInfo.objClientData = cmdPtr; Tcl_SetCommandInfoFromToken(cmdPtr, &cmdInfo); return TCL_OK; |
︙ | ︙ | |||
122 123 124 125 126 127 128 | if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "name"); return TCL_ERROR; } cmdName = Tcl_GetString(objv[1]); | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "name"); return TCL_ERROR; } cmdName = Tcl_GetString(objv[1]); cmdPtr = Tcl_FindCommand(interp, cmdName, NULL, 0); if ((cmdPtr != NULL) && Itcl_IsStub(cmdPtr)) { Tcl_SetWideIntObj(Tcl_GetObjResult(interp), 1); } else { Tcl_SetWideIntObj(Tcl_GetObjResult(interp), 0); } return TCL_OK; |
︙ | ︙ | |||
165 166 167 168 169 170 171 | char *cmdName; int result; int loaded; int cmdlinec; ItclShowArgs(1, "ItclHandleStubCmd", objc, objv); cmdPtr = (Tcl_Command) clientData; | | | | | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | char *cmdName; int result; int loaded; int cmdlinec; ItclShowArgs(1, "ItclHandleStubCmd", objc, objv); cmdPtr = (Tcl_Command) clientData; cmdNamePtr = Tcl_NewStringObj(NULL, 0); Tcl_IncrRefCount(cmdNamePtr); Tcl_GetCommandFullName(interp, cmdPtr, cmdNamePtr); cmdName = Tcl_GetString(cmdNamePtr); /* * Try to autoload the real command for this stub. */ objAutoLoad[0] = Tcl_NewStringObj("::auto_load", -1); objAutoLoad[1] = cmdNamePtr; result = Tcl_EvalObjv(interp, 2, objAutoLoad, 0); if (result != TCL_OK) { Tcl_DecrRefCount(cmdNamePtr); return TCL_ERROR; } objPtr = Tcl_GetObjResult(interp); result = Tcl_GetIntFromObj(interp, objPtr, &loaded); if ((result != TCL_OK) || !loaded) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't autoload \"", cmdName, "\"", NULL); Tcl_DecrRefCount(cmdNamePtr); return TCL_ERROR; } /* * At this point, the real implementation has been loaded. * Invoke the command again with the arguments passed in. */ cmdlinePtr = Itcl_CreateArgs(interp, cmdName, objc - 1, objv + 1); (void) Tcl_ListObjGetElements(NULL, cmdlinePtr, &cmdlinec, &cmdlinev); Tcl_DecrRefCount(cmdNamePtr); Tcl_ResetResult(interp); ItclShowArgs(1, "ItclHandleStubCmd", cmdlinec - 1, cmdlinev + 1); result = Tcl_EvalObjv(interp, cmdlinec - 1, cmdlinev + 1, TCL_EVAL_DIRECT); Tcl_DecrRefCount(cmdlinePtr); |
︙ | ︙ |
Changes to generic/itclTclIntStubsFcn.c.
︙ | ︙ | |||
34 35 36 37 38 39 40 | { int code = TclCreateProc(interp, (Namespace *)nsPtr, procName, argsPtr, bodyPtr, (Proc **)procPtrPtr); (*(Proc **)procPtrPtr)->cmdPtr = NULL; return code; } | | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | { int code = TclCreateProc(interp, (Namespace *)nsPtr, procName, argsPtr, bodyPtr, (Proc **)procPtrPtr); (*(Proc **)procPtrPtr)->cmdPtr = NULL; return code; } Tcl_ObjCmdProc * _Tcl_GetObjInterpProc( void) { return (Tcl_ObjCmdProc *)TclGetObjInterpProc(); } void _Tcl_ProcDeleteProc( ClientData clientData) { TclProcDeleteProc(clientData); |
︙ | ︙ |
Changes to generic/itclTclIntStubsFcn.h.
︙ | ︙ | |||
21 22 23 24 25 26 27 | #define Tcl_GetObjInterpProc _Tcl_GetObjInterpProc MODULE_SCOPE Tcl_Command _Tcl_GetOriginalCommand(Tcl_Command command); MODULE_SCOPE int _Tcl_CreateProc(Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Tcl_Proc *procPtrPtr); MODULE_SCOPE void _Tcl_ProcDeleteProc(ClientData clientData); | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #define Tcl_GetObjInterpProc _Tcl_GetObjInterpProc MODULE_SCOPE Tcl_Command _Tcl_GetOriginalCommand(Tcl_Command command); MODULE_SCOPE int _Tcl_CreateProc(Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Tcl_Proc *procPtrPtr); MODULE_SCOPE void _Tcl_ProcDeleteProc(ClientData clientData); MODULE_SCOPE Tcl_ObjCmdProc *_Tcl_GetObjInterpProc(void); MODULE_SCOPE int Tcl_RenameCommand(Tcl_Interp *interp, const char *oldName, const char *newName); MODULE_SCOPE Tcl_HashTable *Itcl_GetNamespaceChildTable(Tcl_Namespace *nsPtr); MODULE_SCOPE Tcl_HashTable *Itcl_GetNamespaceCommandTable(Tcl_Namespace *nsPtr); MODULE_SCOPE int Itcl_InitRewriteEnsemble(Tcl_Interp *interp, int numRemoved, int numInserted, int objc, Tcl_Obj *const *objv); MODULE_SCOPE void Itcl_ResetRewriteEnsemble(Tcl_Interp *interp, |
︙ | ︙ |
Changes to generic/itclTestRegisterC.c.
︙ | ︙ | |||
56 57 58 59 60 61 62 | objv[1] = Tcl_NewStringObj(argv[1], -1); /* class name */ objv[2] = Tcl_NewStringObj(argv[2], -1); /* full class name */ objv[3] = Tcl_NewStringObj(argv[3], -1); /* object name */ Tcl_IncrRefCount(objv[0]); Tcl_IncrRefCount(objv[1]); Tcl_IncrRefCount(objv[2]); Tcl_IncrRefCount(objv[3]); | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | objv[1] = Tcl_NewStringObj(argv[1], -1); /* class name */ objv[2] = Tcl_NewStringObj(argv[2], -1); /* full class name */ objv[3] = Tcl_NewStringObj(argv[3], -1); /* object name */ Tcl_IncrRefCount(objv[0]); Tcl_IncrRefCount(objv[1]); Tcl_IncrRefCount(objv[2]); Tcl_IncrRefCount(objv[3]); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); FOREACH_HASH_VALUE(classPtr,&infoPtr->nameClasses) { if (strcmp(Tcl_GetString(objv[1]), Tcl_GetString(classPtr->fullNamePtr)) == 0 || strcmp(Tcl_GetString(objv[2]), Tcl_GetString(classPtr->fullNamePtr)) == 0) { iclsPtr = classPtr; break; } } |
︙ | ︙ | |||
97 98 99 100 101 102 103 | ItclShowArgs(0, "cObjFunc called", objc, objv); fprintf(stderr, "objv: %d %p\n", objc, objv); for(i = 0; i<objc;i++) { fprintf(stderr, "arg:%d:%s:\n", i, Tcl_GetString(objv[i])); } nsPtr = Tcl_GetCurrentNamespace(interp); fprintf(stderr, "IP:%p %p %p !%s!\n",interp, clientData, nsPtr, nsPtr->fullName); | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | ItclShowArgs(0, "cObjFunc called", objc, objv); fprintf(stderr, "objv: %d %p\n", objc, objv); for(i = 0; i<objc;i++) { fprintf(stderr, "arg:%d:%s:\n", i, Tcl_GetString(objv[i])); } nsPtr = Tcl_GetCurrentNamespace(interp); fprintf(stderr, "IP:%p %p %p !%s!\n",interp, clientData, nsPtr, nsPtr->fullName); infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); FOREACH_HASH_VALUE(classPtr,&infoPtr->nameClasses) { if (strcmp(Tcl_GetString(objv[1]), Tcl_GetString(classPtr->fullNamePtr)) == 0 || strcmp(Tcl_GetString(objv[2]), Tcl_GetString(classPtr->fullNamePtr)) == 0) { iclsPtr = classPtr; break; } } |
︙ | ︙ |
Changes to generic/itclUtil.c.
︙ | ︙ | |||
62 63 64 65 66 67 68 | * * Called whenever an assert() test fails. Prints a diagnostic * message and abruptly exits. * ------------------------------------------------------------------------ */ void | | | | | | | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | * * Called whenever an assert() test fails. Prints a diagnostic * message and abruptly exits. * ------------------------------------------------------------------------ */ void Itcl_Assert( const char *testExpr, /* string representing test expression */ const char *fileName, /* file name containing this call */ int lineNumber) /* line number containing this call */ { Tcl_Panic("Itcl Assertion failed: \"%s\" (line %d of %s)", testExpr, lineNumber, fileName); } /* * ------------------------------------------------------------------------ * Itcl_InitStack() * * Initializes a stack structure, allocating a certain amount of memory * for the stack and setting the stack length to zero. * ------------------------------------------------------------------------ */ void Itcl_InitStack( Itcl_Stack *stack) /* stack to be initialized */ { stack->values = stack->space; stack->max = sizeof(stack->space)/sizeof(ClientData); stack->len = 0; } /* * ------------------------------------------------------------------------ * Itcl_DeleteStack() * * Destroys a stack structure, freeing any memory that may have been * allocated to represent it. * ------------------------------------------------------------------------ */ void Itcl_DeleteStack( Itcl_Stack *stack) /* stack to be deleted */ { /* * If memory was explicitly allocated (instead of using the * built-in buffer) then free it. */ if (stack->values != stack->space) { ckfree((char*)stack->values); |
︙ | ︙ | |||
122 123 124 125 126 127 128 | * Itcl_PushStack() * * Pushes a piece of client data onto the top of the given stack. * If the stack is not large enough, it is automatically resized. * ------------------------------------------------------------------------ */ void | | | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | * Itcl_PushStack() * * Pushes a piece of client data onto the top of the given stack. * If the stack is not large enough, it is automatically resized. * ------------------------------------------------------------------------ */ void Itcl_PushStack( ClientData cdata, /* data to be pushed onto stack */ Itcl_Stack *stack) /* stack */ { ClientData *newStack; if (stack->len+1 >= stack->max) { stack->max = 2*stack->max; newStack = (ClientData*) ckalloc((unsigned)(stack->max*sizeof(ClientData))); |
︙ | ︙ | |||
153 154 155 156 157 158 159 | * ------------------------------------------------------------------------ * Itcl_PopStack() * * Pops a bit of client data from the top of the given stack. * ------------------------------------------------------------------------ */ ClientData | | | | | | | | | | | | | | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | * ------------------------------------------------------------------------ * Itcl_PopStack() * * Pops a bit of client data from the top of the given stack. * ------------------------------------------------------------------------ */ ClientData Itcl_PopStack( Itcl_Stack *stack) /* stack to be manipulated */ { if (stack->values && (stack->len > 0)) { stack->len--; return stack->values[stack->len]; } return NULL; } /* * ------------------------------------------------------------------------ * Itcl_PeekStack() * * Gets the current value from the top of the given stack. * ------------------------------------------------------------------------ */ ClientData Itcl_PeekStack( Itcl_Stack *stack) /* stack to be examined */ { if (stack->values && (stack->len > 0)) { return stack->values[stack->len-1]; } return NULL; } /* * ------------------------------------------------------------------------ * Itcl_GetStackValue() * * Gets a value at some index within the stack. Index "0" is the * first value pushed onto the stack. * ------------------------------------------------------------------------ */ ClientData Itcl_GetStackValue( Itcl_Stack *stack, /* stack to be examined */ int pos) /* get value at this index */ { if (stack->values && (stack->len > 0)) { assert(pos < stack->len); return stack->values[pos]; } return NULL; } /* * ------------------------------------------------------------------------ * Itcl_InitList() * * Initializes a linked list structure, setting the list to the empty * state. * ------------------------------------------------------------------------ */ void Itcl_InitList( Itcl_List *listPtr) /* list to be initialized */ { listPtr->validate = ITCL_VALID_LIST; listPtr->num = 0; listPtr->head = NULL; listPtr->tail = NULL; } /* * ------------------------------------------------------------------------ * Itcl_DeleteList() * * Destroys a linked list structure, deleting all of its elements and * setting it to an empty state. If the elements have memory associated * with them, this memory must be freed before deleting the list or it * will be lost. * ------------------------------------------------------------------------ */ void Itcl_DeleteList( Itcl_List *listPtr) /* list to be deleted */ { Itcl_ListElem *elemPtr; assert(listPtr->validate == ITCL_VALID_LIST); elemPtr = listPtr->head; while (elemPtr) { |
︙ | ︙ | |||
285 286 287 288 289 290 291 | * * Destroys a single element in a linked list, returning it to a pool of * elements that can be later reused. Returns a pointer to the next * element in the list. * ------------------------------------------------------------------------ */ Itcl_ListElem* | | | | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | * * Destroys a single element in a linked list, returning it to a pool of * elements that can be later reused. Returns a pointer to the next * element in the list. * ------------------------------------------------------------------------ */ Itcl_ListElem* Itcl_DeleteListElem( Itcl_ListElem *elemPtr) /* list element to be deleted */ { Itcl_List *listPtr; Itcl_ListElem *nextPtr; nextPtr = elemPtr->next; if (elemPtr->prev) { |
︙ | ︙ | |||
329 330 331 332 333 334 335 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is inserted at the beginning of the * specified list. * ------------------------------------------------------------------------ */ Itcl_ListElem* | | | | | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is inserted at the beginning of the * specified list. * ------------------------------------------------------------------------ */ Itcl_ListElem* Itcl_InsertList( Itcl_List *listPtr, /* list being modified */ ClientData val) /* value associated with new element */ { Itcl_ListElem *elemPtr; assert(listPtr->validate == ITCL_VALID_LIST); elemPtr = Itcl_CreateListElem(listPtr); elemPtr->value = val; |
︙ | ︙ | |||
363 364 365 366 367 368 369 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is inserted in the list just before * the specified element. * ------------------------------------------------------------------------ */ Itcl_ListElem* | | | | | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is inserted in the list just before * the specified element. * ------------------------------------------------------------------------ */ Itcl_ListElem* Itcl_InsertListElem( Itcl_ListElem *pos, /* insert just before this element */ ClientData val) /* value associated with new element */ { Itcl_List *listPtr; Itcl_ListElem *elemPtr; listPtr = pos->owner; assert(listPtr->validate == ITCL_VALID_LIST); assert(pos != NULL); |
︙ | ︙ | |||
405 406 407 408 409 410 411 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is appended at the end of the * specified list. * ------------------------------------------------------------------------ */ Itcl_ListElem* | | | | | 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is appended at the end of the * specified list. * ------------------------------------------------------------------------ */ Itcl_ListElem* Itcl_AppendList( Itcl_List *listPtr, /* list being modified */ ClientData val) /* value associated with new element */ { Itcl_ListElem *elemPtr; assert(listPtr->validate == ITCL_VALID_LIST); elemPtr = Itcl_CreateListElem(listPtr); elemPtr->value = val; |
︙ | ︙ | |||
439 440 441 442 443 444 445 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is inserted in the list just after * the specified element. * ------------------------------------------------------------------------ */ Itcl_ListElem* | | | | | 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | * * Creates a new list element containing the given value and returns * a pointer to it. The element is inserted in the list just after * the specified element. * ------------------------------------------------------------------------ */ Itcl_ListElem* Itcl_AppendListElem( Itcl_ListElem *pos, /* insert just after this element */ ClientData val) /* value associated with new element */ { Itcl_List *listPtr; Itcl_ListElem *elemPtr; listPtr = pos->owner; assert(listPtr->validate == ITCL_VALID_LIST); assert(pos != NULL); |
︙ | ︙ | |||
479 480 481 482 483 484 485 | * ------------------------------------------------------------------------ * Itcl_SetListValue() * * Modifies the value associated with a list element. * ------------------------------------------------------------------------ */ void | | | | | 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 | * ------------------------------------------------------------------------ * Itcl_SetListValue() * * Modifies the value associated with a list element. * ------------------------------------------------------------------------ */ void Itcl_SetListValue( Itcl_ListElem *elemPtr, /* list element being modified */ ClientData val) /* new value associated with element */ { Itcl_List *listPtr = elemPtr->owner; assert(listPtr->validate == ITCL_VALID_LIST); assert(elemPtr != NULL); elemPtr->value = val; } |
︙ | ︙ | |||
624 625 626 627 628 629 630 | * Itcl_RestoreInterpState, or discarded by calling * Itcl_DiscardInterpState. Otherwise, memory will be leaked. * * Returns a token representing the state of the interpreter. * ------------------------------------------------------------------------ */ Itcl_InterpState | | | | | | | | | | 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 | * Itcl_RestoreInterpState, or discarded by calling * Itcl_DiscardInterpState. Otherwise, memory will be leaked. * * Returns a token representing the state of the interpreter. * ------------------------------------------------------------------------ */ Itcl_InterpState Itcl_SaveInterpState( Tcl_Interp* interp, /* interpreter being modified */ int status) /* integer status code for current operation */ { return (Itcl_InterpState) Tcl_SaveInterpState(interp, status); } /* * ------------------------------------------------------------------------ * Itcl_RestoreInterpState() * * Restores the state of the interpreter to a snapshot taken by * Itcl_SaveInterpState. This affects variables such as "errorInfo" * and "errorCode". After this call, the token for the interpreter * state is no longer valid. * * Returns the status code that was pending at the time the state was * captured. * ------------------------------------------------------------------------ */ int Itcl_RestoreInterpState( Tcl_Interp* interp, /* interpreter being modified */ Itcl_InterpState state) /* token representing interpreter state */ { return Tcl_RestoreInterpState(interp, (Tcl_InterpState)state); } /* * ------------------------------------------------------------------------ * Itcl_DiscardInterpState() * * Frees the memory associated with an interpreter snapshot taken by * Itcl_SaveInterpState. If the snapshot is not restored, this * procedure must be called to discard it, or the memory will be lost. * After this call, the token for the interpreter state is no longer * valid. * ------------------------------------------------------------------------ */ void Itcl_DiscardInterpState( Itcl_InterpState state) /* token representing interpreter state */ { Tcl_DiscardInterpState((Tcl_InterpState)state); return; } /* * ------------------------------------------------------------------------ |
︙ | ︙ | |||
690 691 692 693 694 695 696 | * If the specified level is 0, then this procedure returns the * current value without changing it. Otherwise, it sets the current * value to the specified protection level, and returns the previous * value. * ------------------------------------------------------------------------ */ int | | | | | | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 | * If the specified level is 0, then this procedure returns the * current value without changing it. Otherwise, it sets the current * value to the specified protection level, and returns the previous * value. * ------------------------------------------------------------------------ */ int Itcl_Protection( Tcl_Interp *interp, /* interpreter being queried */ int newLevel) /* new protection level or 0 */ { int oldVal; ItclObjectInfo *infoPtr; /* * If a new level was specified, then set the protection level. * In any case, return the protection level as it stands right now. */ infoPtr = (ItclObjectInfo*) Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL); assert(infoPtr != NULL); oldVal = infoPtr->protection; if (newLevel != 0) { assert(newLevel == ITCL_PUBLIC || newLevel == ITCL_PROTECTED || |
︙ | ︙ | |||
839 840 841 842 843 844 845 | if (Itcl_IsClassNamespace(fromNsPtr)) { entry = Tcl_FindHashEntry(&iclsPtr->infoPtr->namespaceClasses, fromNsPtr); if (entry == NULL) { return 0; } | | | 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 | if (Itcl_IsClassNamespace(fromNsPtr)) { entry = Tcl_FindHashEntry(&iclsPtr->infoPtr->namespaceClasses, fromNsPtr); if (entry == NULL) { return 0; } fromIclsPtr = (ItclClass *)Tcl_GetHashValue(entry); entry = Tcl_FindHashEntry(&fromIclsPtr->heritage, (char*)iclsPtr); if (entry) { return 1; } |
︙ | ︙ | |||
922 923 924 925 926 927 928 | iclsPtr = imPtr->iclsPtr; hPtr = Tcl_FindHashEntry(&iclsPtr->infoPtr->namespaceClasses, (char *)fromNsPtr); if (hPtr == NULL) { return 0; } | | | 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 | iclsPtr = imPtr->iclsPtr; hPtr = Tcl_FindHashEntry(&iclsPtr->infoPtr->namespaceClasses, (char *)fromNsPtr); if (hPtr == NULL) { return 0; } fromIclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); if (Tcl_FindHashEntry(&iclsPtr->heritage, (char*)fromIclsPtr)) { entry = Tcl_FindHashEntry(&fromIclsPtr->resolveCmds, (char *)imPtr->namePtr); if (entry) { ItclCmdLookup *clookup; |
︙ | ︙ | |||
977 978 979 980 981 982 983 | const char **listv; int listc; int result; int len; nsPtr = NULL; len = strlen(name); | | | | | | 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 | const char **listv; int listc; int result; int len; nsPtr = NULL; len = strlen(name); cmdName = (char *)ckalloc(strlen(name)+1); strcpy(cmdName, name); if ((*name == 'n') && (len > 17) && (strncmp(name, "namespace", 9) == 0)) { for (pos = (name + 9); (*pos == ' '); pos++) { /* empty body: skip over spaces */ } if ((*pos == 'i') && ((pos + 7) <= (name + len)) && (strncmp(pos, "inscope", 7) == 0)) { result = Tcl_SplitList(interp, (const char *)name, &listc, &listv); if (result == TCL_OK) { if (listc != 4) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "malformed command \"", name, "\": should be \"", "namespace inscope namesp command\"", NULL); result = TCL_ERROR; } else { nsPtr = Tcl_FindNamespace(interp, listv[2], NULL, TCL_LEAVE_ERR_MSG); if (nsPtr == NULL) { result = TCL_ERROR; } else { ckfree(cmdName); cmdName = (char *)ckalloc(strlen(listv[3])+1); strcpy(cmdName, listv[3]); } } } ckfree((char*)listv); if (result != TCL_OK) { |
︙ | ︙ |