Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Nettool's build script wasn't implementing the ladd command. Clay was missing a fix that kept it's loader from accidentally creating variables in the global namespace as a side effect of a foreach loop |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | hypnotoad |
Files: | files | file ages | folders |
SHA3-256: |
ae3d36ca11a9e0478293cc66f127b0d1 |
User & Date: | hypnotoad 2018-12-09 12:20:25.609 |
Context
2018-12-12
| ||
01:08 | Replacing a global g(HOME) which means something in a TOBE kit with ::starkit::localHome if the application is looking for somewhere to grap preferences/etc check-in: 20d0246bc6 user: hypnotoad tags: hypnotoad | |
2018-12-09
| ||
12:20 | Nettool's build script wasn't implementing the ladd command. Clay was missing a fix that kept it's loader from accidentally creating variables in the global namespace as a side effect of a foreach loop check-in: ae3d36ca11 user: hypnotoad tags: hypnotoad | |
2018-12-08
| ||
20:06 | Re-Registering clay with the installer check-in: ad61ac4ac5 user: hypnotoad tags: hypnotoad | |
Changes
Changes to modules/clay/build/build.tcl.
︙ | ︙ | |||
125 126 127 128 129 130 131 | source [file join $srcdir procs.tcl] set fout [open [file join $moddir $filename.test] w] puts $fout { namespace eval ::oo::dialect {} set ::oo::dialect::has(tip470) 0 } puts $fout [source [file join $srcdir test.tcl]] | < < < < | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | source [file join $srcdir procs.tcl] set fout [open [file join $moddir $filename.test] w] puts $fout { namespace eval ::oo::dialect {} set ::oo::dialect::has(tip470) 0 } puts $fout [source [file join $srcdir test.tcl]] puts $fout { if {![package vsatisfies [package provide Tcl] 8.7]} {return} puts "Repeating tests with 8.7 features" namespace eval ::oo::dialect {} set ::oo::dialect::has(tip470) 1 } puts $fout [source [file join $srcdir test.tcl]] close $fout set manout [open [file join $moddir $filename.man] w] puts $manout [AutoDoc manpage map $modmap \ header [::practcl::cat [file join $srcdir manual.txt]] \ authors $authors \ footer [::practcl::cat [file join $srcdir footer.txt]] \ ] close $manout |
︙ | ︙ |
Changes to modules/clay/build/dialect.tcl.
︙ | ︙ | |||
18 19 20 21 22 23 24 | # Meta require {Tcl 8.6} # Meta author Sean Woods # Meta author Donald K. Fellows # Meta license BSD # @@ Meta End namespace eval ::clay::dialect { namespace export create | < | | | | | | | | > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | # Meta require {Tcl 8.6} # Meta author Sean Woods # Meta author Donald K. Fellows # Meta license BSD # @@ Meta End namespace eval ::clay::dialect { namespace export create # Allow test rigs to overwrite the flags before invoking this script foreach {flag test} { tip470 {package vsatisfies [package provide Tcl] 8.7} } { if {![info exists ::clay::dialect::has($flag)]} { set ::clay::dialect::has($flag) [eval $test] } } } proc ::clay::dialect::Push {class} { ::variable class_stack lappend class_stack $class } proc ::clay::dialect::Peek {} { ::variable class_stack |
︙ | ︙ |
Changes to modules/clay/clay.tcl.
︙ | ︙ | |||
706 707 708 709 710 711 712 | # END: dictargs.tcl ### ### # START: dialect.tcl ### namespace eval ::clay::dialect { namespace export create | < | | | | | > | 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 | # END: dictargs.tcl ### ### # START: dialect.tcl ### namespace eval ::clay::dialect { namespace export create foreach {flag test} { tip470 {package vsatisfies [package provide Tcl] 8.7} } { if {![info exists ::clay::dialect::has($flag)]} { set ::clay::dialect::has($flag) [eval $test] } } } proc ::clay::dialect::Push {class} { ::variable class_stack lappend class_stack $class } proc ::clay::dialect::Peek {} { |
︙ | ︙ |
Changes to modules/clay/clay.test.
1 2 3 4 5 6 7 8 9 10 | namespace eval ::oo::dialect {} set ::oo::dialect::has(tip470) 0 # clay.test - Copyright (c) 2018 Sean Woods # ------------------------------------------------------------------------- set MODDIR [file dirname [file dirname [file join [pwd] [info script]]]] if {[file exists [file join $MODDIR devtools testutilities.tcl]]} { # Running inside tcllib | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 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 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 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 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 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 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 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 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 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 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 871 872 873 874 875 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 904 905 906 907 908 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 968 969 970 971 972 973 974 975 976 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 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 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 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 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 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 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 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 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 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 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 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 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 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 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 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 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 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 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 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 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 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 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 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 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 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 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 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 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 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 2531 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 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 | namespace eval ::oo::dialect {} set ::oo::dialect::has(tip470) 0 # clay.test - Copyright (c) 2018 Sean Woods # ------------------------------------------------------------------------- set MODDIR [file dirname [file dirname [file join [pwd] [info script]]]] if {[file exists [file join $MODDIR devtools testutilities.tcl]]} { # Running inside tcllib set TCLLIBMOD $MODDIR } else { set TCLLIBMOD [file join $MODDIR .. .. tcllib modules] } source [file join $TCLLIBMOD devtools testutilities.tcl] testsNeedTcl 8.6 testsNeedTcltest 2 testsNeed TclOO 1 support {} testing { useLocal clay.tcl clay } set ::clay::trace 0 # ------------------------------------------------------------------------- # Handle multiple implementation testing # array set preserve [array get ::clay::uuid::accel] proc implementations {} { variable ::clay::uuid::accel foreach {a v} [array get accel] {if {$v} {lappend r $a}} lappend r tcl; set r } proc select_implementation {impl} { variable ::clay::uuid::accel foreach e [array names accel] { set accel($e) 0 } if {[string compare "tcl" $impl] != 0} { set accel($impl) 1 } } proc reset_implementation {} { variable ::clay::uuid::accel array set accel [array get ::preserve] } # ------------------------------------------------------------------------- # Setup any constraints # # ------------------------------------------------------------------------- # Now the package specific tests.... # ------------------------------------------------------------------------- # ------------------------------------------------------------------------- foreach impl [implementations] { select_implementation $impl test uuid-1.0-$impl "uuid requires args" { list [catch {clay::uuid} msg] } {1} test uuid-1.1-$impl "uuid generate should create a 36 char string uuid" { list [catch {string length [clay::uuid generate]} msg] $msg } {0 36} test uuid-1.2-$impl "uuid comparison of uuid with self should be true" { list [catch { set a [clay::uuid generate] clay::uuid equal $a $a } msg] $msg } {0 1} test uuid-1.3-$impl "uuid comparison of two different uuids should be false" { list [catch { set a [clay::uuid generate] set b [clay::uuid generate] clay::uuid equal $a $b } msg] $msg } {0 0} reset_implementation } # Modification History: ### # Modification 2018-10-30 # Fixed an error in our ancestry mapping and developed tests to # ensure we are actually following in the order TclOO follows methods ### # Modification 2018-10-21 # The clay metaclass no longer exports the clay method # to oo::class and oo::object, and clay::ancestors no # longer returns any class that lacks the clay method ### # Modification 2018-10-10 # clay::ancestors now rigged to descend into all classes depth-first # and then place metaclasses at the end of the search ### # ------------------------------------------------------------------------- # ------------------------------------------------------------------------- # Test Helpers ### proc dict_compare {a b} { set result {} set A {} dict for {f v} $a { set f [string trim $f :/] if {$f eq {.}} continue dict set A $f $v } set B {} dict for {f v} $b { set f [string trim $f :/] if {$f eq {.}} continue dict set B $f $v } dict for {f v} $A { if {[dict exists $B $f]} { if {[dict get $B $f] ne $v} { lappend result [list B $f [dict get $B $f] [list != $v]] } } else { lappend result [list B $f $v missing] } } dict for {f v} $B { if {![dict exists $A $f]} { lappend result [list A $f $v missing] } } return $result } test dict-compare-001 {Test our testing method} { dict_compare {} {} } {} test dict-compare-002 {Test our testing method} { dict_compare {a 1} {} } {{B a 1 missing}} test dict-compare-003 {Test our testing method} { dict_compare {a 1 b 2} {a 1 b 2} } {} test dict-compare-003.a {Test our testing method} { dict_compare {a 1 b 2} {b 2 a 1 } } {} test dict-compare-003.b {Test our testing method} { dict_compare {b 2 a 1} {a 1 b 2} } {} test dict-compare-004 {Test our testing method} { dict_compare {a: 1 b: 2} {a 1 b 2} } {} test dict-compare-005 {Test our testing method} { dict_compare {a 1 b 3} {a 1 b 2} } {{B b 2 {!= 3}}} ### # Test canonical mapping ### test {test-storage-0001} {Test ::clay::tree::storage with foo bar baz} { clay::tree::storage {foo bar baz} } {foo bar baz} test {test-storage-0002} {Test ::clay::tree::storage with foo bar baz/} { clay::tree::storage {foo bar baz/} } {foo bar baz} test {test-storage-0003} {Test ::clay::tree::storage with foo bar .} { clay::tree::storage {foo bar .} } {foo bar .} test {test-storage-0004} {Test ::clay::tree::storage with foo/ bar/ .} { clay::tree::storage {foo/ bar/ .} } {foo bar .} test {test-storage-0005} {Test ::clay::tree::storage with foo . bar . baz .} { clay::tree::storage {foo . bar . baz .} } {foo . bar . baz .} test {test-storage-0006} {Test ::clay::tree::storage with foo bar baz bat:} { clay::tree::storage {foo bar baz bat:} } {foo bar baz bat:} test {test-storage-0007} {Test ::clay::tree::storage with foo:} { clay::tree::storage {foo:} } {foo:} test {test-storage-0008} {Test ::clay::tree::storage with foo/bar/baz/bat:} { clay::tree::storage {foo/bar/baz/bat:} } {foo bar baz bat:} dict set r foo/ bar/ baz 1 dict set s foo/ bar/ baz 0 set t [clay::tree::merge $r $s] test rmerge-0001 {Test that the root is marked as a branch} { dict get $t foo bar baz } 0 set r [dict create] clay::tree::dictmerge r { foo/ { bar/ { baz 1 bing: 2 bang { bim 3 boom 4 } womp: {a 1 b 2} } } } test dictmerge-0001 {Test that the root is marked as a branch} { dict exists $r . } 1 test dictmerge-0002 {Test that branch foo is marked correctly} { dict exists $r foo . } 1 test dictmerge-0003 {Test that branch bar is marked correctly} { dict exists $r foo bar . } 1 test dictmerge-0004 {Test that leaf foo/bar/bang is not marked as branch despite being a dict} { dict exists $r foo bar bang . } 0 test dictmerge-0004 {Test that leaf foo/bar/bang/bim exists} { dict exists $r foo bar bang bim } 1 test dictmerge-0005 {Test that leaf foo/bar/bang/boom exists} { dict exists $r foo bar bang boom } 1 ### # Replace bang with bang/ ### clay::tree::dictmerge r { foo/ { bar/ { bang/ { whoop 1 } } } } test dictmerge-0006 {Test that leaf foo/bar/bang/bim ceases to exist} { dict exists $r foo bar bang bim } 0 test dictmerge-0007 {Test that leaf foo/bar/bang/boom exists} { dict exists $r foo bar bang boom } 0 test dictmerge-0008 {Test that leaf foo/bar/bang is now a branch} { dict exists $r foo bar bang . } 1 test branch-0001 {Test that foo/ is a branch} { clay::tree::is_branch $r foo/ } 1 test branch-0002 {Test that foo is a branch} { clay::tree::is_branch $r foo } 1 test branch-0003 {Test that foo/bar/ is a branch} { clay::tree::is_branch $r {foo/ bar/} } 1 test branch-0004 {Test that foo bar is not branch} { clay::tree::is_branch $r {foo bar} } 1 test branch-0004 {Test that foo/ bar is not branch} { clay::tree::is_branch $r {foo/ bar} } 0 test {test-branch-0001} {Test that foo is_branch = 1} { clay::tree::is_branch $r { foo} } 1 test {test-branch-0002} {Test that foo: is_branch = 0} { clay::tree::is_branch $r { foo:} } 0 test {test-branch-0003} {Test that foo/ is_branch = 1} { clay::tree::is_branch $r { foo/} } 1 test {test-branch-0004} {Test that .foo is_branch = 0} { clay::tree::is_branch $r { .foo} } 0 test {test-branch-0005} {Test that foo bar is_branch = 1} { clay::tree::is_branch $r {foo bar} } 1 test {test-branch-0006} {Test that foo bar: is_branch = 0} { clay::tree::is_branch $r {foo bar:} } 0 test {test-branch-0007} {Test that foo bar/ is_branch = 1} { clay::tree::is_branch $r {foo bar/} } 1 test {test-branch-0008} {Test that foo .bar is_branch = 0} { clay::tree::is_branch $r {foo .bar} } 0 test {test-branch-0009} {Test that foo bar baz is_branch = 0} { clay::tree::is_branch $r {foo bar baz} } 0 test {test-branch-0010} {Test that foo bar baz: is_branch = 0} { clay::tree::is_branch $r {foo bar baz:} } 0 test {test-branch-0011} {Test that foo bar baz/ is_branch = 1} { clay::tree::is_branch $r {foo bar baz/} } 1 test {test-branch-0012} {Test that foo bar .baz is_branch = 0} { clay::tree::is_branch $r {foo bar .baz} } 0 test {test-branch-0013} {Test that foo bar bing is_branch = 0} { clay::tree::is_branch $r {foo bar bing} } 0 test {test-branch-0014} {Test that foo bar bing: is_branch = 0} { clay::tree::is_branch $r {foo bar bing:} } 0 test {test-branch-0015} {Test that foo bar bing/ is_branch = 1} { clay::tree::is_branch $r {foo bar bing/} } 1 test {test-branch-0016} {Test that foo bar .bing is_branch = 0} { clay::tree::is_branch $r {foo bar .bing} } 0 test {test-branch-0017} {Test that foo bar bang is_branch = 1} { clay::tree::is_branch $r {foo bar bang} } 1 test {test-branch-0018} {Test that foo bar bang: is_branch = 0} { clay::tree::is_branch $r {foo bar bang:} } 0 test {test-branch-0019} {Test that foo bar bang/ is_branch = 1} { clay::tree::is_branch $r {foo bar bang/} } 1 test {test-branch-0020} {Test that foo bar .bang is_branch = 0} { clay::tree::is_branch $r {foo bar .bang} } 0 test {test-branch-0021} {Test that foo bar bang whoop is_branch = 0} { clay::tree::is_branch $r {foo bar bang whoop} } 0 test {test-branch-0022} {Test that foo bar bang whoop: is_branch = 0} { clay::tree::is_branch $r {foo bar bang whoop:} } 0 test {test-branch-0023} {Test that foo bar bang whoop/ is_branch = 1} { clay::tree::is_branch $r {foo bar bang whoop/} } 1 test {test-branch-0024} {Test that foo bar bang .whoop is_branch = 0} { clay::tree::is_branch $r {foo bar bang .whoop} } 0 # ------------------------------------------------------------------------- # dictmerge Testing - oometa unset -nocomplain foo clay::tree::dictmerge foo { option/ { color/ { label Color default green } } } clay::tree::dictmerge foo { option/ { color/ { default purple } } } test oometa-0001 {Invoking dictmerge with empty args on a non existent variable create an empty variable} { dict get $foo option color default } purple test oometa-0002 {Invoking dictmerge with empty args on a non existent variable create an empty variable} { dict get $foo option color label } Color unset -nocomplain foo set foo {. {}} ::clay::tree::dictmerge foo {. {} color {. {} default green label Color}} ::clay::tree::dictmerge foo {. {} color {. {} default purple}} test oometa-0003 {Recursive merge problem from oometa/clay find} { dict get $foo color default } purple test oometa-0004 {Recursive merge problem from oometa/clay find} { dict get $foo color label } Color unset -nocomplain foo set foo {. {}} ::clay::tree::dictmerge foo {. {} color {. {} default purple}} ::clay::tree::dictmerge foo {. {} color {. {} default green label Color}} test oometa-0005 {Recursive merge problem from oometa/clay find} { dict get $foo color default } green test oometa-0006 {Recursive merge problem from oometa/clay find} { dict get $foo color label } Color test oometa-0008 {Un-Sanitized output} { set foo } {. {} color {. {} default green label Color}} test oometa-0009 {Sanitize} { clay::tree::sanitize $foo } {color {default green label Color}} # ------------------------------------------------------------------------- # dictmerge Testing - clay unset -nocomplain foo test clay-0001 {Invoking dictmerge with empty args on a non existent variable create an empty variable} { ::clay::tree::dictmerge foo set foo } {. {}} unset -nocomplain foo ::clay::tree::dictset foo bar/ baz/ bell bang test clay-0002 {For new entries dictmerge is essentially a set} { dict get $foo bar baz bell } {bang} ::clay::tree::dictset foo bar/ baz/ boom/ bang test clay-0003 {For entries that do exist a zipper merge is performed} { dict get $foo bar baz bell } {bang} test clay-0004 {For entries that do exist a zipper merge is performed} { dict get $foo bar baz boom } {bang} ::clay::tree::dictset foo bar/ baz/ bop {color green flavor strawberry} test clay-0005 {Leaves are replaced even if they look like a dict} { dict get $foo bar baz bop } {color green flavor strawberry} ::clay::tree::dictset foo bar/ baz/ bop {color yellow} test clay-0006 {Leaves are replaced even if they look like a dict} { dict get $foo bar baz bop } {color yellow} ::clay::tree::dictset foo bar/ baz/ bang/ {color green flavor strawberry} test clay-0007a {Branches are merged} { dict get $foo bar baz bang } {. {} color green flavor strawberry} ::clay::tree::dictset foo bar/ baz/ bang/ color yellow test clay-0007b {Branches are merged} { dict get $foo bar baz bang } {. {} color yellow flavor strawberry} ::clay::tree::dictset foo bar/ baz/ bang/ {color blue} test clay-0007c {Branches are merged} { dict get $foo bar baz bang } {. {} color blue flavor strawberry} ::clay::tree::dictset foo bar/ baz/ bang/ shape: {Sort of round} test clay-0007d {Branches are merged} { dict get $foo bar baz bang } {. {} color blue flavor strawberry shape: {Sort of round}} ::clay::tree::dictset foo bar/ baz/ bang/ color yellow test clay-0007e {Branches are merged} { dict get $foo bar baz bang } {. {} color yellow flavor strawberry shape: {Sort of round}} ::clay::tree::dictset foo bar/ baz/ bang/ {color blue} test clay-0007f {Branches are merged} { dict get $foo bar baz bang } {. {} color blue flavor strawberry shape: {Sort of round}} ::clay::tree::dictset foo dict my_var 10 ::clay::tree::dictset foo dict my_other_var 9 test clay-0007g {Branches are merged} { dict get $foo dict } {. {} my_var 10 my_other_var 9} ::clay::tree::dictset foo dict/ my_other_other_var 8 test clay-0007h {Branches are merged} { dict get $foo dict } {. {} my_var 10 my_other_var 9 my_other_other_var 8} ::clay::tree::dictmerge foo {option/ {color {type color} flavor {sense taste}}} ::clay::tree::dictmerge foo {option/ {format {default ascii}}} test clay-0008 {Whole dicts are merged} { dict get $foo option color } {type color} test clay-0009 {Whole dicts are merged} { dict get $foo option flavor } {sense taste} test clay-0010 {Whole dicts are merged} { dict get $foo option format } {default ascii} ### # Tests for the httpd module ### test clay-0010 {Test that leaves are merged properly} set bar {} ::clay::tree::dictmerge bar { proxy/ {port 10101 host myhost.localhost} } ::clay::tree::dictmerge bar { mimetxt {Host: localhost Content_Type: text/plain Content-Length: 15 } http {HTTP_HOST {} CONTENT_LENGTH 15 HOST localhost CONTENT_TYPE text/plain UUID 3a7b4cdc-28d7-49b7-b18d-9d7d18382b9e REMOTE_ADDR 127.0.0.1 REMOTE_HOST 127.0.0.1 REQUEST_METHOD POST REQUEST_URI /echo REQUEST_PATH echo REQUEST_VERSION 1.0 DOCUMENT_ROOT {} QUERY_STRING {} REQUEST_RAW {POST /echo HTTP/1.0} SERVER_PORT 10001 SERVER_NAME 127.0.0.1 SERVER_PROTOCOL HTTP/1.1 SERVER_SOFTWARE {TclHttpd 4.2.0} LOCALHOST 0} UUID 3a7b4cdc-28d7-49b7-b18d-9d7d18382b9e uriinfo {fragment {} port {} path echo scheme http host {} query {} pbare 0 pwd {} user {}} mixin {reply ::test::content.echo} prefix /echo proxy_port 10010 proxy/ {host localhost} } test clay-0011 {Whole dicts are merged} { dict get $bar proxy_port } {10010} test clay-0012 {Whole dicts are merged} { dict get $bar http CONTENT_LENGTH } 15 test clay-0013 {Whole dicts are merged} { dict get $bar proxy host } localhost test clay-0014 {Whole dicts are merged} { dict get $bar proxy port } 10101 ### # Dialect Testing ### ::clay::dialect::create ::alpha proc ::alpha::define::is_alpha {} { dict set ::testinfo([current_class]) is_alpha 1 } ::alpha::define ::alpha::object { is_alpha } ::clay::dialect::create ::bravo ::alpha proc ::bravo::define::is_bravo {} { dict set ::testinfo([current_class]) is_bravo 1 } ::bravo::define ::bravo::object { is_bravo } ::clay::dialect::create ::charlie ::bravo proc ::charlie::define::is_charlie {} { dict set ::testinfo([current_class]) is_charlie 1 } ::charlie::define ::charlie::object { is_charlie } ::clay::dialect::create ::delta ::charlie proc ::delta::define::is_delta {} { dict set ::testinfo([current_class]) is_delta 1 } ::delta::define ::delta::object { is_delta } ::delta::class create adam { is_alpha is_bravo is_charlie is_delta } test oodialect-keyword-001 {Testing keyword application} { set ::testinfo(::adam) } {is_alpha 1 is_bravo 1 is_charlie 1 is_delta 1} test oodialect-keyword-002 {Testing keyword application} { set ::testinfo(::alpha::object) } {is_alpha 1} test oodialect-keyword-003 {Testing keyword application} { set ::testinfo(::bravo::object) } {is_bravo 1} test oodialect-keyword-004 {Testing keyword application} { set ::testinfo(::charlie::object) } {is_charlie 1} test oodialect-keyword-005 {Testing keyword application} { set ::testinfo(::delta::object) } {is_delta 1} ### # Declare an object from a namespace ### namespace eval ::test1 { ::alpha::class create a { aliases A is_alpha } ::alpha::define b { aliases B BEE is_alpha } ::alpha::class create ::c { aliases C is_alpha } ::alpha::define ::d { aliases D is_alpha } } test oodialect-naming-001 {Testing keyword application} { set ::testinfo(::test1::a) } {is_alpha 1} test oodialect-naming-002 {Testing keyword application} { set ::testinfo(::test1::b) } {is_alpha 1} test oodialect-naming-003 {Testing keyword application} { set ::testinfo(::c) } {is_alpha 1} test oodialect-naming-004 {Testing keyword application} { set ::testinfo(::d) } {is_alpha 1} test oodialect-aliasing-001 {Testing keyword application} { namespace eval ::test1 { ::alpha::define e { superclass A } } } ::test1::e test oodialect-aliasing-002 {Testing keyword application} { namespace eval ::test1 { ::bravo::define f { superclass A } } } ::test1::f test oodialect-aliasing-003 {Testing aliase method on class} { ::test1::a aliases } {::test1::A} ### # Test modified 2018-10-21 ### test oodialect-ancestry-003 {Testing heritage} { ::clay::ancestors ::test1::f } {} ### # Test modified 2018-10-21 ### test oodialect-ancestry-004 {Testing heritage} { ::clay::ancestors ::alpha::object } {} ### # Test modified 2018-10-21 ### test oodialect-ancestry-005 {Testing heritage} { ::clay::ancestors ::delta::object } {} # ------------------------------------------------------------------------- # clay submodule testing # ------------------------------------------------------------------------- # Test canonical path building set path {const/ foo/ bar/ baz/} test oo-clay-path-0001 "Test path: const foo bar baz" { ::clay::path const foo bar baz } $path test oo-clay-path-0002 "Test path: const/ foo/ bar/ baz" { ::clay::path const/ foo/ bar/ baz } $path test oo-clay-path-0003 "Test path: const/foo/bar/baz" { ::clay::path const/foo/bar/baz } $path test oo-clay-path-0004 "Test path: const/foo bar/baz" { ::clay::path const/foo bar/baz } $path test oo-clay-path-0005 "Test path: const/foo/bar baz" { ::clay::path const/foo/bar baz } $path test oo-clay-path-0006 "Test path: const foo/bar/baz" { ::clay::path const foo/bar/baz } $path test oo-clay-path-0007 "Test path: const foo bar/baz" { ::clay::path const foo bar/baz } $path test oo-clay-path-0008 "Test path: const/foo bar baz" { ::clay::path const/foo bar baz } $path set path {const/ foo/ bar/ baz/ bing} test oo-clay-leaf-0001 "Test leaf: const foo bar baz bing" { ::clay::leaf const foo bar baz bing } $path test oo-clay-leaf-0002 "Test leaf: const/ foo/ bar/ baz/ bing" { ::clay::leaf const/ foo/ bar/ baz/ bing } $path test oo-clay-leaf-0003 "Test leaf: const/foo/bar/baz/bing" { ::clay::leaf const/foo/bar/baz/bing } $path test oo-clay-leaf-0004 "Test leaf: const/foo bar/baz/bing:" { ::clay::leaf const/foo bar/baz/bing: } $path test oo-clay-leaf-0005 "Test leaf: const/foo/bar baz bing" { ::clay::leaf const/foo/bar baz bing } $path test oo-clay-leaf-0006 "Test leaf: const/foo/bar baz bing:" { ::clay::leaf const/foo/bar baz bing: } $path test oo-clay-leaf-0007 "Test leaf: const foo/bar/baz/bing" { ::clay::leaf const foo/bar/baz/bing } $path test oo-clay-leaf-0008 "Test leaf: const foo bar/baz/bing" { ::clay::leaf const foo bar/baz/bing } $path test oo-clay-leaf-0009 "Test leaf: const/foo bar baz bing" { ::clay::leaf const/foo bar baz bing } $path namespace eval ::foo {} clay::define ::foo::classa { clay set const color blue clay set const/flavor strawberry clay set {const/ sound} zoink clay set info/ { animal no building no subelement {pedantic yes} } } test oo-class-clay-method-0001 "Test ::foo::classa const/ color exists" { ::foo::classa clay exists const/ color } 1 test oo-class-clay-method-0001 "Test ::foo::classa const/ color value" { ::foo::classa clay get const/ color } {blue} test oo-class-clay-method-0003 "Test ::foo::classa const/ flavor exists" { ::foo::classa clay exists const/ flavor } 1 test oo-class-clay-method-0003 "Test ::foo::classa const/ flavor value" { ::foo::classa clay get const/ flavor } {strawberry} test oo-class-clay-method-0005 "Test ::foo::classa const/ sound exists" { ::foo::classa clay exists const/ sound } 1 test oo-class-clay-method-0005 "Test ::foo::classa const/ sound value" { ::foo::classa clay get const/ sound } {zoink} test oo-class-clay-method-0007 "Test ::foo::classa info/ animal exists" { ::foo::classa clay exists info/ animal } 1 test oo-class-clay-method-0007 "Test ::foo::classa info/ animal value" { ::foo::classa clay get info/ animal } {no} test oo-class-clay-method-0009 "Test ::foo::classa info/ building exists" { ::foo::classa clay exists info/ building } 1 test oo-class-clay-method-0009 "Test ::foo::classa info/ building value" { ::foo::classa clay get info/ building } {no} test oo-class-clay-method-0011 "Test ::foo::classa info/ subelement exists" { ::foo::classa clay exists info/ subelement } 1 test oo-class-clay-method-0011 "Test ::foo::classa info/ subelement value" { ::foo::classa clay get info/ subelement } {pedantic yes} clay::define ::foo::classb { clay set const/ color black clay set const/ flavor vanilla clay set const/ feeling dread clay set info/ subelement {spoon yes} } test oo-class-clay-method-0013 "Test ::foo::classb const/ color exists" { ::foo::classb clay exists const/ color } 1 test oo-class-clay-method-0013 "Test ::foo::classb const/ color value" { ::foo::classb clay get const/ color } {black} test oo-class-clay-method-0015 "Test ::foo::classb const/ flavor exists" { ::foo::classb clay exists const/ flavor } 1 test oo-class-clay-method-0015 "Test ::foo::classb const/ flavor value" { ::foo::classb clay get const/ flavor } {vanilla} test oo-class-clay-method-0017 "Test ::foo::classb const/ feeling exists" { ::foo::classb clay exists const/ feeling } 1 test oo-class-clay-method-0017 "Test ::foo::classb const/ feeling value" { ::foo::classb clay get const/ feeling } {dread} test oo-class-clay-method-0019 "Test ::foo::classb info/ subelement exists" { ::foo::classb clay exists info/ subelement } 1 test oo-class-clay-method-0019 "Test ::foo::classb info/ subelement value" { ::foo::classb clay get info/ subelement } {spoon yes} clay::define ::foo::class.ab { superclass ::foo::classb ::foo::classa } clay::define ::foo::class.ba { superclass ::foo::classa ::foo::classb } # ------------------------------------------------------------------------- # OBJECT of ::foo::classa set OBJECTA [::foo::classa new] ### # Test object degation ### proc ::foo::fakeobject {a b} { return [expr {$a + $b}] } ::clay::object create TEST TEST clay delegate funct ::foo::fakeobject test oo-object-delegate-001 {Test object delegation} { ::TEST clay delegate } {<class> ::clay::object <funct> ::foo::fakeobject} test oo-object-delegate-002 {Test object delegation} { ::TEST clay delegate funct } {::foo::fakeobject} test oo-object-delegate-002a {Test object delegation} { ::TEST clay delegate <funct> } {::foo::fakeobject} test oo-object-delegate-003 {Test object delegation} { ::TEST <funct> 1 1 } {2} test oo-object-delegate-004 {Test object delegation} { ::TEST <funct> 10 -7 } {3} # Replace the function out from under proc ::foo::fakeobject {a b} { return [expr {$a * $b}] } test oo-object-delegate-005 {Test object delegation} { ::TEST <funct> 10 -7 } {-70} # Object with ::foo::classa mixed in set MIXINA [::oo::object new] oo::objdefine $MIXINA mixin ::foo::classa test oo-object-clay-method-native-0001 {Test native object gets the property const//color} { $OBJECTA clay get const/ color } {blue} test oo-object-clay-method-mixin-0001 {Test mixin object gets the property const//color} { $MIXINA clay get const/ color } {blue} test oo-object-clay-method-native-0002 {Test native object gets the property const//flavor} { $OBJECTA clay get const/ flavor } {strawberry} test oo-object-clay-method-mixin-0002 {Test mixin object gets the property const//flavor} { $MIXINA clay get const/ flavor } {strawberry} test oo-object-clay-method-native-0003 {Test native object gets the property const//sound} { $OBJECTA clay get const/ sound } {zoink} test oo-object-clay-method-mixin-0003 {Test mixin object gets the property const//sound} { $MIXINA clay get const/ sound } {zoink} test oo-object-clay-method-native-0004 {Test native object gets the property info//animal} { $OBJECTA clay get info/ animal } {no} test oo-object-clay-method-mixin-0004 {Test mixin object gets the property info//animal} { $MIXINA clay get info/ animal } {no} test oo-object-clay-method-native-0005 {Test native object gets the property info//building} { $OBJECTA clay get info/ building } {no} test oo-object-clay-method-mixin-0005 {Test mixin object gets the property info//building} { $MIXINA clay get info/ building } {no} test oo-object-clay-method-native-0006 {Test native object gets the property info//subelement} { $OBJECTA clay get info/ subelement } {pedantic yes} test oo-object-clay-method-mixin-0006 {Test mixin object gets the property info//subelement} { $MIXINA clay get info/ subelement } {pedantic yes} # ------------------------------------------------------------------------- # OBJECT of ::foo::classb set OBJECTB [::foo::classb new] # Object with ::foo::classb mixed in set MIXINB [::oo::object new] oo::objdefine $MIXINB mixin ::foo::classb test oo-object-clay-method-native-0007 {Test native object gets the property const//color} { $OBJECTB clay get const/ color } {black} test oo-object-clay-method-mixin-0007 {Test mixin object gets the property const//color} { $MIXINB clay get const/ color } {black} test oo-object-clay-method-native-0008 {Test native object gets the property const//flavor} { $OBJECTB clay get const/ flavor } {vanilla} test oo-object-clay-method-mixin-0008 {Test mixin object gets the property const//flavor} { $MIXINB clay get const/ flavor } {vanilla} test oo-object-clay-method-native-0009 {Test native object gets the property const//feeling} { $OBJECTB clay get const/ feeling } {dread} test oo-object-clay-method-mixin-0009 {Test mixin object gets the property const//feeling} { $MIXINB clay get const/ feeling } {dread} test oo-object-clay-method-native-0010 {Test native object gets the property info//subelement} { $OBJECTB clay get info/ subelement } {spoon yes} test oo-object-clay-method-mixin-0010 {Test mixin object gets the property info//subelement} { $MIXINB clay get info/ subelement } {spoon yes} # ------------------------------------------------------------------------- # OBJECT descended from ::foo::classa ::foo::classb set OBJECTAB [::foo::class.ab new] # Object where classes were mixed in ::foo::classa ::foo::classb set MIXINAB [::oo::object new] # Test modified 2018-10-30, mixin order was wrong before oo::objdefine $MIXINAB mixin ::foo::classb ::foo::classa test oo-object-clay-method-native-0011 {Test native object gets the property const//color} { $OBJECTAB clay get const/ color } {black} test oo-object-clay-method-mixin-0011 {Test mixin object gets the property const//color} { $MIXINAB clay get const/ color } {black} test oo-object-clay-method-native-0012 {Test native object gets the property const//flavor} { $OBJECTAB clay get const/ flavor } {vanilla} test oo-object-clay-method-mixin-0012 {Test mixin object gets the property const//flavor} { $MIXINAB clay get const/ flavor } {vanilla} test oo-object-clay-method-native-0013 {Test native object gets the property const//feeling} { $OBJECTAB clay get const/ feeling } {dread} test oo-object-clay-method-mixin-0013 {Test mixin object gets the property const//feeling} { $MIXINAB clay get const/ feeling } {dread} test oo-object-clay-method-native-0014 {Test native object gets the property const//sound} { $OBJECTAB clay get const/ sound } {zoink} test oo-object-clay-method-mixin-0014 {Test mixin object gets the property const//sound} { $MIXINAB clay get const/ sound } {zoink} test oo-object-clay-method-native-0015 {Test native object gets the property info//subelement} { $OBJECTAB clay get info/ subelement } {spoon yes} test oo-object-clay-method-mixin-0015 {Test mixin object gets the property info//subelement} { $MIXINAB clay get info/ subelement } {spoon yes} test oo-object-clay-method-native-0016 {Test native object gets the property info//animal} { $OBJECTAB clay get info/ animal } {no} test oo-object-clay-method-mixin-0016 {Test mixin object gets the property info//animal} { $MIXINAB clay get info/ animal } {no} test oo-object-clay-method-native-0017 {Test native object gets the property info//building} { $OBJECTAB clay get info/ building } {no} test oo-object-clay-method-mixin-0017 {Test mixin object gets the property info//building} { $MIXINAB clay get info/ building } {no} # ------------------------------------------------------------------------- # OBJECT descended from ::foo::classb ::foo::classa set OBJECTBA [::foo::class.ba new] # Object where classes were mixed in ::foo::classb ::foo::classa set MIXINBA [::oo::object new] # Test modified 2018-10-30, mixin order was wrong before oo::objdefine $MIXINBA mixin ::foo::classa ::foo::classb test oo-object-clay-method-native-0018 {Test native object gets the property} { $OBJECTBA clay get const/ color } {blue} test oo-object-clay-method-mixin-0018 {Test mixin object gets the property} { $MIXINBA clay get const/ color } {blue} test oo-object-clay-method-native-0019 {Test native object gets the property} { $OBJECTBA clay get const/ flavor } {strawberry} test oo-object-clay-method-mixin-0019 {Test mixin object gets the property} { $MIXINBA clay get const/ flavor } {strawberry} test oo-object-clay-method-native-0020 {Test native object gets the property} { $OBJECTBA clay get const/ sound } {zoink} test oo-object-clay-method-mixin-0020 {Test mixin object gets the property} { $MIXINBA clay get const/ sound } {zoink} test oo-object-clay-method-native-0021 {Test native object gets the property} { $OBJECTBA clay get const/ feeling } {dread} test oo-object-clay-method-mixin-0021 {Test mixin object gets the property} { $MIXINBA clay get const/ feeling } {dread} test oo-object-clay-method-native-0022 {Test native object gets the property} { $OBJECTBA clay get info/ animal } {no} test oo-object-clay-method-mixin-0022 {Test mixin object gets the property} { $MIXINBA clay get info/ animal } {no} test oo-object-clay-method-native-0023 {Test native object gets the property} { $OBJECTBA clay get info/ building } {no} test oo-object-clay-method-mixin-0023 {Test mixin object gets the property} { $MIXINBA clay get info/ building } {no} test oo-object-clay-method-native-0024 {Test native object gets the property} { $OBJECTBA clay get info/ subelement } {pedantic yes} test oo-object-clay-method-mixin-0024 {Test mixin object gets the property} { $MIXINBA clay get info/ subelement } {pedantic yes} ### # put a do-nothing constructor on the books ### ::clay::define ::clay::object { constructor args {} } oo::objdefine ::clay::object method foo args { return bar } test clay-core-method-0001 {Test that adding methods to the core ::clay::object class works} { ::clay::object foo } {bar} namespace eval ::TEST {} ::clay::define ::TEST::myclass { clay color red clay flavor strawberry } ### # Test adding a clay property ### test clay-class-clay-0001 {Test that a clay statement is recorded in the object of the class} { ::TEST::myclass clay get color } red test clay-class-clay-0002 {Test that a clay statement is recorded in the object of the class} { ::TEST::myclass clay get flavor } strawberry ### # Test that objects of the class get the same properties ### set OBJ [::clay::object new {}] set OBJ2 [::TEST::myclass new {}] test clay-object-clay-a-0001 {Test that objects not thee class do not get properties} { $OBJ clay get color } {} test clay-object-clay-a-0002 {Test that objects not thee class do not get properties} { $OBJ clay get flavor } {} test clay-object-clay-a-0003 {Test that objects of the class get properties} { $OBJ2 clay get color } red test clay-object-clay-a-0004 {Test that objects of the class get properties} { $OBJ2 clay get flavor } strawberry ### # Test modified 2018-10-21 ### test clay-object-clay-a-0005 {Test the clay ancestors function} { $OBJ clay ancestors } {::clay::object} ### # Test modified 2018-10-21 ### test clay-object-clay-a-0006 {Test the clay ancestors function} { $OBJ2 clay ancestors } {::TEST::myclass ::clay::object} test clay-object-clay-a-0007 {Test the clay provenance function} { $OBJ2 clay provenance flavor } ::TEST::myclass ### # Test that object local setting override the class ### test clay-object-clay-a-0008 {Test that object local setting override the class} { $OBJ2 clay set color purple $OBJ2 clay get color } purple test clay-object-clay-a-0009 {Test that object local setting override the class} { $OBJ2 clay provenance color } self ::clay::define ::TEST::myclasse { superclass ::TEST::myclass clay color blue method do args { return "I did $args" } Ensemble which::color {} { return [my clay get color] } clay set method_ensemble which color aliases farbe } ### # Test clay information is passed town to subclasses ### test clay-class-clay-0003 {Test that a clay statement is recorded in the object of the class} { ::TEST::myclasse clay get color } blue test clay-class-clay-0004 {Test that clay statements from the ancestors of this class are not present (we handle them seperately in objects)} { ::TEST::myclasse clay get flavor } {} test clay-class-clay-0005 {Test that clay statements from the ancestors of this class are found with the FIND method} { ::TEST::myclasse clay find flavor } {strawberry} ### # Test that properties reach objects ### set OBJ3 [::TEST::myclasse new {}] test clay-object-clay-b-0001 {Test that objects of the class get properties} { $OBJ3 clay get color } blue test clay-object-clay-b-0002 {Test the clay provenance function} { $OBJ3 clay provenance color } ::TEST::myclasse test clay-object-clay-b-0003 {Test that objects of the class get properties} { $OBJ3 clay get flavor } strawberry test clay-object-clay-b-0004 {Test the clay provenance function} { $OBJ3 clay provenance flavor } ::TEST::myclass ### # Test modified 2018-10-21 ### test clay-object-clay-b-0005 {Test the clay provenance function} { $OBJ3 clay ancestors } {::TEST::myclasse ::TEST::myclass ::clay::object} ### # Test defining a standard method ### test clay-object-method-0001 {Test and standard method} { $OBJ3 do this really cool thing } {I did this really cool thing} test clay-object-method-0003 {Test an ensemble} { $OBJ3 which color } blue # Test setting properties test clay-object-method-0004 {Test an ensemble} { $OBJ3 clay set color black $OBJ3 which color } black # Test setting properties test clay-object-method-0004 {Test an ensemble alias} { $OBJ3 which farbe } black ### # Test that if you try to replace a global command you get an error ### test clay-nspace-0001 {Test that if you try to replace a global command you get an error} -body { ::clay::define open { method bar {} { return foo } } } -returnCodes {error} -result "::open does not refer to an object" ::clay::define fubar { method bar {} { return foo } } test clay-nspace-0002 {Test a non qualified class ends up in the current namespace} { info commands ::fubar } {::fubar} namespace eval ::cluster { ::clay::define fubar { method bar {} { return foo } } ::clay::define ::clay::pot { method bar {} { return foo } } } test clay-nspace-0003 {Test a non qualified class ends up in the current namespace} { info commands ::cluster::fubar } {::cluster::fubar} test clay-nspace-0003 {Test a fully qualified class ends up in the proper namespace} { info commands ::clay::pot } {::clay::pot} #set ::clay::trace 3 ### # Mixin tests ### ### # Define a core class ### ::clay::define ::TEST::thing { method do args { return "I did $args" } } ::clay::define ::TEST::vegetable { clay color unknown clay flavor unknown Ensemble which::flavor {} { return [my clay get flavor] } Ensemble which::color {} { return [my clay get color] } } ::clay::define ::TEST::animal { clay color unknown clay sound unknown Ensemble which::sound {} { return [my clay get sound] } Ensemble which::color {} { return [my clay get color] } } ::clay::define ::TEST::species.cat { superclass ::TEST::animal clay sound meow } ::clay::define ::TEST::coloring.calico { clay color calico } ::clay::define ::TEST::condition.dark { Ensemble which::color {} { return grey } } ::clay::define ::TEST::mood.happy { Ensemble which::sound {} { return purr } } test clay-object-0001 {Test than an object is created when clay::define is invoked} { info commands ::TEST::mood.happy } ::TEST::mood.happy set OBJ [::TEST::thing new] test clay-mixin-a-0001 {Test that prior to a mixin an ensemble doesn't exist} -body { $OBJ which color } -returnCodes error -result {unknown method "which": must be clay, destroy or do} test clay-mixin-a-0002 {Test and standard method from an ancestor} { $OBJ do this really cool thing } {I did this really cool thing} $OBJ clay mixinmap species ::TEST::animal test clay-mixin-b-0001 {Test that an ensemble is created during a mixin} { $OBJ which color } {unknown} test clay-mixin-b-0002 {Test that an ensemble is created during a mixin} { $OBJ which sound } {unknown} test clay-mixin-b-0003 {Test that an ensemble is created during a mixin} -body {$OBJ which flavor} -returnCodes {error} -result {unknown method which flavor. Valid: color sound} ### # Test Modified: 2018-10-21 ### test clay-mixin-b-0004 {Test that mixins resolve in the correct order} { $OBJ clay ancestors } {::TEST::animal ::TEST::thing ::clay::object} ### # Replacing a mixin replaces the behaviors ### $OBJ clay mixinmap species ::TEST::vegetable test clay-mixin-c-0001 {Test that an ensemble is created during a mixin} { $OBJ which color } {unknown} test clay-mixin-c-0002 {Test that an ensemble is created during a mixin} -body {$OBJ which sound} -returnCodes {error} -result {unknown method which sound. Valid: color flavor} test clay-mixin-c-0003 {Test that an ensemble is created during a mixin} { $OBJ which flavor } {unknown} ### # Test Modified: 2018-10-21 ### test clay-mixin-c-0004 {Test that mixins resolve in the correct order} { $OBJ clay ancestors } {::TEST::vegetable ::TEST::thing ::clay::object} ### # Replacing a mixin $OBJ clay mixinmap species ::TEST::species.cat test clay-mixin-e-0001 {Test that an ensemble is created during a mixin} { $OBJ which color } {unknown} test clay-mixin-e-0002 {Test that an ensemble is created during a mixin} { $OBJ which sound } {meow} test clay-mixin-e-0003 {Test that an ensemble is created during a mixin} -body {$OBJ which flavor} -returnCodes {error} -result {unknown method which flavor. Valid: color sound} ### # Test Modified: 2018-10-30, 2018-10-21, 2018-10-10 ### test clay-mixin-e-0004 {Test that clay data follows the rules of inheritence and order of mixin} { $OBJ clay ancestors } {::TEST::species.cat ::TEST::animal ::TEST::thing ::clay::object} $OBJ clay mixinmap coloring ::TEST::coloring.calico test clay-mixin-f-0001 {Test that an ensemble is created during a mixin} { $OBJ which color } {calico} test clay-mixin-f-0002 {Test that an ensemble is created during a mixin} { $OBJ which sound } {meow} test clay-mixin-f-0003 {Test that an ensemble is created during a mixin} -body {$OBJ which flavor} -returnCodes {error} -result {unknown method which flavor. Valid: color sound} ### # Test modified 2018-10-30, 2018-10-21, 2018-10-10 ### test clay-mixin-f-0004 {Test that clay data follows the rules of inheritence and order of mixin} { $OBJ clay ancestors } {::TEST::coloring.calico ::TEST::species.cat ::TEST::animal ::TEST::thing ::clay::object} test clay-mixin-f-0005 {Test that clay data from a mixin works} { $OBJ clay provenance color } {::TEST::coloring.calico} ### # Test variable initialization ### ::clay::define ::TEST::has_var { Variable my_variable 10 method get_my_variable {} { my variable my_variable return $my_variable } } set OBJ [::TEST::has_var new] test clay-class-variable-0001 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay get variable/ my_variable } {10} # Modified 2018-10-30 (order is different) test clay-class-variable-0002 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay get variable } {my_variable 10 DestroyEvent 0} # Modified 2018-10-30 (order is different) test clay-class-variable-0003 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay dget variable } {. {} my_variable 10 DestroyEvent 0} test clay-class-variable-0004 {Test that variables declared in the class definition are initialized} { $OBJ get_my_variable } 10 ### # Test array initialization ### ::clay::define ::TEST::has_array { Array my_array {timeout 10} method get_my_array {field} { my variable my_array return $my_array($field) } } set OBJ [::TEST::has_array new] test clay-class-array-0001 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay get array } {my_array {timeout 10}} test clay-class-array-0002 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay dget array } {. {} my_array {. {} timeout 10}} test clay-class-array-0003 {Test that variables declared in the class definition are initialized} { $OBJ get_my_array timeout } 10 ::clay::define ::TEST::has_more_array { superclass ::TEST::has_array Array my_array {color blue} } test clay-class-array-0008 {Test that the parser injected the right value in the right place for clay to catch it} { ::TEST::has_more_array clay get array } {my_array {color blue}} test clay-class-array-0009 {Test that the parser injected the right value in the right place for clay to catch it} { ::TEST::has_more_array clay find array } {my_array {timeout 10 color blue}} # Modified 2018-10-30 (order is different) set BOBJ [::TEST::has_more_array new] test clay-class-array-0004 {Test that the parser injected the right value in the right place for clay to catch it} { $BOBJ clay get array } {my_array {color blue timeout 10}} # Modified 2018-10-30 (order is different) test clay-class-array-0005 {Test that the parser injected the right value in the right place for clay to catch it} { $BOBJ clay dget array } {. {} my_array {. {} color blue timeout 10}} test clay-class-arrau-0006 {Test that variables declared in the class definition are initialized} { $BOBJ get_my_array timeout } 10 test clay-class-arrau-0007 {Test that variables declared in the class definition are initialized} { $BOBJ get_my_array color } blue ::clay::define ::TEST::has_empty_array { Array my_array {} method my_array_exists {} { my variable my_array return [info exists my_array] } method get {field} { my variable my_array return $my_array($field) } method set {field value} { my variable my_array set my_array($field) $value } } test clay-class-array-0008 {Test that an declaration of an array with no values produces and empty array} { set COBJ [::TEST::has_empty_array new] $COBJ my_array_exists } 1 test clay-class-array-0009 {Test that an declaration of an array with no values produces and empty array} { $COBJ set test "A random value" $COBJ get test } {A random value} ### # Test dict initialization ### ::clay::define ::TEST::has_dict { Dict my_dict {timeout 10} method get_my_dict {args} { my variable my_dict if {[llength $args]==0} { return $my_dict } return [dict get $my_dict {*}$args] } } set OBJ [::TEST::has_dict new] test clay-class-dict-0001 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay get dict } {my_dict {timeout 10}} test clay-class-dict-0002 {Test that the parser injected the right value in the right place for clay to catch it} { $OBJ clay dget dict } {. {} my_dict {. {} timeout 10}} test clay-class-dict-0003 {Test that variables declared in the class definition are initialized} { $OBJ get_my_dict timeout } 10 test clay-class-dict-0004 {Test that an empty dict is annotated} { $OBJ clay get dict } {my_dict {timeout 10}} ::clay::define ::TEST::has_more_dict { superclass ::TEST::has_dict Dict my_dict {color blue} } set BOBJ [::TEST::has_more_dict new] # Modified 2018-10-30 test clay-class-dict-0004 {Test that the parser injected the right value in the right place for clay to catch it} { $BOBJ clay get dict } {my_dict {color blue timeout 10}} # Modified 2018-10-30 test clay-class-dict-0005 {Test that the parser injected the right value in the right place for clay to catch it} { $BOBJ clay dget dict } {. {} my_dict {. {} color blue timeout 10}} test clay-class-dict-0006 {Test that variables declared in the class definition are initialized} { $BOBJ get_my_dict timeout } 10 test clay-class-dict-0007 {Test that variables declared in the class definition are initialized} { $BOBJ get_my_dict color } blue ::clay::define ::TEST::has_empty_dict { Dict my_empty_dict {} method get_my_empty_dict {args} { my variable my_empty_dict if {[llength $args]==0} { return $my_empty_dict } return [dict get $my_empty_dict {*}$args] } } set COBJ [::TEST::has_empty_dict new] test clay-class-dict-0008 {Test that the parser injected the right value in the right place for clay to catch it} { $COBJ clay dget dict } {my_empty_dict {. {}}} test clay-class-dict-0009 {Test that an empty dict is initialized} { $COBJ get_my_empty_dict } {} ### # Test object delegation ### ::clay::define ::TEST::organelle { method add args { set total 0 foreach item $args { set total [expr {$total+$item}] } return $total } } ::clay::define ::TEST::master { constructor {} { set mysub [namespace current]::sub ::TEST::organelle create $mysub my clay delegate sub $mysub } } set OBJ [::TEST::master new] ### # Test that delegation is working ### test clay-delegation-0001 {Test an array driven ensemble} { $OBJ <sub> add 5 5 } 10 ### # Test the Ensemble keyword ### ::clay::define ::TEST::with_ensemble { Ensemble myensemble {pattern args} { set ensemble [self method] set emap [my clay ensemble_map $ensemble] set mlist [dict keys $emap [string tolower $pattern]] if {[llength $mlist] != 1} { error "Couldn't figure out what to do with $pattern" } set method [lindex $mlist 0] set arglist [dict get $emap $method arglist] set body [dict get $emap $method body] if {$arglist ni {args {}}} { ::clay::dynamic_arguments $ensemble $method [list $arglist] {*}$args } eval $body } Ensemble myensemble::go args { return 1 } } ::clay::define ::TEST::with_ensemble.dance { Ensemble myensemble::dance args { return 1 } } ::clay::define ::TEST::with_ensemble.cannot_dance { Ensemble myensemble::dance args { return 0 } } set OBJA [::clay::object new] set OBJB [::clay::object new] $OBJA clay mixinmap core ::TEST::with_ensemble friends ::TEST::with_ensemble.dance $OBJB clay mixinmap core ::TEST::with_ensemble friends ::TEST::with_ensemble.cannot_dance # Test go test clay-dynamic-ensemble-0001 {Test ensemble with static method} { $OBJA myensemble go } {1} test clay-dynamic-ensemble-0002 {Test ensemble with static method} { $OBJB myensemble go } {1} # Test dance test clay-dynamic-ensemble-0003 {Test ensemble with static method} { $OBJA myensemble dance } {1} test clay-dynamic-ensemble-0004 {Test ensemble with static method} { $OBJB myensemble dance } {0} ### # Class method testing ### clay::class create WidgetClass { Class_Method working {} { return {Works} } Class_Method unknown args { set tkpath [lindex $args 0] if {[string index $tkpath 0] eq "."} { set obj [my new $tkpath {*}[lrange $args 1 end]] $obj tkalias $tkpath return $tkpath } next {*}$args } constructor {TkPath args} { my variable hull set hull $TkPath my clay delegate hull $TkPath } method tkalias tkname { set oldname $tkname my variable tkalias set tkalias $tkname set self [self] set hullwidget [::info object namespace $self]::tkwidget my clay delegate tkwidget $hullwidget #rename ::$tkalias $hullwidget my clay delegate hullwidget $hullwidget #::tool::object_rename [self] ::$tkalias rename [self] ::$tkalias #my Hull_Bind $tkname return $hullwidget } } test tool-class-method-000 {Test that class methods actually work...} { WidgetClass working } {Works} test tool-class-method-001 {Test Tk style creator} { WidgetClass .foo .foo clay delegate hull } {.foo} ::clay::define WidgetNewClass { superclass WidgetClass } test tool-class-method-002 {Test Tk style creator inherited by morph} { WidgetNewClass .bar .bar clay delegate hull } {.bar} ### # Test ensemble inheritence ### clay::define NestedClassA { Ensemble do::family {} { return NestedClassA } Ensemble do::something {} { return A } Ensemble do::whop {} { return A } } clay::define NestedClassB { superclass NestedClassA Ensemble do::family {} { set r [next family] lappend r NestedClassB return $r } Ensemble do::whop {} { return B } } clay::define NestedClassC { superclass NestedClassB Ensemble do::somethingelse {} { return C } } clay::define NestedClassD { superclass NestedClassB Ensemble do::somethingelse {} { return D } } clay::define NestedClassE { superclass NestedClassD NestedClassC } clay::define NestedClassF { superclass NestedClassC NestedClassD } NestedClassC create NestedObjectC ### # These tests no longer work because method ensembles are now dynamically # generated by object, that are not attached to the class anymore # #### #test tool-ensemble-001 {Test that an ensemble can access [next] even if no object of the ancestor class have been instantiated} { # NestedObjectC do family #} {::NestedClassA ::NestedClassB ::NestedClassC} test tool-ensemble-002 {Test that a later ensemble definition trumps a more primitive one} { NestedObjectC do whop } {B} test tool-ensemble-003 {Test that an ensemble definitions in an ancestor carry over} { NestedObjectC do something } {A} NestedClassE create NestedObjectE NestedClassF create NestedObjectF test tool-ensemble-004 {Test that ensembles follow the same rules for inheritance as methods} { NestedObjectE do somethingelse } {D} test tool-ensemble-005 {Test that ensembles follow the same rules for inheritance as methods} { NestedObjectF do somethingelse } {C} ### # Set of tests to exercise the mixinmap system ### clay::define MixinMainClass { Variable mainvar unchanged Ensemble test::which {} { my variable mainvar return $mainvar } Ensemble test::main args { puts [list this is main $method $args] } } set mixoutscript {my test untool $class} set mixinscript {my test tool $class} clay::define MixinTool { Variable toolvar unchanged.mixin clay set mixin/ unmap-script $mixoutscript clay set mixin/ map-script $mixinscript clay set mixin/ name {Generic Tool} Ensemble test::untool class { my variable toolvar mainvar set mainvar {} set toolvar {} } Ensemble test::tool class { my variable toolvar mainvar set mainvar [$class clay get mixin name] set toolvar [$class clay get mixin name] } } clay::define MixinToolA { superclass MixinTool clay set mixin/ name {Tool A} } clay::define MixinToolB { superclass MixinTool clay set mixin/ name {Tool B} method test_newfunc {} { return "B" } } test tool-mixinspec-001 {Test application of mixin specs} { MixinTool clay get mixin map-script } $mixinscript test tool-mixinspec-002 {Test application of mixin specs} { MixinToolA clay get mixin map-script } {} test tool-mixinspec-003 {Test application of mixin specs} { MixinToolA clay find mixin map-script } $mixinscript test tool-mixinspec-004 {Test application of mixin specs} { MixinToolB clay find mixin map-script } $mixinscript MixinMainClass create mixintest test tool-mixinmap-001 {Test object prior to mixins} { mixintest test which } {unchanged} mixintest clay mixinmap tool MixinToolA test tool-mixinmap-002 {Test mixin map script ran} { mixintest test which } {Tool A} mixintest clay mixinmap tool MixinToolB test tool-mixinmap-003 {Test mixin map script ran} { mixintest test which } {Tool B} test tool-mixinmap-003 {Test mixin map script ran} { mixintest test_newfunc } {B} mixintest clay mixinmap tool {} test tool-mixinmap-004 {Test object prior to mixins} { mixintest test which } {} clay::define ::clay::object { method path {} { return [self class] } } clay::define ::MixinRoot { clay set opts core root clay set opts option unset clay set opts color unset Ensemble info::root {} { return MixinRoot } Ensemble info::shade {} { return avacodo } Ensemble info::default {} { return Undefined } method did {} { return MixinRoot } method path {} { return [list [self class] {*}[next]] } } clay::define ::MixinOption1 { clay set opts option option1 Ensemble info::option {} { return MixinOption1 } Ensemble info::other {} { return MixinOption1 } method did {} { return MixinOption1 } method path {} { return [list [self class] {*}[next]] } } clay::define ::MixinOption2 { superclass ::MixinOption1 clay set opts option option2 Ensemble info::option {} { return MixinOption2 } method did {} { return MixinOption2 } method path {} { return [list [self class] {*}[next]] } } clay::define ::MixinColor1 { clay set opts color blue Ensemble info::color {} { return MixinColor1 } Ensemble info::shade {} { return blue } method did {} { return MixinColor1 } method path {} { return [list [self class] {*}[next]] } } clay::define ::MixinColor2 { clay set opts color green Ensemble info::color {} { return MixinColor2 } Ensemble info::shade {} { return green } method did {} { return MixinColor2 } method path {} { return [list [self class] {*}[next]] } } set obj [clay::object new] $obj clay mixinmap root ::MixinRoot test tool-prototype-0001-0001 {Mixin core} { $obj info root } {MixinRoot} test tool-prototype-0001-0002 {Mixin core} { $obj info option } {Undefined} test tool-prototype-0001-0003 {Mixin core} { $obj info color } {Undefined} test tool-prototype-0001-0004 {Mixin core} { $obj info other } {Undefined} test tool-prototype-0001-0005 {Mixin core} { $obj info shade } {avacodo} test tool-prototype-0001-0006 {Mixin core} { $obj did } {MixinRoot} test tool-prototype-0001-0007 {Mixin core} { $obj path } {::MixinRoot ::clay::object} test tool-prototype-0001-0008 {Mixin core} { $obj clay get opts } {core root option unset color unset} test tool-prototype-0001-0009 {Mixin core} { $obj clay get opts core } {root} test tool-prototype-0001-0010 {Mixin core} { $obj clay get opts option } {unset} test tool-prototype-0001-0011 {Mixin core} { $obj clay get opts color } {unset} test tool-prototype-0001-0012 {Mixin core} { $obj clay ancestors } {::MixinRoot ::clay::object} $obj clay mixinmap option ::MixinOption1 test tool-prototype-0002-0001 {Mixin option1} { $obj info root } {MixinRoot} test tool-prototype-0002-0002 {Mixin option1} { $obj info option } {MixinOption1} test tool-prototype-0002-0003 {Mixin option1} { $obj info color } {Undefined} test tool-prototype-0002-0004 {Mixin option1} { $obj info other } {MixinOption1} test tool-prototype-0002-0005 {Mixin option1} { $obj info shade } {avacodo} test tool-prototype-0002-0006 {Mixin option1} { $obj did } {MixinOption1} test tool-prototype-0002-0007 {Mixin option1} { $obj path } {::MixinOption1 ::MixinRoot ::clay::object} test tool-prototype-0002-0008 {Mixin option1} { $obj clay get opts } {option option1 core root color unset} test tool-prototype-0002-0009 {Mixin option1} { $obj clay get opts core } {root} test tool-prototype-0002-0010 {Mixin option1} { $obj clay get opts option } {option1} test tool-prototype-0002-0011 {Mixin option1} { $obj clay get opts color } {unset} test tool-prototype-0002-0012 {Mixin option1} { $obj clay ancestors } {::MixinOption1 ::MixinRoot ::clay::object} set obj2 [clay::object new] $obj2 clay mixinmap root ::MixinRoot option ::MixinOption1 $obj clay mixinmap option ::MixinOption1 test tool-prototype-0003-0001 {Mixin option1 - clean object} { $obj2 info root } {MixinRoot} test tool-prototype-0003-0002 {Mixin option1 - clean object} { $obj2 info option } {MixinOption1} test tool-prototype-0003-0003 {Mixin option1 - clean object} { $obj2 info color } {Undefined} test tool-prototype-0003-0004 {Mixin option1 - clean object} { $obj2 info other } {MixinOption1} test tool-prototype-0003-0005 {Mixin option1 - clean object} { $obj2 info shade } {avacodo} test tool-prototype-0003-0006 {Mixin option1 - clean object} { $obj2 did } {MixinOption1} test tool-prototype-0003-0007 {Mixin option1 - clean object} { $obj2 path } {::MixinOption1 ::MixinRoot ::clay::object} test tool-prototype-0003-0008 {Mixin option1 - clean object} { $obj2 clay get opts } {option option1 core root color unset} test tool-prototype-0003-0009 {Mixin option1 - clean object} { $obj2 clay get opts core } {root} test tool-prototype-0003-0010 {Mixin option1 - clean object} { $obj2 clay get opts option } {option1} test tool-prototype-0003-0011 {Mixin option1 - clean object} { $obj2 clay get opts color } {unset} test tool-prototype-0003-0012 {Mixin option1 - clean object} { $obj2 clay ancestors } {::MixinOption1 ::MixinRoot ::clay::object} $obj clay mixinmap option ::MixinOption2 test tool-prototype-0004-0001 {Mixin option2} { $obj info root } {MixinRoot} test tool-prototype-0004-0002 {Mixin option2} { $obj info option } {MixinOption2} test tool-prototype-0004-0003 {Mixin option2} { $obj info color } {Undefined} test tool-prototype-0004-0004 {Mixin option2} { $obj info other } {MixinOption1} test tool-prototype-0004-0005 {Mixin option2} { $obj info shade } {avacodo} test tool-prototype-0004-0006 {Mixin option2} { $obj did } {MixinOption2} test tool-prototype-0004-0007 {Mixin option2} { $obj path } {::MixinOption2 ::MixinOption1 ::MixinRoot ::clay::object} test tool-prototype-0004-0008 {Mixin option2} { $obj clay get opts } {option option2 core root color unset} test tool-prototype-0004-0009 {Mixin option2} { $obj clay get opts core } {root} test tool-prototype-0004-0010 {Mixin option2} { $obj clay get opts option } {option2} test tool-prototype-0004-0011 {Mixin option2} { $obj clay get opts color } {unset} test tool-prototype-0004-0012 {Mixin option2} { $obj clay ancestors } {::MixinOption2 ::MixinOption1 ::MixinRoot ::clay::object} $obj clay mixinmap color MixinColor1 test tool-prototype-0005-0001 {Mixin color1} { $obj info root } {MixinRoot} test tool-prototype-0005-0002 {Mixin color1} { $obj info option } {MixinOption2} test tool-prototype-0005-0003 {Mixin color1} { $obj info color } {MixinColor1} test tool-prototype-0005-0004 {Mixin color1} { $obj info other } {MixinOption1} test tool-prototype-0005-0005 {Mixin color1} { $obj info shade } {blue} test tool-prototype-0005-0006 {Mixin color1} { $obj did } {MixinColor1} test tool-prototype-0005-0007 {Mixin color1} { $obj path } {::MixinColor1 ::MixinOption2 ::MixinOption1 ::MixinRoot ::clay::object} test tool-prototype-0005-0008 {Mixin color1} { $obj clay get opts } {color blue option option2 core root} test tool-prototype-0005-0009 {Mixin color1} { $obj clay get opts core } {root} test tool-prototype-0005-0010 {Mixin color1} { $obj clay get opts option } {option2} test tool-prototype-0005-0011 {Mixin color1} { $obj clay get opts color } {blue} test tool-prototype-0005-0012 {Mixin color1} { $obj clay ancestors } {::MixinColor1 ::MixinOption2 ::MixinOption1 ::MixinRoot ::clay::object} $obj clay mixinmap color MixinColor2 test tool-prototype-0006-0001 {Mixin color2} { $obj info root } {MixinRoot} test tool-prototype-0006-0002 {Mixin color2} { $obj info option } {MixinOption2} test tool-prototype-0006-0003 {Mixin color2} { $obj info color } {MixinColor2} test tool-prototype-0006-0004 {Mixin color2} { $obj info other } {MixinOption1} test tool-prototype-0006-0005 {Mixin color2} { $obj info shade } {green} test tool-prototype-0006-0006 {Mixin color2} { $obj clay get opts } {color green option option2 core root} test tool-prototype-0006-0007 {Mixin color2} { $obj clay get opts core } {root} test tool-prototype-0006-0008 {Mixin color2} { $obj clay get opts option } {option2} test tool-prototype-0006-0009 {Mixin color2} { $obj clay get opts color } {green} test tool-prototype-0006-0010 {Mixin color2} { $obj clay ancestors } {::MixinColor2 ::MixinOption2 ::MixinOption1 ::MixinRoot ::clay::object} $obj clay mixinmap option MixinOption1 test tool-prototype-0007-0001 {Mixin color2 + Option1} { $obj info root } {MixinRoot} test tool-prototype-0007-0002 {Mixin color2 + Option1} { $obj info option } {MixinOption1} test tool-prototype-0007-0003 {Mixin color2 + Option1} { $obj info color } {MixinColor2} test tool-prototype-0007-0004 {Mixin color2 + Option1} { $obj info other } {MixinOption1} test tool-prototype-0007-0005 {Mixin color2 + Option1} { $obj info shade } {green} test tool-prototype-0007-0006 {Mixin color2 + Option1} { $obj clay get opts } {color green option option1 core root} test tool-prototype-0007-0007 {Mixin color2 + Option1} { $obj clay get opts core } {root} test tool-prototype-0007-0008 {Mixin color2 + Option1} { $obj clay get opts option } {option1} test tool-prototype-0007-0009 {Mixin color2 + Option1} { $obj clay get opts color } {green} test tool-prototype-0007-0010 {Mixin color2 + Option1} { $obj clay ancestors } {::MixinColor2 ::MixinOption1 ::MixinRoot ::clay::object} $obj clay mixinmap option {} test tool-prototype-0008-0001 {Mixin color2 + no option} { $obj info root } {MixinRoot} test tool-prototype-0008-0002 {Mixin color2 + no option} { $obj info option } {Undefined} test tool-prototype-0008-0003 {Mixin color2 + no option} { $obj info color } {MixinColor2} test tool-prototype-0008-0004 {Mixin color2 + no option} { $obj info other } {Undefined} test tool-prototype-0008-0005 {Mixin color2 + no option} { $obj info shade } {green} test tool-prototype-0008-0006 {Mixin color2 + no option} { $obj clay get opts } {color green core root option unset} test tool-prototype-0008-0007 {Mixin color2 + no option} { $obj clay get opts core } {root} test tool-prototype-0008-0008 {Mixin color2 + no option} { $obj clay get opts option } {unset} test tool-prototype-0008-0009 {Mixin color2 + no option} { $obj clay get opts color } {green} test tool-prototype-0008-0010 {Mixin color2 + no option} { $obj clay ancestors } {::MixinColor2 ::MixinRoot ::clay::object} $obj clay mixinmap color {} test tool-prototype-0009-0001 {Mixin core (return to normal)} { $obj info root } {MixinRoot} test tool-prototype-0009-0002 {Mixin core (return to normal)} { $obj info option } {Undefined} test tool-prototype-0009-0003 {Mixin core (return to normal)} { $obj info color } {Undefined} test tool-prototype-0009-0004 {Mixin core (return to normal)} { $obj info other } {Undefined} test tool-prototype-0009-0005 {Mixin core (return to normal)} { $obj info shade } {avacodo} test tool-prototype-0009-0006 {Mixin core (return to normal)} { $obj clay get opts } {core root option unset color unset} test tool-prototype-0009-0007 {Mixin core (return to normal)} { $obj clay get opts core } {root} test tool-prototype-0009-0008 {Mixin core (return to normal)} { $obj clay get opts option } {unset} test tool-prototype-0009-0009 {Mixin core (return to normal)} { $obj clay get opts color } {unset} test tool-prototype-0009-0010 {Mixin core (return to normal)} { $obj clay ancestors } {::MixinRoot ::clay::object} testsuiteCleanup # Local variables: # mode: tcl # indent-tabs-mode: nil # End: if {![package vsatisfies [package provide Tcl] 8.7]} {return} puts "Repeating tests with 8.7 features" namespace eval ::oo::dialect {} set ::oo::dialect::has(tip470) 1 # clay.test - Copyright (c) 2018 Sean Woods # ------------------------------------------------------------------------- set MODDIR [file dirname [file dirname [file join [pwd] [info script]]]] if {[file exists [file join $MODDIR devtools testutilities.tcl]]} { # Running inside tcllib |
︙ | ︙ |
Changes to modules/nettool/build/build.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 | set srcdir [file dirname [file normalize [file join [pwd] [info script]]]] set moddir [file dirname $srcdir] set version 0.5.2 set tclversion 8.5 set module [file tail $moddir] dict set map %module% $module dict set map %version% $version dict set map %tclversion% $tclversion dict set map { } {} dict set map "\t" { } | > > > > > > > > > > > > | 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 | set srcdir [file dirname [file normalize [file join [pwd] [info script]]]] set moddir [file dirname $srcdir] set version 0.5.2 set tclversion 8.5 set module [file tail $moddir] proc ::ladd {varname args} { upvar 1 $varname var if ![info exists var] { set var {} } foreach item $args { if {$item in $var} continue lappend var $item } return $var } dict set map %module% $module dict set map %version% $version dict set map %tclversion% $tclversion dict set map { } {} dict set map "\t" { } |
︙ | ︙ |