Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch sebres-on-dmnd-resolver-perf-branch Excluding Merge-Ins
This is equivalent to a diff from 348d9767d3 to 4e0bd29adf
2019-11-04
| ||
21:24 | integrate bug fix of [777ae99cfb], fixes mem-leaks, certain optimizations check-in: 8b790617eb user: sebres tags: trunk | |
21:20 | avoid mem-leak (methodVariables is object-hash, so key refCount is incremented automaticaly); grave speedup of method variables (share same object "fullNamePtr" between imvPtr and ivPtr); remove obsolete or unneeded code. Closed-Leaf check-in: 4e0bd29adf user: sebres tags: sebres-on-dmnd-resolver-perf-branch | |
20:28 | fixes [777ae99cfb]: previous var-lookup in class body (in ::itcl::parser) could obtain inherited common vars, be sure it does not exists after new uninitialized common creation; more test cases covering corner cases; remove unneeded calls of Itcl_BuildVirtualTables, since resolveVars is build on demand (moved to ItclResolveVarEntry). check-in: 6c5eb55b81 user: sebres tags: sebres-on-dmnd-resolver-perf-branch | |
2019-10-02
| ||
17:53 | (Re-)implement a public set of routines for allocation and interest management of memory blocks shared by independent modules. These routines do not suffer the performance scaling failures of their Tcl counterparts, which is important to Itcl's usage patterns. Bump the version number to account for new public routines. Thanks to sebres for the contribution. check-in: 3559fa204b user: dgp tags: trunk | |
17:46 | Bump to version Itcl 4.2.0 to account for additions to set of public routines. Closed-Leaf check-in: 348d9767d3 user: dgp tags: sebres-memopt-perf-branch | |
17:38 | Document new (and old!) public routines. check-in: a03aaa0379 user: dgp tags: sebres-memopt-perf-branch | |
Changes to doc/Preserve.3.
︙ | ︙ | |||
46 47 48 49 50 51 52 | \fBTcl_Free\fR, \fBTcl_Preserve\fR, \fBTcl_Release\fR, and \fBTcl_EventuallyFree\fR. The Tcl routines suffer from issues with performance scaling as the number of blocks managed grows large. The facilities of Itcl encounter these performance scaling issues and require an alternative that does not suffer from them. .PP \fBItcl_Alloc\fR returns an untyped pointer to an allocated block | | > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | \fBTcl_Free\fR, \fBTcl_Preserve\fR, \fBTcl_Release\fR, and \fBTcl_EventuallyFree\fR. The Tcl routines suffer from issues with performance scaling as the number of blocks managed grows large. The facilities of Itcl encounter these performance scaling issues and require an alternative that does not suffer from them. .PP \fBItcl_Alloc\fR returns an untyped pointer to an allocated block of memory of at least \fIsize\fR bytes. All \fIsize\fR bytes are initialized to zero. .PP A module calls \fBItcl_PreserveData\fR on a pointer \fIptr\fR allocated by \fBItcl_Alloc\fR to prevent deallocation of that memory while the module remains interested in it. .PP A module calls \fBItcl_ReleaseData\fR on a pointer \fIptr\fR previously preserved by \fBItcl_PreserveData\fR to indicate the module no longer has |
︙ | ︙ |
Changes to doc/class.n.
︙ | ︙ | |||
377 378 379 380 381 382 383 | and procs. If \fIcmdName\fR is specified, it returns information for a specific method or proc. If no flags are specified, this command returns a list with the following elements: the protection level, the type (method/proc), the qualified name, the argument list and the body. Flags can be used to request specific elements from this list. .TP | | | > > > > | > > > | | | > > > > | | 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 | and procs. If \fIcmdName\fR is specified, it returns information for a specific method or proc. If no flags are specified, this command returns a list with the following elements: the protection level, the type (method/proc), the qualified name, the argument list and the body. Flags can be used to request specific elements from this list. .TP \fIobjName \fBinfo variable\fR ?\fIvarName\fR? ?\fB-protection\fR? ?\fB-type\fR? ?\fB-name\fR? ?\fB-init\fR? ?\fB-value\fR? ?\fB-config\fR? ?\fB-scope\fR? . With no arguments, this command returns a list of all object-specific variables and common data members. If \fIvarName\fR is specified, it returns information for a specific data member. Flags can be specified with \fIvarName\fR in an arbitrary order. The result is a list of the specific information in exactly the same order as the flags are specified. If no flags are given, this command returns a list as if the followings flags have been specified: .IP \fB-protection\fR \fB-type\fR \fB-name\fR \fB-init\fR \fB-value\fR ?\fB-config\fR? The \fB-config\fR result is only present if \fIvarName\fR is a public variable. It contains the code that is executed at initialization of \fIvarName\fR. The \fB-scope\fR flag gives the namespace context of \fIvarName\fR. Herewith the variable can be accessed from outside the object like any other variable. It is similar to the result of the \fBitcl::scope\fR command. .RE .SH "CHAINING METHODS/PROCS" .PP Sometimes a base class has a method or proc that is redefined with the same name in a derived class. This is a way of making the derived class handle the same operations as the base class, but with its own specialized behavior. For example, suppose we have |
︙ | ︙ |
Changes to generic/itclBase.c.
︙ | ︙ | |||
198 199 200 201 202 203 204 | nsPtr = Tcl_CreateNamespace(interp, ITCL_NAMESPACE, infoPtr, FreeItclObjectInfo); if (nsPtr == NULL) { Itcl_Free(infoPtr); Tcl_Panic("Itcl: cannot create namespace: \"%s\" \n", ITCL_NAMESPACE); } | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | nsPtr = Tcl_CreateNamespace(interp, ITCL_NAMESPACE, infoPtr, FreeItclObjectInfo); if (nsPtr == NULL) { Itcl_Free(infoPtr); Tcl_Panic("Itcl: cannot create namespace: \"%s\" \n", ITCL_NAMESPACE); } nsPtr = Tcl_CreateNamespace(interp, ITCL_INTDICTS_NAMESPACE, NULL, NULL); if (nsPtr == NULL) { Itcl_Free(infoPtr); Tcl_Panic("Itcl: cannot create namespace: \"%s::internal::dicts\" \n", ITCL_NAMESPACE); } |
︙ | ︙ |
Changes to generic/itclBuiltin.c.
︙ | ︙ | |||
685 686 687 688 689 690 691 | "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", NULL); return TCL_ERROR; } vlookup = NULL; | | | 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 | "improper usage: should be ", "\"object configure ?-option? ?value -option value...?\"", NULL); return TCL_ERROR; } vlookup = NULL; hPtr = ItclResolveVarEntry(contextIclsPtr, token+1); if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); if (vlookup->ivPtr->protection != ITCL_PUBLIC) { vlookup = NULL; } } |
︙ | ︙ | |||
726 727 728 729 730 731 732 | Tcl_AppendResult(interp, "need option value pair", NULL); result = TCL_ERROR; goto configureDone; } vlookup = NULL; token = Tcl_GetString(unparsedObjv[i]); if (*token == '-') { | | | | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 | Tcl_AppendResult(interp, "need option value pair", NULL); result = TCL_ERROR; goto configureDone; } vlookup = NULL; token = Tcl_GetString(unparsedObjv[i]); if (*token == '-') { hPtr = ItclResolveVarEntry(contextIclsPtr, token+1); if (hPtr == NULL) { hPtr = ItclResolveVarEntry(contextIclsPtr, token); } if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } } if (!vlookup || (vlookup->ivPtr->protection != ITCL_PUBLIC)) { |
︙ | ︙ | |||
885 886 887 888 889 890 891 | if (result != TCL_CONTINUE) { return result; } } name = Tcl_GetString(objv[1]); vlookup = NULL; | | | 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 | if (result != TCL_CONTINUE) { return result; } } name = Tcl_GetString(objv[1]); vlookup = NULL; hPtr = ItclResolveVarEntry(contextIclsPtr, name+1); if (hPtr) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } if ((vlookup == NULL) || (vlookup->ivPtr->protection != ITCL_PUBLIC)) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "unknown option \"", name, "\"", |
︙ | ︙ | |||
949 950 951 952 953 954 955 | * 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; | | | 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 | * 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 = ItclResolveVarEntry(iclsPtr, 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); |
︙ | ︙ |
Changes to generic/itclClass.c.
︙ | ︙ | |||
282 283 284 285 286 287 288 | Tcl_InitObjHashTable(&iclsPtr->delegatedOptions); Tcl_InitObjHashTable(&iclsPtr->delegatedFunctions); Tcl_InitObjHashTable(&iclsPtr->methodVariables); Tcl_InitObjHashTable(&iclsPtr->resolveCmds); iclsPtr->numInstanceVars = 0; Tcl_InitHashTable(&iclsPtr->classCommons, TCL_ONE_WORD_KEYS); | | | 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | Tcl_InitObjHashTable(&iclsPtr->delegatedOptions); Tcl_InitObjHashTable(&iclsPtr->delegatedFunctions); Tcl_InitObjHashTable(&iclsPtr->methodVariables); Tcl_InitObjHashTable(&iclsPtr->resolveCmds); iclsPtr->numInstanceVars = 0; Tcl_InitHashTable(&iclsPtr->classCommons, TCL_ONE_WORD_KEYS); Tcl_InitHashTable(&iclsPtr->resolveVars, TCL_STRING_KEYS); Tcl_InitHashTable(&iclsPtr->contextCache, TCL_ONE_WORD_KEYS); Itcl_InitList(&iclsPtr->bases); Itcl_InitList(&iclsPtr->derived); resolveInfoPtr = (ItclResolveInfo *) ckalloc(sizeof(ItclResolveInfo)); memset(resolveInfoPtr, 0, sizeof(ItclResolveInfo)); |
︙ | ︙ | |||
456 457 458 459 460 461 462 | */ 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 */ | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 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 | */ 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 */ } 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 */ } 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 */ 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 */ 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 */ } 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 */ 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 */ } 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 */ } 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 */ } 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) != |
︙ | ︙ | |||
1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 | Tcl_NRAddCallback(interp, FinalizeCreateObject, objNamePtr, iclsPtr, NULL, NULL); Tcl_NRAddCallback(interp, CallCreateObject, objNamePtr, iclsPtr, INT2PTR(objc-4), newObjv); return Itcl_NRRunCallbacks(interp, callbackPtr); } /* * ------------------------------------------------------------------------ * Itcl_BuildVirtualTables() * * Invoked whenever the class heritage changes or members are added or * removed from a class definition to rebuild the member lookup * tables. There are two tables: * * METHODS: resolveCmds * Used primarily in Itcl_ClassCmdResolver() to resolve all * command references in a namespace. * | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 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 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 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 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 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 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 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 1866 1867 1868 1869 | Tcl_NRAddCallback(interp, FinalizeCreateObject, objNamePtr, iclsPtr, NULL, NULL); Tcl_NRAddCallback(interp, CallCreateObject, objNamePtr, iclsPtr, INT2PTR(objc-4), newObjv); return Itcl_NRRunCallbacks(interp, callbackPtr); } /* * ------------------------------------------------------------------------ * ItclResolveVarEntry() * * Side effect: (re)build part of resolver hash-table on demand. * ------------------------------------------------------------------------ */ Tcl_HashEntry * ItclResolveVarEntry( ItclClass* iclsPtr, /* class definition where to resolve variable */ const char *lookupName) /* name of variable being resolved */ { Tcl_HashEntry *reshPtr, *hPtr; /* could be resolved directly */ if ((reshPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, lookupName)) != NULL) { return reshPtr; } else { /* try to build virtual table for this var */ const char *varName, *simpleName; Tcl_DString buffer, buffer2, *bufferC; ItclHierIter hier; ItclClass* iclsPtr2; ItclVarLookup *vlookup; ItclVariable *ivPtr; Tcl_Namespace* nsPtr; Tcl_Obj *vnObjPtr; int newEntry, processAncestors; size_t varLen; /* (de)qualify to simple name */ varName = simpleName = lookupName; while(*varName) { if (*varName++ == ':') { if (*varName++ == ':') { simpleName = varName; } }; } vnObjPtr = Tcl_NewStringObj(simpleName, -1); processAncestors = simpleName != lookupName; Tcl_DStringInit(&buffer); Tcl_DStringInit(&buffer2); /* * Scan through all classes in the hierarchy, from most to * least specific. Add a lookup entry for each variable * into the table. */ Itcl_InitHierIter(&hier, iclsPtr); iclsPtr2 = Itcl_AdvanceHierIter(&hier); while (iclsPtr2 != NULL) { hPtr = Tcl_FindHashEntry(&iclsPtr2->variables, vnObjPtr); if (hPtr) { ivPtr = (ItclVariable*)Tcl_GetHashValue(hPtr); vlookup = NULL; /* * Create all possible names for this variable and enter * them into the variable resolution table: * var * class::var * namesp1::class::var * namesp2::namesp1::class::var * ... */ varName = simpleName; varLen = -1; bufferC = &buffer; nsPtr = iclsPtr2->nsPtr; while (1) { hPtr = Tcl_CreateHashEntry(&iclsPtr->resolveVars, varName, &newEntry); /* check for same name in current class */ if (!newEntry) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); if (vlookup->ivPtr != ivPtr && iclsPtr2 == iclsPtr) { /* if used multiple times - unbind, else - overwrite */ if (vlookup->usage > 1) { /* correct leastQualName */ vlookup->leastQualName = NULL; processAncestors = 1; /* correction in progress */ /* should create new lookup */ --vlookup->usage; vlookup = NULL; } else { /* correct values (overwrite) */ vlookup->usage = 0; goto setResVar; } newEntry = 1; } else { /* var exists and no correction necessary - next var */ if (!processAncestors) { break; } /* check leastQualName correction needed */ if (!vlookup->leastQualName) { vlookup->leastQualName = Tcl_GetHashKey(&iclsPtr->resolveVars, hPtr); } /* reset vlookup for full-qualified names - new lookup */ if (vlookup->ivPtr != ivPtr) { vlookup = NULL; } } } if (newEntry) { if (!vlookup) { /* create new (or overwrite) */ vlookup = (ItclVarLookup *)ckalloc(sizeof(ItclVarLookup)); vlookup->usage = 0; setResVar: vlookup->ivPtr = ivPtr; vlookup->leastQualName = Tcl_GetHashKey(&iclsPtr->resolveVars, hPtr); /* * If this variable is PRIVATE to another class scope, * then mark it as "inaccessible". */ vlookup->accessible = (ivPtr->protection != ITCL_PRIVATE || ivPtr->iclsPtr == iclsPtr); /* * Set aside the first object-specific slot for the built-in * "this" variable. Only allocate one of these, even though * there is a definition for "this" in each class scope. * Set aside the second and third object-specific slot for the built-in * "itcl_options" and "itcl_option_components" variable. */ if (!iclsPtr->numInstanceVars) { iclsPtr->numInstanceVars += 3; } /* * If this is a reference to the built-in "this" * variable, then its index is "0". Otherwise, * add another slot to the end of the table. */ if ((ivPtr->flags & ITCL_THIS_VAR) != 0) { vlookup->varNum = 0; } else { if ((ivPtr->flags & ITCL_OPTIONS_VAR) != 0) { vlookup->varNum = 1; } else { vlookup->varNum = iclsPtr->numInstanceVars++; } } } Tcl_SetHashValue(hPtr, vlookup); vlookup->usage++; } /* if we have found it */ if (simpleName == lookupName || strcmp(varName, lookupName) == 0) { if (!reshPtr) { reshPtr = hPtr; } break; } if (nsPtr == NULL) { break; } Tcl_DStringSetLength(bufferC, 0); Tcl_DStringAppend(bufferC, nsPtr->name, -1); Tcl_DStringAppend(bufferC, "::", 2); Tcl_DStringAppend(bufferC, varName, varLen); varName = Tcl_DStringValue(bufferC); varLen = Tcl_DStringLength(bufferC); bufferC = (bufferC == &buffer) ? &buffer2 : &buffer; nsPtr = nsPtr->parentPtr; } } /* Stop create vars for ancestors (if not needed) */ if (!processAncestors && reshPtr) { /* simple name - don't need to check ancestors */ break; } iclsPtr2 = Itcl_AdvanceHierIter(&hier); } Itcl_DeleteHierIter(&hier); Tcl_DStringFree(&buffer); Tcl_DStringFree(&buffer2); Tcl_DecrRefCount(vnObjPtr); if (reshPtr == NULL) { reshPtr = Tcl_FindHashEntry(&iclsPtr->resolveVars, lookupName); } return reshPtr; } } /* * ------------------------------------------------------------------------ * Itcl_BuildVirtualTables() * * Invoked whenever the class heritage changes or members are added or * removed from a class definition to rebuild the member lookup * tables. There are two tables: * * METHODS: resolveCmds * Used primarily in Itcl_ClassCmdResolver() to resolve all * command references in a namespace. * * DATA MEMBERS: resolveVars (built on demand, moved to ItclResolveVarEntry) * Used primarily in Itcl_ClassVarResolver() to quickly resolve * variable references in each class scope. * * These tables store every possible name for each command/variable * (member, class::member, namesp::class::member, etc.). Members * in a derived class may shadow members with the same name in a * base class. In that case, the simple name in the resolution * table will point to the most-specific member. * ------------------------------------------------------------------------ */ void Itcl_BuildVirtualTables( ItclClass* iclsPtr) /* class definition being updated */ { Tcl_HashEntry *hPtr; Tcl_HashSearch place; Tcl_Namespace* nsPtr; Tcl_DString buffer, buffer2, *bufferC, *bufferC2, *bufferSwp; Tcl_Obj *objPtr; ItclMemberFunc *imPtr; ItclDelegatedFunction *idmPtr; ItclHierIter hier; ItclClass *iclsPtr2; ItclCmdLookup *clookupPtr; int newEntry; Tcl_DStringInit(&buffer); Tcl_DStringInit(&buffer2); /* * Clear the command resolution table. */ while (1) { hPtr = Tcl_FirstHashEntry(&iclsPtr->resolveCmds, &place); if (hPtr == NULL) { break; } clookupPtr = Tcl_GetHashValue(hPtr); ckfree((char *)clookupPtr); Tcl_DeleteHashEntry(hPtr); } Tcl_DeleteHashTable(&iclsPtr->resolveCmds); Tcl_InitObjHashTable(&iclsPtr->resolveCmds); /* |
︙ | ︙ | |||
1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 | * class::func * namesp1::class::func * namesp2::namesp1::class::func * ... */ Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, Tcl_GetString(imPtr->namePtr), -1); nsPtr = iclsPtr2->nsPtr; while (1) { | > | > | < | | | | > > | 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 | * class::func * namesp1::class::func * namesp2::namesp1::class::func * ... */ Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, Tcl_GetString(imPtr->namePtr), -1); bufferC = &buffer; bufferC2 = &buffer2; nsPtr = iclsPtr2->nsPtr; while (1) { objPtr = Tcl_NewStringObj(Tcl_DStringValue(bufferC), Tcl_DStringLength(bufferC)); 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; } Tcl_DStringSetLength(bufferC2, 0); Tcl_DStringAppend(bufferC2, nsPtr->name, -1); Tcl_DStringAppend(bufferC2, "::", 2); Tcl_DStringAppend(bufferC2, Tcl_DStringValue(bufferC), Tcl_DStringLength(bufferC)); bufferSwp = bufferC; bufferC = bufferC2; bufferC2 = bufferSwp; nsPtr = nsPtr->parentPtr; } hPtr = Tcl_NextHashEntry(&place); } iclsPtr2 = Itcl_AdvanceHierIter(&hier); } |
︙ | ︙ | |||
2049 2050 2051 2052 2053 2054 2055 | Itcl_PreserveData(ioptPtr); Itcl_EventuallyFree(ioptPtr, (Tcl_FreeProc *) ItclDeleteOption); return TCL_OK; } /* * ------------------------------------------------------------------------ | | | < | | | | | < | | | < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 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 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 | Itcl_PreserveData(ioptPtr); Itcl_EventuallyFree(ioptPtr, (Tcl_FreeProc *) ItclDeleteOption); return TCL_OK; } /* * ------------------------------------------------------------------------ * ItclCreateMethodVariable(), Itcl_CreateMethodVariable() * * Creates a new class methdovariable definition. If this is a public * methodvariable, * * Returns TCL_ERROR along with an error message in the specified * interpreter if anything goes wrong. Otherwise, this returns * TCL_OK and a pointer to the new option definition in "imvPtr". * ------------------------------------------------------------------------ */ int ItclCreateMethodVariable( Tcl_Interp *interp, /* interpreter managing this transaction */ ItclVariable *ivPtr, /* variable reference (from Itcl_CreateVariable) */ Tcl_Obj* defaultPtr, /* initial value */ Tcl_Obj* callbackPtr, /* code invoked when variable is set */ ItclMethodVariable** imvPtrPtr) /* returns: new methdovariable definition */ { int isNew; ItclMethodVariable *imvPtr; Tcl_HashEntry *hPtr; /* * Add this methodvariable to the options table for the class. * Make sure that the methodvariable name does not already exist. */ hPtr = Tcl_CreateHashEntry(&ivPtr->iclsPtr->methodVariables, (char *)ivPtr->namePtr, &isNew); if (!isNew) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "methdovariable name \"", Tcl_GetString(ivPtr->namePtr), "\" already defined in class \"", Tcl_GetString (ivPtr->iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } /* * If everything looks good, create the option definition. */ imvPtr = (ItclMethodVariable*)ckalloc(sizeof(ItclMethodVariable)); memset(imvPtr, 0, sizeof(ItclMethodVariable)); imvPtr->iclsPtr = ivPtr->iclsPtr; imvPtr->protection = Itcl_Protection(interp, 0); imvPtr->namePtr = ivPtr->namePtr; Tcl_IncrRefCount(imvPtr->namePtr); imvPtr->fullNamePtr = ivPtr->fullNamePtr; Tcl_IncrRefCount(imvPtr->fullNamePtr); imvPtr->defaultValuePtr = defaultPtr; if (defaultPtr != NULL) { Tcl_IncrRefCount(imvPtr->defaultValuePtr); } imvPtr->callbackPtr = callbackPtr; if (callbackPtr != NULL) { Tcl_IncrRefCount(imvPtr->callbackPtr); } if (imvPtr->protection == ITCL_DEFAULT_PROTECT) { imvPtr->protection = ITCL_PROTECTED; } Tcl_SetHashValue(hPtr, imvPtr); *imvPtrPtr = imvPtr; return TCL_OK; } /* * TODO: remove this if unused (seems to be internal API only), * now superseded by ItclCreateMethodVariable. */ int Itcl_CreateMethodVariable( Tcl_Interp *interp, /* interpreter managing this transaction */ ItclClass* iclsPtr, /* class containing this variable */ Tcl_Obj* namePtr, /* variable name */ Tcl_Obj* defaultPtr, /* initial value */ Tcl_Obj* callbackPtr, /* code invoked when variable is set */ ItclMethodVariable** imvPtrPtr) /* returns: new methdovariable definition */ { ItclVariable *ivPtr; Tcl_HashEntry *hPtr; /* * Search variable reference (ivPtr). */ hPtr = Tcl_FindHashEntry(&iclsPtr->variables, (char *)namePtr); if (!hPtr || !(ivPtr = (ItclVariable*)Tcl_GetHashValue(hPtr))) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable name \"", Tcl_GetString(namePtr), "\" is not declared in class \"", Tcl_GetString (iclsPtr->fullNamePtr), "\"", NULL); return TCL_ERROR; } /* * Create method variable. */ return ItclCreateMethodVariable(interp, ivPtr, defaultPtr, callbackPtr, imvPtrPtr); } /* * ------------------------------------------------------------------------ * Itcl_GetCommonVar() * * Returns the current value for a common class variable. The member |
︙ | ︙ |
Changes to generic/itclCmd.c.
︙ | ︙ | |||
743 744 745 746 747 748 749 | hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)contextNsPtr); if (hPtr != NULL) { contextIclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } if (Itcl_IsClassNamespace(contextNsPtr)) { ClientData clientData; | | | 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 | hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)contextNsPtr); if (hPtr != NULL) { contextIclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } if (Itcl_IsClassNamespace(contextNsPtr)) { ClientData clientData; entry = ItclResolveVarEntry(contextIclsPtr, token); if (!entry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable \"", token, "\" not found in class \"", Tcl_GetString(contextIclsPtr->fullNamePtr), "\"", NULL); result = TCL_ERROR; goto scopeCmdDone; |
︙ | ︙ |
Changes to generic/itclHelpers.c.
︙ | ︙ | |||
1118 1119 1120 1121 1122 1123 1124 | const char *cp; int haveFlags; int newValue1; keyPtr = iclsPtr->fullNamePtr; dictPtr = Tcl_GetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classVariables", | | | 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 | const char *cp; int haveFlags; int newValue1; keyPtr = iclsPtr->fullNamePtr; dictPtr = Tcl_GetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classVariables", NULL, TCL_GLOBAL_ONLY); if (dictPtr == NULL) { Tcl_AppendResult(interp, "cannot get dict ", ITCL_NAMESPACE, "::internal::dicts::classVariables", NULL); return TCL_ERROR; } if (Tcl_DictObjGet(interp, dictPtr, keyPtr, &valuePtr1) != TCL_OK) { return TCL_ERROR; |
︙ | ︙ | |||
1243 1244 1245 1246 1247 1248 1249 | keyPtr = iclsPtr->fullNamePtr; if (Tcl_DictObjPut(interp, dictPtr, keyPtr, valuePtr1) != TCL_OK) { return TCL_ERROR; } } Tcl_SetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classVariables", | | | 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 | keyPtr = iclsPtr->fullNamePtr; if (Tcl_DictObjPut(interp, dictPtr, keyPtr, valuePtr1) != TCL_OK) { return TCL_ERROR; } } Tcl_SetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classVariables", NULL, dictPtr, TCL_GLOBAL_ONLY); return TCL_OK; } /* * ------------------------------------------------------------------------ * ItclAddClassFunctionDictInfo() * ------------------------------------------------------------------------ |
︙ | ︙ | |||
1269 1270 1271 1272 1273 1274 1275 | Tcl_Obj *listPtr; const char *cp; int haveFlags; int newValue1; dictPtr = Tcl_GetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classFunctions", | | | 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 | Tcl_Obj *listPtr; const char *cp; int haveFlags; int newValue1; dictPtr = Tcl_GetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classFunctions", NULL, TCL_GLOBAL_ONLY); if (dictPtr == NULL) { Tcl_AppendResult(interp, "cannot get dict ", ITCL_NAMESPACE, "::internal::dicts::classFunctions", NULL); return TCL_ERROR; } keyPtr = iclsPtr->fullNamePtr; if (Tcl_DictObjGet(interp, dictPtr, keyPtr, &valuePtr1) != TCL_OK) { |
︙ | ︙ | |||
1403 1404 1405 1406 1407 1408 1409 | keyPtr = iclsPtr->fullNamePtr; if (Tcl_DictObjPut(interp, dictPtr, keyPtr, valuePtr1) != TCL_OK) { return TCL_ERROR; } } Tcl_SetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classFunctions", | | | 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 | keyPtr = iclsPtr->fullNamePtr; if (Tcl_DictObjPut(interp, dictPtr, keyPtr, valuePtr1) != TCL_OK) { return TCL_ERROR; } } Tcl_SetVar2Ex(interp, ITCL_NAMESPACE"::internal::dicts::classFunctions", NULL, dictPtr, TCL_GLOBAL_ONLY); return TCL_OK; } /* * ------------------------------------------------------------------------ * ItclAddClassDelegatedFunctionDictInfo() * ------------------------------------------------------------------------ |
︙ | ︙ |
Changes to generic/itclInfo.c.
︙ | ︙ | |||
197 198 199 200 201 202 203 | }, { "typevars", "?pattern?", Itcl_BiInfoTypeVarsCmd, ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS }, { "variable", | | | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | }, { "typevars", "?pattern?", Itcl_BiInfoTypeVarsCmd, ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS }, { "variable", "?name? ?-protection? ?-type? ?-name? ?-init? ?-value? ?-config? ?-scope?", Itcl_BiInfoVariableCmd, ITCL_CLASS|ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS }, { "variables", "?pattern?", Itcl_BiInfoVariablesCmd, ITCL_TYPE|ITCL_WIDGETADAPTOR|ITCL_WIDGET|ITCL_ECLASS |
︙ | ︙ | |||
1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 | * * If the ?varName? is not specified, then a list of all known * data members is returned. Otherwise, the information for a * specific member is returned. Returns a status TCL_OK/TCL_ERROR * to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itcl_BiInfoVariableCmd( ClientData clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ | > | 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 | * * If the ?varName? is not specified, then a list of all known * data members is returned. Otherwise, the information for a * specific member is returned. Returns a status TCL_OK/TCL_ERROR * to indicate success/failure. * ------------------------------------------------------------------------ */ /*&&&1*/ /* ARGSUSED */ int Itcl_BiInfoVariableCmd( ClientData clientData, /* ItclObjectInfo Ptr */ Tcl_Interp *interp, /* current interpreter */ int objc, /* number of arguments */ Tcl_Obj *const objv[]) /* argument objects */ |
︙ | ︙ | |||
1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 | ItclVariable *ivPtr; ItclVarLookup *vlookup; ItclHierIter hier; char *varName; const char *val; int i; int result; static const char *options[] = { "-config", "-init", "-name", "-protection", "-type", | > > > > > | | | < | 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 | ItclVariable *ivPtr; ItclVarLookup *vlookup; ItclHierIter hier; char *varName; const char *val; int i; int result; ClientData cfClientData; ItclObjectInfo *infoPtr; Tcl_Object oPtr; int doAppend; static const char *options[] = { "-config", "-init", "-name", "-protection", "-type", "-value", "-scope", NULL }; enum BIvIdx { BIvConfigIdx, BIvInitIdx, BIvNameIdx, BIvProtectIdx, BIvTypeIdx, BIvValueIdx, BIvScopeIdx } *ivlist, ivlistStorage[7]; static enum BIvIdx DefInfoVariable[5] = { BIvProtectIdx, BIvTypeIdx, BIvNameIdx, BIvInitIdx, BIvValueIdx }; static enum BIvIdx DefInfoPubVariable[6] = { BIvProtectIdx, BIvTypeIdx, BIvNameIdx, BIvInitIdx, BIvConfigIdx, BIvValueIdx }; ItclShowArgs(1, "Itcl_BiInfoVariableCmd", objc, objv); resultPtr = NULL; objPtr = NULL; varName = NULL; contextIclsPtr = NULL; /* |
︙ | ︙ | |||
1323 1324 1325 1326 1327 1328 1329 | } if (contextIoPtr != NULL) { contextIclsPtr = contextIoPtr->iclsPtr; } /* * Process args: | | | | 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 | } if (contextIoPtr != NULL) { contextIclsPtr = contextIoPtr->iclsPtr; } /* * Process args: * ?varName? ?-protection? ?-type? ?-name? ?-init? ?-config? ?-value? ?-scope? */ objv++; /* skip over command name */ objc--; if (objc > 0) { varName = Tcl_GetString(*objv); objc--; objv++; } /* * Return info for a specific variable. */ if (varName) { entry = ItclResolveVarEntry(contextIclsPtr, varName); if (entry == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a variable in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } |
︙ | ︙ | |||
1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 | } } if (val == NULL) { val = "<undefined>"; } objPtr = Tcl_NewStringObj((const char *)val, -1); break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 | } } if (val == NULL) { val = "<undefined>"; } objPtr = Tcl_NewStringObj((const char *)val, -1); break; case BIvScopeIdx: entry = Tcl_FindHashEntry(&contextIclsPtr->resolveVars, varName); if (!entry) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "variable \"", varName, "\" not found in class \"", Tcl_GetString(contextIclsPtr->fullNamePtr), "\"", (char*)NULL); return TCL_ERROR; } vlookup = (ItclVarLookup*)Tcl_GetHashValue(entry); if (vlookup->ivPtr->flags & ITCL_COMMON) { objPtr = Tcl_NewStringObj("", -1); if (vlookup->ivPtr->protection != ITCL_PUBLIC) { Tcl_AppendToObj(objPtr, ITCL_VARIABLES_NAMESPACE, -1); } Tcl_AppendToObj(objPtr, Tcl_GetString(vlookup->ivPtr->fullNamePtr), -1); } else { /* * If this is not a common variable, then we better have * an object context. Return the name as a fully qualified name. */ infoPtr = contextIclsPtr->infoPtr; cfClientData = Itcl_GetCallFrameClientData(interp); if (cfClientData != NULL) { oPtr = Tcl_ObjectContextObject((Tcl_ObjectContext)cfClientData); if (oPtr != NULL) { contextIoPtr = (ItclObject*)Tcl_ObjectGetMetadata( oPtr, infoPtr->object_meta_type); } } if (contextIoPtr == NULL) { if (infoPtr->currIoPtr != NULL) { contextIoPtr = infoPtr->currIoPtr; } } if (contextIoPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't scope variable \"", varName, "\": missing object context", (char*)NULL); return TCL_ERROR; } doAppend = 1; if (contextIclsPtr->flags & ITCL_ECLASS) { if (strcmp(varName, "itcl_options") == 0) { doAppend = 0; } } objPtr = Tcl_NewStringObj((char*)NULL, 0); Tcl_IncrRefCount(objPtr); Tcl_AppendToObj(objPtr, ITCL_VARIABLES_NAMESPACE, -1); Tcl_AppendToObj(objPtr, (Tcl_GetObjectNamespace(contextIoPtr->oPtr))->fullName, -1); if (doAppend) { Tcl_AppendToObj(objPtr, Tcl_GetString(vlookup->ivPtr->fullNamePtr), -1); } else { Tcl_AppendToObj(objPtr, "::", -1); Tcl_AppendToObj(objPtr, Tcl_GetString(vlookup->ivPtr->namePtr), -1); } } break; } if (objc == 1) { resultPtr = objPtr; } else { Tcl_ListObjAppendElement(NULL, resultPtr, objPtr); } |
︙ | ︙ | |||
4022 4023 4024 4025 4026 4027 4028 | objc--; objv++; } /* * Return info for a specific variable. */ if (varName) { | | | 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 | objc--; objv++; } /* * Return info for a specific variable. */ if (varName) { hPtr = ItclResolveVarEntry(contextIclsPtr, varName); if (hPtr == NULL) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "\"", varName, "\" isn't a typevariable in class \"", contextIclsPtr->nsPtr->fullName, "\"", NULL); return TCL_ERROR; } |
︙ | ︙ |
Changes to generic/itclInt.h.
︙ | ︙ | |||
63 64 65 66 67 68 69 | /* * 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. */ #undef assert | | < | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | /* * 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. */ #undef assert #if defined(NDEBUG) && !defined(DEBUG) #define assert(EX) ((void)0) #else /* !NDEBUG || DEBUG */ #define assert(EX) (void)((EX) || (Itcl_Assert(STRINGIFY(EX), __FILE__, __LINE__), 0)) #endif #define ITCL_INTERP_DATA "itcl_data" #define ITCL_TK_VERSION "8.6" /* * Convenience macros for iterating through hash tables. FOREACH_HASH_DECLS * sets up the declarations needed for the main macro, FOREACH_HASH, which |
︙ | ︙ | |||
96 97 98 99 100 101 102 | /* * What sort of size of things we like to allocate. */ #define ALLOC_CHUNK 8 | > > | | | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | /* * What sort of size of things we like to allocate. */ #define ALLOC_CHUNK 8 #define ITCL_INT_NAMESPACE ITCL_NAMESPACE"::internal" #define ITCL_INTDICTS_NAMESPACE ITCL_INT_NAMESPACE"::dicts" #define ITCL_VARIABLES_NAMESPACE ITCL_INT_NAMESPACE"::variables" #define ITCL_COMMANDS_NAMESPACE ITCL_INT_NAMESPACE"::commands" typedef struct ItclFoundation { Itcl_Stack methodCallStack; Tcl_Command dispatchCommand; } ItclFoundation; typedef struct ItclArgList { |
︙ | ︙ | |||
689 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 717 718 719 720 721 | ItclClass *iclsPtr, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE void ItclDeleteObjectVariablesNamespace(Tcl_Interp *interp, ItclObject *ioPtr); MODULE_SCOPE void ItclDeleteClassVariablesNamespace(Tcl_Interp *interp, ItclClass *iclsPtr); MODULE_SCOPE int ItclInfoInit(Tcl_Interp *interp, ItclObjectInfo *infoPtr); struct Tcl_ResolvedVarInfo; MODULE_SCOPE int Itcl_ClassCmdResolver(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); MODULE_SCOPE int Itcl_ClassVarResolver(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); MODULE_SCOPE int Itcl_ClassCompiledVarResolver(Tcl_Interp *interp, const char* name, int length, Tcl_Namespace *nsPtr, struct Tcl_ResolvedVarInfo **rPtr); MODULE_SCOPE int Itcl_ClassCmdResolver2(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); MODULE_SCOPE int Itcl_ClassVarResolver2(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); MODULE_SCOPE int Itcl_ClassCompiledVarResolver2(Tcl_Interp *interp, const char* name, int length, Tcl_Namespace *nsPtr, struct Tcl_ResolvedVarInfo **rPtr); MODULE_SCOPE int ItclSetParserResolver(Tcl_Namespace *nsPtr); MODULE_SCOPE void ItclProcErrorProc(Tcl_Interp *interp, Tcl_Obj *procNameObj); MODULE_SCOPE int Itcl_CreateOption (Tcl_Interp *interp, ItclClass *iclsPtr, ItclOption *ioptPtr); MODULE_SCOPE int Itcl_CreateMethodVariable (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *name, Tcl_Obj *defaultPtr, Tcl_Obj *callbackPtr, ItclMethodVariable **imvPtr); MODULE_SCOPE int DelegationInstall(Tcl_Interp *interp, ItclObject *ioPtr, ItclClass *iclsPtr); MODULE_SCOPE ItclClass *ItclNamespace2Class(Tcl_Namespace *nsPtr); MODULE_SCOPE const char* ItclGetCommonInstanceVar(Tcl_Interp *interp, | > > > > > > | 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 717 718 719 720 721 722 723 724 725 726 727 728 | ItclClass *iclsPtr, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE void ItclDeleteObjectVariablesNamespace(Tcl_Interp *interp, ItclObject *ioPtr); MODULE_SCOPE void ItclDeleteClassVariablesNamespace(Tcl_Interp *interp, ItclClass *iclsPtr); MODULE_SCOPE int ItclInfoInit(Tcl_Interp *interp, ItclObjectInfo *infoPtr); MODULE_SCOPE Tcl_HashEntry *ItclResolveVarEntry( ItclClass* iclsPtr, const char *varName); struct Tcl_ResolvedVarInfo; MODULE_SCOPE int Itcl_ClassCmdResolver(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); MODULE_SCOPE int Itcl_ClassVarResolver(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); MODULE_SCOPE int Itcl_ClassCompiledVarResolver(Tcl_Interp *interp, const char* name, int length, Tcl_Namespace *nsPtr, struct Tcl_ResolvedVarInfo **rPtr); MODULE_SCOPE int Itcl_ClassCmdResolver2(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); MODULE_SCOPE int Itcl_ClassVarResolver2(Tcl_Interp *interp, const char* name, Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); MODULE_SCOPE int Itcl_ClassCompiledVarResolver2(Tcl_Interp *interp, const char* name, int length, Tcl_Namespace *nsPtr, struct Tcl_ResolvedVarInfo **rPtr); MODULE_SCOPE int ItclSetParserResolver(Tcl_Namespace *nsPtr); MODULE_SCOPE void ItclProcErrorProc(Tcl_Interp *interp, Tcl_Obj *procNameObj); MODULE_SCOPE int Itcl_CreateOption (Tcl_Interp *interp, ItclClass *iclsPtr, ItclOption *ioptPtr); MODULE_SCOPE int ItclCreateMethodVariable(Tcl_Interp *interp, ItclVariable *ivPtr, Tcl_Obj* defaultPtr, Tcl_Obj* callbackPtr, ItclMethodVariable** imvPtrPtr); MODULE_SCOPE int Itcl_CreateMethodVariable (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj *name, Tcl_Obj *defaultPtr, Tcl_Obj *callbackPtr, ItclMethodVariable **imvPtr); MODULE_SCOPE int DelegationInstall(Tcl_Interp *interp, ItclObject *ioPtr, ItclClass *iclsPtr); MODULE_SCOPE ItclClass *ItclNamespace2Class(Tcl_Namespace *nsPtr); MODULE_SCOPE const char* ItclGetCommonInstanceVar(Tcl_Interp *interp, |
︙ | ︙ |
Changes to generic/itclMethod.c.
︙ | ︙ | |||
237 238 239 240 241 242 243 | /* * Find the variable and change its implementation. * Note that variable resolution table has *all* variables, * even those in a base class. Make sure that the class * containing the variable definition is the requested class. */ vlookup = NULL; | | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 | /* * Find the variable and change its implementation. * Note that variable resolution table has *all* variables, * even those in a base class. Make sure that the class * containing the variable definition is the requested class. */ vlookup = NULL; entry = ItclResolveVarEntry(iclsPtr, tail); if (entry) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(entry); if (vlookup->ivPtr->iclsPtr != iclsPtr) { vlookup = NULL; } } |
︙ | ︙ | |||
2216 2217 2218 2219 2220 2221 2222 | iclsPtr = resolveInfoPtr->iclsPtr; } infoPtr = iclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr != NULL) { iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } | | | 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 | iclsPtr = resolveInfoPtr->iclsPtr; } infoPtr = iclsPtr->infoPtr; hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses, (char *)nsPtr); if (hPtr != NULL) { iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); } hPtr = ItclResolveVarEntry(iclsPtr, varName); if (hPtr == NULL) { /* no class/object variable */ return NULL; } ivlPtr = (ItclVarLookup *)Tcl_GetHashValue(hPtr); if (ivlPtr == NULL) { return NULL; |
︙ | ︙ |
Changes to generic/itclObject.c.
︙ | ︙ | |||
869 870 871 872 873 874 875 | if (Tcl_SetVar2(interp, varName, NULL, "", TCL_NAMESPACE_ONLY) == NULL) { Tcl_AppendResult(interp, "INTERNAL ERROR cannot set", " variable \"", varName, "\"\n", NULL); goto errorCleanup; } } | | | 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 | if (Tcl_SetVar2(interp, varName, NULL, "", TCL_NAMESPACE_ONLY) == NULL) { Tcl_AppendResult(interp, "INTERNAL ERROR cannot set", " variable \"", varName, "\"\n", NULL); goto errorCleanup; } } hPtr2 = ItclResolveVarEntry(ivPtr->iclsPtr, varName); if (hPtr2 == NULL) { hPtr = Tcl_NextHashEntry(&place); continue; } if ((ivPtr->flags & ITCL_COMMON) == 0) { varPtr = Tcl_NewNamespaceVar(interp, varNsPtr, Tcl_GetString(ivPtr->namePtr)); |
︙ | ︙ | |||
1622 1623 1624 1625 1626 1627 1628 | /* get the variable definition to check if that is an ITCL_COMMON */ if (contextIclsPtr == NULL) { iclsPtr = contextIoPtr->iclsPtr; } else { iclsPtr = contextIclsPtr; } ivPtr = NULL; | | | | 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 | /* get the variable definition to check if that is an ITCL_COMMON */ if (contextIclsPtr == NULL) { iclsPtr = contextIoPtr->iclsPtr; } else { iclsPtr = contextIclsPtr; } ivPtr = NULL; hPtr = ItclResolveVarEntry(iclsPtr, (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_GLOBAL_ONLY); Tcl_DecrRefCount(varName); if (val) { return val; } } } |
︙ | ︙ | |||
1838 1839 1840 1841 1842 1843 1844 | } /* get the variable definition to check if that is an ITCL_COMMON */ if (contextIclsPtr == NULL) { iclsPtr = contextIoPtr->iclsPtr; } else { iclsPtr = contextIclsPtr; } | | | 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 | } /* get the variable definition to check if that is an ITCL_COMMON */ if (contextIclsPtr == NULL) { iclsPtr = contextIoPtr->iclsPtr; } else { iclsPtr = contextIclsPtr; } hPtr = ItclResolveVarEntry(iclsPtr, (char *)name1); if (hPtr != NULL) { vlookup = (ItclVarLookup *)Tcl_GetHashValue(hPtr); ivPtr = vlookup->ivPtr; } else { return NULL; } /* |
︙ | ︙ | |||
3492 3493 3494 3495 3496 3497 3498 | Tcl_HashEntry *hPtr; Tcl_Obj *objPtr; Tcl_DString buffer; ItclVarLookup *vlookup; ItclVariable *ivPtr; const char *val; | | | 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 | Tcl_HashEntry *hPtr; Tcl_Obj *objPtr; Tcl_DString buffer; ItclVarLookup *vlookup; ItclVariable *ivPtr; const char *val; hPtr = ItclResolveVarEntry(iclsPtr, (char *)varName); if (hPtr == NULL) { /* no such variable */ return NULL; } vlookup = (ItclVarLookup *)Tcl_GetHashValue(hPtr); if (vlookup == NULL) { return NULL; |
︙ | ︙ |
Changes to generic/itclParse.c.
︙ | ︙ | |||
578 579 580 581 582 583 584 | /* create the itcl_hull variable */ namePtr = Tcl_NewStringObj("itcl_hull", -1); if (ItclCreateComponent(interp, iclsPtr, namePtr, ITCL_COMMON, &icPtr) != TCL_OK) { return TCL_ERROR; } iclsPtr->numVariables++; | < | 578 579 580 581 582 583 584 585 586 587 588 589 590 591 | /* create the itcl_hull variable */ namePtr = Tcl_NewStringObj("itcl_hull", -1); if (ItclCreateComponent(interp, iclsPtr, namePtr, ITCL_COMMON, &icPtr) != TCL_OK) { return TCL_ERROR; } iclsPtr->numVariables++; } Tcl_ResetResult(interp); Tcl_AppendResult(interp, Tcl_GetString(iclsPtr->fullNamePtr), NULL); return result; } /* |
︙ | ︙ | |||
2137 2138 2139 2140 2141 2142 2143 | Tcl_SetHashValue(hPtr, varPtr); } result = Itcl_PushCallFrame(interp, &frame, commonNsPtr, /* isProcCallFrame */ 0); Itcl_PopCallFrame(interp); /* | < < < < < < | < < < | < | < > > > > > > < < | | 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 | Tcl_SetHashValue(hPtr, varPtr); } result = Itcl_PushCallFrame(interp, &frame, commonNsPtr, /* isProcCallFrame */ 0); Itcl_PopCallFrame(interp); /* * If an initialization value was specified, then initialize * the variable now, otherwise be sure the variable is uninitialized. */ if (initStr != NULL) { const char *val; val = Tcl_SetVar2(interp, Tcl_GetString(ivPtr->fullNamePtr), NULL, initStr, TCL_NAMESPACE_ONLY); if (!val) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "cannot initialize common variable \"", Tcl_GetString(ivPtr->namePtr), "\"", NULL); return TCL_ERROR; } } else { /* previous var-lookup in class body (in ::itcl::parser) could obtain * inherited common vars, so be sure it does not exists after new * common creation (simply remove this reference). */ Tcl_UnsetVar2(interp, Tcl_GetString(ivPtr->fullNamePtr), NULL, TCL_NAMESPACE_ONLY); } if (ivPtr->arrayInitPtr != NULL) { int i; int argc; const char **argv; const char *val; result = Tcl_SplitList(interp, Tcl_GetString(ivPtr->arrayInitPtr), &argc, &argv); for (i = 0; i < argc; i++) { val = Tcl_SetVar2(interp, Tcl_GetString(ivPtr->fullNamePtr), 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; |
︙ | ︙ | |||
4227 4228 4229 4230 4231 4232 4233 | } if (Itcl_CreateVariable(interp, iclsPtr, namePtr, Tcl_GetString(defaultPtr), NULL, &ivPtr) != TCL_OK) { return TCL_ERROR; } iclsPtr->numVariables++; | | | 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 | } if (Itcl_CreateVariable(interp, iclsPtr, namePtr, Tcl_GetString(defaultPtr), NULL, &ivPtr) != TCL_OK) { return TCL_ERROR; } iclsPtr->numVariables++; result = ItclCreateMethodVariable(interp, ivPtr, defaultPtr, callbackPtr, &imvPtr); if (result != TCL_OK) { return result; } objPtr = Tcl_NewStringObj("@itcl-builtin-setget ", -1); Tcl_AppendToObj(objPtr, Tcl_GetString(namePtr), -1); Tcl_AppendToObj(objPtr, " ", 1); |
︙ | ︙ |
Changes to generic/itclResolve.c.
︙ | ︙ | |||
272 273 274 275 276 277 278 | return TCL_CONTINUE; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * See if the variable is a known data member and accessible. */ | | | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | return TCL_CONTINUE; } iclsPtr = (ItclClass *)Tcl_GetHashValue(hPtr); /* * See if the variable is a known data member and accessible. */ hPtr = ItclResolveVarEntry(iclsPtr, name); if (hPtr == NULL) { return TCL_CONTINUE; } vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); if (!vlookup->accessible) { return TCL_CONTINUE; |
︙ | ︙ | |||
310 311 312 313 314 315 316 | /* Check that the object hasn't already been destroyed. */ hPtr = Tcl_FindHashEntry(&infoPtr->objects, (char *)contextIoPtr); if (hPtr == NULL) { return TCL_CONTINUE; } if (contextIoPtr->iclsPtr != vlookup->ivPtr->iclsPtr) { if (strcmp(Tcl_GetString(vlookup->ivPtr->namePtr), "this") == 0) { | | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | /* Check that the object hasn't already been destroyed. */ hPtr = Tcl_FindHashEntry(&infoPtr->objects, (char *)contextIoPtr); if (hPtr == NULL) { return TCL_CONTINUE; } if (contextIoPtr->iclsPtr != vlookup->ivPtr->iclsPtr) { if (strcmp(Tcl_GetString(vlookup->ivPtr->namePtr), "this") == 0) { hPtr = ItclResolveVarEntry(contextIoPtr->iclsPtr, Tcl_GetString(vlookup->ivPtr->namePtr)); if (hPtr != NULL) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } } } |
︙ | ︙ | |||
441 442 443 444 445 446 447 | buffer = storage; } else { buffer = (char*)ckalloc((unsigned)(length+1)); } memcpy((void*)buffer, (void*)name, (size_t)length); buffer[length] = '\0'; | | | 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | buffer = storage; } else { buffer = (char*)ckalloc((unsigned)(length+1)); } memcpy((void*)buffer, (void*)name, (size_t)length); buffer[length] = '\0'; hPtr = ItclResolveVarEntry(iclsPtr, buffer); if (buffer != storage) { ckfree(buffer); } /* * If the name is not found, or if it is inaccessible, |
︙ | ︙ | |||
524 525 526 527 528 529 530 | return NULL; } if (contextIoPtr->iclsPtr != vlookup->ivPtr->iclsPtr) { if (strcmp(Tcl_GetString(vlookup->ivPtr->namePtr), "this") == 0) { /* only for the this variable we need the one of the * contextIoPtr class */ | | | 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 | return NULL; } if (contextIoPtr->iclsPtr != vlookup->ivPtr->iclsPtr) { if (strcmp(Tcl_GetString(vlookup->ivPtr->namePtr), "this") == 0) { /* only for the this variable we need the one of the * contextIoPtr class */ hPtr = ItclResolveVarEntry(contextIoPtr->iclsPtr, Tcl_GetString(vlookup->ivPtr->namePtr)); if (hPtr != NULL) { vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); } } } |
︙ | ︙ | |||
650 651 652 653 654 655 656 | Tcl_HashEntry *hPtr; ItclVarLookup *vlookup; /* * See if the requested variable is a recognized "common" member. * If it is, make sure that access is allowed. */ | | | > > > | | > > | | | | | < | | | | | < | | < < | < < < < < < | | 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 | Tcl_HashEntry *hPtr; ItclVarLookup *vlookup; /* * See if the requested variable is a recognized "common" member. * If it is, make sure that access is allowed. */ hPtr = ItclResolveVarEntry(iclsPtr, name); if (!hPtr) { return TCL_CONTINUE; } vlookup = (ItclVarLookup*)Tcl_GetHashValue(hPtr); if ((vlookup->ivPtr->flags & ITCL_COMMON) == 0) { return TCL_CONTINUE; } 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) { return TCL_CONTINUE; } *rPtr = (Tcl_Var)Tcl_GetHashValue(hPtr); return TCL_OK; } int ItclSetParserResolver( Tcl_Namespace *nsPtr) { Itcl_SetNamespaceResolvers(nsPtr, NULL, Itcl_ParseVarResolver, NULL); return TCL_OK; } |
Changes to pkgIndex.tcl.in.
1 2 3 4 5 6 | # Tcl package index file, version 1.0 if {![package vsatisfies [package provide Tcl] 8.6-]} {return} package ifneeded itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itcl] package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itcl] | > | 1 2 3 4 5 6 7 | # Tcl package index file, version 1.0 if {![package vsatisfies [package provide Tcl] 8.5]} {return} if {![package vsatisfies [package provide Tcl] 8.6-]} {return} package ifneeded itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itcl] package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itcl] |
Added tests-perf/itcl-basic.perf.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 115 116 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 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 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 | #!/usr/bin/tclsh # ------------------------------------------------------------------------ # # itcl-basic.perf.tcl -- # # This file provides performance tests for comparison of basic itcl-speed. # # ------------------------------------------------------------------------ # # Copyright (c) 2019 Serg G. Brester (aka sebres) # # See the file "license.terms" for information on usage and redistribution # of this file. # if {![namespace exists ::tclTestPerf]} { source [file join [file dirname [info library]] tests-perf test-performance.tcl] } namespace eval ::itclTestPerf-Basic { namespace path {::tclTestPerf} ## test cases covering regression on class count (memory preserve/release): proc test-cls-init {{reptime {3000 1000}}} { set reptime [_adjust_maxcount $reptime 1000] _test_run $reptime { setup {set i 0; set k 0} ## 1) create up-to 1000 classes (with 100 vars): {itcl::class timeClass[incr i] { for {set j 0} {$j<100} {incr j} { public variable d$j } }} ## 2) create up-to 1000 classes (with 100 vars): {itcl::class finiClass[incr k] { for {set j 0} {$j<100} {incr j} { public variable d$j } }} ## 2) delete up-to 1000 classes: {itcl::delete class finiClass$k; if {[incr k -1] <= 0} break} cleanup {while {$k > 0} {itcl::delete class finiClass$k; incr k -1}} ## 1) delete up-to 1000 classes: {itcl::delete class timeClass$i; if {[incr i -1] <= 0} break} cleanup {while {$i > 0} {itcl::delete class timeClass$i; incr i -1}} } } ## test cases covering run-time dependency to variable count of class with nested ## namespaces and class inheritances... ## original itcl-resolver (due to completely rebuild) has the complexity ca. O(nn**2,2**vn) here, ## so the deeper a class/inheritance and expecially the more variables it has, ## the worse the performance of class creation or modification. proc test-var-create {{reptime {3000 10000}}} { upvar maxv maxv foreach ns {{} ::test-itcl-ns1 ::test-itcl-ns1::test-itcl-ns2} { incr n if {$ns ne {}} { namespace eval $ns {} } _test_start $reptime foreach clsi {0 1 2} { if {$clsi} { set inh ${ns}::timeClass[expr {$clsi-1}] } else { set inh {} } set cls ${ns}::timeClass$clsi puts "== ${n}.$clsi) class : $cls == [expr {$inh ne "" ? "inherite $inh" : ""}]" if {[info command $cls] ne ""} { itcl::delete class $cls } itcl::class $cls [string map [list \$reptime [list $reptime] \$in_inh [list $inh] \$clsi $clsi] { set j 0 set inh $in_inh if {$inh ne ""} { puts "% inherit $inh" ::tclTestPerf::_test_iter 2 [timerate { inherit $inh } 1 1] } puts "% declare vars ..." ::tclTestPerf::_test_iter 2 [timerate { public variable pub[incr j] 0 protected variable pro$j 1 private variable pri$j 2 # 10K commons is too slow in Itcl original edition (time grows on each iter), so 1K enough: if {$j <= 1000} { public common com$j "" } } {*}$reptime] public method getv {vn} {set $vn} public method getpub1 {} {set pro1} public method getpro1 {} {set pro1} public method getpri1 {} {set pri1} public method getunknown {} {catch {set novarinthisclass}} # Itcl original edition may be too slow (time grows on each inheritance), so save real max-iters (<= 10K): uplevel [list set j $j] }] set maxv($clsi,$ns) $j } } _test_out_total } # access variable: proc test-access {{reptime 1000}} { upvar maxv maxv _test_start $reptime foreach ns {{} ::test-itcl-ns1 ::test-itcl-ns1::test-itcl-ns2} { set reptm [_adjust_maxcount $reptime $maxv(0,$ns)] incr n set cls ${ns}::timeClass0 puts "== ${n}) class : $cls ==" set mp [list \ \$cls $cls \$n $n \ \$maxc0 [expr {min(1000,$maxv(0,$ns))}] ] _test_run $reptm [string map $mp { # $n) obj-var resolve/get setup {$cls o; set j 0} {o getv pub[incr j]} # $n) obj-var get (resolved) setup {set j 0} {o getv pub[incr j]} # $n) obj-var resolved setup {set j 0} {o getv pub1} # $n) obj-var in method compiled (public) {o getpub1} # $n) obj-var in method compiled (protected) {o getpro1} # $n) obj-var in method compiled (private) {o getpri1} # $n) obj-var in method unknown {o getunknown} cleanup {itcl::delete object o} # $n) obj-var resolve/cget setup {$cls o; set j 0} {o cget -pub[incr j]} # $n) obj-var cget (resolved): setup {set j 0} {o cget -pub[incr j]} # $n) obj-var cfg/cget {o configure -pub1} {o cget -pub1} # $n) cls-com resolve setup {set j 0} {o getv com[incr j]; if {$j >= $maxc0} {set j 0}} # $n) cls-com resolved {o getv com1} cleanup {itcl::delete object o} }] } _test_out_total } # ------------------------------------------------------------------------ # create/delete object: proc test-obj-instance {{reptime 1000}} { _test_start $reptime set n 0 foreach ns {{} ::test-itcl-ns1 ::test-itcl-ns1::test-itcl-ns2} { incr n set cls ${ns}::timeClass0 puts "== ${n}) class : $cls ==" _test_run $reptime [string map [list \$cls $cls \$n $n] { setup {set i 0} # $n) create : {$cls o[incr i]} # $n) delete: {itcl::delete object o$i; if {[incr i -1] <= 0} break} cleanup {while {$i > 0} {itcl::delete object o$i; incr i -1}} # $n) create + delete: {$cls o; itcl::delete object o} }] } _test_out_total } # ------------------------------------------------------------------------ proc test {{reptime 1000}} { set reptm $reptime lset reptm 0 [expr {[lindex $reptm 0] * 10}] if {[llength $reptm] == 1} { lappend reptm 10000 } puts "==== initialization (preserve/release) ====\n" test-cls-init $reptm puts "==== class/var creation ====\n" test-var-create $reptm puts "==== var access ====\n" test-access $reptime puts "==== object instance ====\n" test-obj-instance $reptime puts \n**OK** } }; # end of ::tclTestPerf-Timer-Event # ------------------------------------------------------------------------ # if calling direct: if {[info exists ::argv0] && [file tail $::argv0] eq [file tail [info script]]} { array set in {-time 500 -lib {} -load {}} array set in $argv if {$in(-load) ne ""} { eval $in(-load) } if {![namespace exists ::itcl]} { if {$in(-lib) eq ""} { set in(-lib) "itcl412" } puts "testing with $in(-lib)" load $in(-lib) itcl } ::itclTestPerf-Basic::test $in(-time) } |
Changes to tests/basic.test.
︙ | ︙ | |||
534 535 536 537 538 539 540 541 542 543 544 545 546 547 | test_arrays0 do array names undefined } -result {} test basic-6.8 {common variables can be redefined } -body { test_arrays0 do set undefined "scalar" } -result {scalar} if {[namespace which test_arrays] ne {}} { ::itcl::delete class test_arrays } check_itcl_basic_errors rename check_itcl_basic_errors {} | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | test_arrays0 do array names undefined } -result {} test basic-6.8 {common variables can be redefined } -body { test_arrays0 do set undefined "scalar" } -result {scalar} proc testVarResolver {{access private} {init 0}} { eval [string map [list \$access $access \$init $init] { itcl::class A { $access common cv "A::cv" public proc cv {} {set cv} } itcl::class B { inherit A public common res {} lappend res [info exists cv] if {$init} { $access common cv "" } else { $access common cv } lappend res [info exists cv] lappend cv "B::cv-add" public proc cv {} {set cv} } lappend B::res [A::cv] [B::cv] set B::res }] } test basic-7.1-a {variable lookup before a common creation (bug [777ae99cfb])} -body { # private uninitialized var: testVarResolver private 0 } -result {0 0 A::cv B::cv-add} -cleanup { itcl::delete class B A } test basic-7.1-b {variable lookup before a common creation (bug [777ae99cfb])} -body { # public uninitialized var: testVarResolver public 0 } -result {1 0 A::cv B::cv-add} -cleanup { itcl::delete class B A } test basic-7.2-a {variable lookup before a common creation (bug [777ae99cfb])} -body { # private initialized var: testVarResolver private 1 } -result {0 1 A::cv B::cv-add} -cleanup { itcl::delete class B A } test basic-7.2-b {variable lookup before a common creation (bug [777ae99cfb])} -body { # public initialized var: testVarResolver public 1 } -result {1 1 A::cv B::cv-add} -cleanup { itcl::delete class B A } if {[namespace which test_arrays] ne {}} { ::itcl::delete class test_arrays } check_itcl_basic_errors rename check_itcl_basic_errors {} |
︙ | ︙ |
Changes to tests/info.test.
︙ | ︙ | |||
70 71 72 73 74 75 76 | } {1 {wrong # args: should be one of... info args procname info body procname info class info function ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info heritage info inherit | | | | > | | > | | > | | 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 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | } {1 {wrong # args: should be one of... info args procname info body procname info class info function ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info heritage info inherit info variable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? ?-config? ?-scope? ...and others described on the man page}} test info-1.3 {info: errors trigger usage info} { test_info ti list [catch {ti info} msg] $msg } {1 {wrong # args: should be one of... info args procname info body procname info class info function ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info heritage info inherit info variable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? ?-config? ?-scope? ...and others described on the man page}} test info-1.4 {info: info class works on class itself} { namespace eval test_info { info class } } {::test_info} # ---------------------------------------------------------------------- # Data members # ---------------------------------------------------------------------- test info-2.1 {info: all variables} { lsort [ti info variable] } {::test_info::defc ::test_info::defv ::test_info::pric ::test_info::priv ::test_info::proc ::test_info::prov ::test_info::pubc ::test_info::pubv ::test_info::this ::test_info::uninitc ::test_info::uninitv ::test_info_base::base} test info-2.2a {info: public variables} { ti info variable pubv } {public variable ::test_info::pubv public {set pubv "public: $pubv"} new-public} test info-2.2b {info: public variables} -body { list [ti info variable pubv -protection] \ [ti info variable pubv -type] \ [ti info variable pubv -name] \ [ti info variable pubv -init] \ [ti info variable pubv -config] \ [ti info variable pubv -value] \ [ti info variable pubv -scope] \ } -match glob -result {public variable ::test_info::pubv public {set pubv "public: $pubv"} new-public ::itcl::internal::variables::oo::Obj*::test_info::pubv} test info-2.3a {info: protected variables} { ti info variable prov } {protected variable ::test_info::prov protected new-protected} test info-2.3b {info: protected variables} -body { list [ti info variable prov -protection] \ [ti info variable prov -type] \ [ti info variable prov -name] \ [ti info variable prov -init] \ [ti info variable prov -value] \ [ti info variable prov -scope] \ } -match glob -result {protected variable ::test_info::prov protected new-protected ::itcl::internal::variables::oo::Obj*::test_info::prov} test info-2.4a {info: private variables} { ti info variable priv } {private variable ::test_info::priv private new-private} test info-2.4b {info: private variables} -body { list [ti info variable priv -protection] \ [ti info variable priv -type] \ [ti info variable priv -name] \ [ti info variable priv -init] \ [ti info variable priv -value] \ [ti info variable priv -scope] \ } -match glob -result {private variable ::test_info::priv private new-private ::itcl::internal::variables::oo::Obj*::test_info::priv} test info-2.5 {"this" variable is built in} { ti info variable this } {protected variable ::test_info::this ::ti ::ti} test info-2.6 {info: protected/private variables have no "config" code} { list [ti info variable prov -config] [ti info variable priv -config] |
︙ | ︙ | |||
160 161 162 163 164 165 166 | test info-2.9b {info: public common variables} { list [ti info variable pubc -protection] \ [ti info variable pubc -type] \ [ti info variable pubc -name] \ [ti info variable pubc -init] \ [ti info variable pubc -value] \ | > | > | > | | 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 | test info-2.9b {info: public common variables} { list [ti info variable pubc -protection] \ [ti info variable pubc -type] \ [ti info variable pubc -name] \ [ti info variable pubc -init] \ [ti info variable pubc -value] \ [ti info variable pubc -scope] \ } {public common ::test_info::pubc public new-public ::test_info::pubc} test info-2.10a {info: protected common variables} { ti info variable proc } {protected common ::test_info::proc protected new-protected} test info-2.10b {info: protected common variables} { list [ti info variable proc -protection] \ [ti info variable proc -type] \ [ti info variable proc -name] \ [ti info variable proc -init] \ [ti info variable proc -value] \ [ti info variable proc -scope] \ } {protected common ::test_info::proc protected new-protected ::itcl::internal::variables::test_info::proc} test info-2.11a {info: private common variables} { ti info variable pric } {private common ::test_info::pric private new-private} test info-2.11b {info: private common variables} { list [ti info variable pric -protection] \ [ti info variable pric -type] \ [ti info variable pric -name] \ [ti info variable pric -init] \ [ti info variable pric -value] \ [ti info variable pric -scope] \ } {private common ::test_info::pric private new-private ::itcl::internal::variables::test_info::pric} test info-2.12 {info: public/protected/private vars have no "config" code} { list [ti info variable pubc -config] \ [ti info variable proc -config] \ [ti info variable pric -config] } {{} {} {}} |
︙ | ︙ | |||
208 209 210 211 212 213 214 | list [namespace eval test_info {lsort [array names uninitc]}] \ [namespace eval test_info {set uninitc(0)}] \ [namespace eval test_info {set uninitc(1)}] } {{0 1} zero one} test info-2.16 {flag syntax errors} { list [catch {ti info variable defv -xyzzy} msg] $msg | | | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 | list [namespace eval test_info {lsort [array names uninitc]}] \ [namespace eval test_info {set uninitc(0)}] \ [namespace eval test_info {set uninitc(1)}] } {{0 1} zero one} test info-2.16 {flag syntax errors} { list [catch {ti info variable defv -xyzzy} msg] $msg } {1 {bad option "-xyzzy": must be -config, -init, -name, -protection, -type, -value, or -scope}} # ---------------------------------------------------------------------- # Member functions # ---------------------------------------------------------------------- test info-3.1 {info: all functions} { lsort [ti info function] } {::test_info::constructor ::test_info::defm ::test_info::defp ::test_info::destructor ::test_info::prim ::test_info::prip ::test_info::prom ::test_info::prop ::test_info::pubm ::test_info::pubp ::test_info::uninitm ::test_info::uninitp ::test_info_base::base ::test_info_base::cget ::test_info_base::configure ::test_info_base::do ::test_info_base::isa} |
︙ | ︙ |
Changes to tests/typeinfo.test.
︙ | ︙ | |||
48 49 50 51 52 53 54 | info options ?pattern? info type info typemethod ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info typemethods ?pattern? info types ?pattern? info typevariable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? info typevars ?pattern? | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | info options ?pattern? info type info typemethod ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info typemethods ?pattern? info types ?pattern? info typevariable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? info typevars ?pattern? info variable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? ?-config? ?-scope? info variables ?pattern? ...and others described on the man page} test iinfo-1.3 {object info too many args} -body { type dog { } dog create spot |
︙ | ︙ | |||
651 652 653 654 655 656 657 | info options ?pattern? info type info typemethod ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info typemethods ?pattern? info types ?pattern? info typevariable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? info typevars ?pattern? | | | 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 | info options ?pattern? info type info typemethod ?name? ?-protection? ?-type? ?-name? ?-args? ?-body? info typemethods ?pattern? info types ?pattern? info typevariable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? info typevars ?pattern? info variable ?name? ?-protection? ?-type? ?-name? ?-init? ?-value? ?-config? ?-scope? info variables ?pattern? ...and others described on the man page} test tinfo-1.3 {type info too many args} -body { type dog { } |
︙ | ︙ |
Changes to win/makefile.vc.
︙ | ︙ | |||
43 44 45 46 47 48 49 | $(TMP_DIR)\itclUtil.obj \ !if !$(STATIC_BUILD) $(TMP_DIR)\dllEntryPoint.obj \ !endif PRJ_STUBOBJS = $(TMP_DIR)\itclStubLib.obj | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | $(TMP_DIR)\itclUtil.obj \ !if !$(STATIC_BUILD) $(TMP_DIR)\dllEntryPoint.obj \ !endif PRJ_STUBOBJS = $(TMP_DIR)\itclStubLib.obj PRJ_DEFINES = /D_CRT_SECURE_NO_WARNINGS !if $(DEBUG) PRJ_DEFINES = $(PRJ_DEFINES) /DITCL_DEBUG !endif PRJ_HEADERS_PUBLIC = \ $(GENERICDIR)\itcl.h \ $(GENERICDIR)\itclDecls.h |
︙ | ︙ |
Changes to win/rules.vc.
︙ | ︙ | |||
1273 1274 1275 1276 1277 1278 1279 | # lflags - complete linker switches (subsumes ldebug) except subsystem type # dlllflags - complete linker switches to build DLLs (subsumes lflags) # conlflags - complete linker switches for console program (subsumes lflags) # guilflags - complete linker switches for GUI program (subsumes lflags) # baselibs - minimum Windows libraries required. Parent makefile can # define PRJ_LIBS before including rules.rc if additional libs are needed | | | | | | | | | | | | | | | | | | | | | 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 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 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 | # lflags - complete linker switches (subsumes ldebug) except subsystem type # dlllflags - complete linker switches to build DLLs (subsumes lflags) # conlflags - complete linker switches for console program (subsumes lflags) # guilflags - complete linker switches for GUI program (subsumes lflags) # baselibs - minimum Windows libraries required. Parent makefile can # define PRJ_LIBS before including rules.rc if additional libs are needed OPTDEFINES = /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS !if $(TCL_MEM_DEBUG) OPTDEFINES = $(OPTDEFINES) /DTCL_MEM_DEBUG !endif !if $(TCL_COMPILE_DEBUG) OPTDEFINES = $(OPTDEFINES) /DTCL_COMPILE_DEBUG /DTCL_COMPILE_STATS !endif !if $(TCL_THREADS) && $(TCL_VERSION) < 87 OPTDEFINES = $(OPTDEFINES) /DTCL_THREADS=1 !if $(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87 OPTDEFINES = $(OPTDEFINES) /DUSE_THREAD_ALLOC=1 !endif !endif !if $(STATIC_BUILD) OPTDEFINES = $(OPTDEFINES) /DSTATIC_BUILD !endif !if $(TCL_NO_DEPRECATED) OPTDEFINES = $(OPTDEFINES) /DTCL_NO_DEPRECATED !endif !if $(USE_STUBS) # Note we do not define USE_TCL_STUBS even when building tk since some # test targets in tk do not use stubs !if ! $(DOING_TCL) USE_STUBS_DEFS = /DUSE_TCL_STUBS /DUSE_TCLOO_STUBS !if $(NEED_TK) USE_STUBS_DEFS = $(USE_STUBS_DEFS) /DUSE_TK_STUBS !endif !endif !endif # USE_STUBS !if !$(DEBUG) OPTDEFINES = $(OPTDEFINES) /DNDEBUG !if $(OPTIMIZING) OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_OPTIMIZED !endif !endif !if $(PROFILE) OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_PROFILED !endif !if "$(MACHINE)" == "AMD64" OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_DO64BIT !endif !if $(VCVERSION) < 1300 OPTDEFINES = $(OPTDEFINES) /DNO_STRTOI64 !endif !if "$(_USE_64BIT_TIME_T)" == "1" OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T !endif # _ATL_XP_TARGETING - Newer SDK's need this to build for XP COMPILERFLAGS = /D_ATL_XP_TARGETING # Like the TEA system only set this non empty for non-Tk extensions # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME # so we pass both !if !$(DOING_TCL) && !$(DOING_TK) PKGNAMEFLAGS = /DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ /DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ /DPACKAGE_VERSION="\"$(DOTVERSION)\"" \ /DMODULE_SCOPE=extern !endif # crt picks the C run time based on selected OPTS !if $(MSVCRT) !if $(DEBUG) && !$(UNCHECKED) crt = -MDd !else |
︙ | ︙ | |||
1382 1383 1384 1385 1386 1387 1388 | # output increasing chance of a real warning getting lost. So disable them. # Eventually some day, Tcl will be 64-bit clean. cwarn = $(cwarn) -wd4311 -wd4312 !endif ### Common compiler options that are architecture specific !if "$(MACHINE)" == "ARM" | | | 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 | # output increasing chance of a real warning getting lost. So disable them. # Eventually some day, Tcl will be 64-bit clean. cwarn = $(cwarn) -wd4311 -wd4312 !endif ### Common compiler options that are architecture specific !if "$(MACHINE)" == "ARM" carch = /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE !else carch = !endif !if $(DEBUG) # Turn warnings into errors cwarn = $(cwarn) -WX |
︙ | ︙ | |||
1412 1413 1414 1415 1416 1417 1418 | # object files (e.g. tclsh, or wish) pkgcflags contains $(cflags) plus # flags used for building shared object files The two differ in the # BUILD_$(PROJECT) macro which should be defined only for the shared # library *implementation* and not for its caller interface appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) appcflags = $(appcflags_nostubs) $(USE_STUBS_DEFS) | | | | | | 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 | # object files (e.g. tclsh, or wish) pkgcflags contains $(cflags) plus # flags used for building shared object files The two differ in the # BUILD_$(PROJECT) macro which should be defined only for the shared # library *implementation* and not for its caller interface appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) appcflags = $(appcflags_nostubs) $(USE_STUBS_DEFS) pkgcflags = $(appcflags) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT) pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT) # stubscflags contains $(cflags) plus flags used for building a stubs # library for the package. Note: /DSTATIC_BUILD is defined in # $(OPTDEFINES) only if the OPTS configuration indicates a static # library. However the stubs library is ALWAYS static hence included # here irrespective of the OPTS setting. # # TBD - tclvfs has a comment that stubs libs should not be compiled with -GL # without stating why. Tcl itself compiled stubs libs with this flag. # so we do not remove it from cflags. -GL may prevent extensions # compiled with one VC version to fail to link against stubs library # compiled with another VC version. Check for this and fix accordingly. stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl /DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS) # Link flags !if $(DEBUG) ldebug = -debug -debugtype:cv !else ldebug = -release -opt:ref -opt:icf,3 |
︙ | ︙ | |||
1503 1504 1505 1506 1507 1508 1509 | LIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@ DLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs) CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs) GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs) RESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \ $(TCL_INCLUDES) \ | | | | | | | | | 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 | LIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@ DLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs) CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs) GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs) RESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \ $(TCL_INCLUDES) \ /DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \ /DCOMMAVERSION=$(DOTVERSION:.=,),0 \ /DDOTVERSION=\"$(DOTVERSION)\" \ /DVERSION=\"$(VERSION)\" \ /DSUFX=\"$(SUFX)\" \ /DPROJECT=\"$(PROJECT)\" \ /DPRJLIBNAME=\"$(PRJLIBNAME)\" !ifndef DEFAULT_BUILD_TARGET DEFAULT_BUILD_TARGET = $(PROJECT) !endif default-target: $(DEFAULT_BUILD_TARGET) |
︙ | ︙ |