Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch tool Excluding Merge-Ins
This is equivalent to a diff from 7ee3399c6e to 64f22bd586
2018-11-17
| ||
17:00 | Pulling in tool snapshot from the tool support branch check-in: c515d11a3d user: hypnotoad tags: hypnotoad | |
16:58 | Starting a branch to develop a version of tool that is new-version-of-tcllib proof, to support IRM, with a snapshot in time embedded version of cron, oodialect, dicttool, and oometa. Closed-Leaf check-in: 64f22bd586 user: hypnotoad tags: tool | |
2018-08-28
| ||
14:12 | Pulling changes from trunk check-in: c057f36dc1 user: hypnotoad tags: hypnotoad | |
2018-07-18
| ||
15:03 | Updates to the clay module check-in: 7ee3399c6e user: hypnotoad tags: hypnotoad | |
2018-07-13
| ||
19:01 | Updating a bit in httpd's implementation that used to rely on access to a private variable. Added a binary encode around the grab of raw random data on unix to prevent Tcl from trying to interpret the string. check-in: 3ee985049d user: hypnotoad tags: hypnotoad | |
Changes to modules/cron/cron.tcl.
1 2 3 4 5 6 7 8 9 | ### # This file implements a process table # Instead of having individual components try to maintain their own timers # we centrally manage how often tasks should be kicked off here. ### # # Author: Sean Woods (for T&E Solutions) package require Tcl 8.6 ;# See coroutine package require coroutine | | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | ### # This file implements a process table # Instead of having individual components try to maintain their own timers # we centrally manage how often tasks should be kicked off here. ### # # Author: Sean Woods (for T&E Solutions) package require Tcl 8.6 ;# See coroutine package require coroutine package provide cron 2.1.1 ::namespace eval ::cron {} proc ::cron::task {command args} { if {$::cron::trace > 1} { puts [list ::cron::task $command $args] } variable processTable |
︙ | ︙ | |||
397 398 399 400 401 402 403 | foreach task $tasks { dict set processTable($task) lastrun $now if {[dict exists processTable($task) foreground] && [dict set processTable($task) foreground]} continue if {[dict exists processTable($task) running] && [dict set processTable($task) running]} continue if {$::cron::trace > 2} { puts [list RUNNING $task [task info $task]] } | | > > > > | > > > > | 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 | foreach task $tasks { dict set processTable($task) lastrun $now if {[dict exists processTable($task) foreground] && [dict set processTable($task) foreground]} continue if {[dict exists processTable($task) running] && [dict set processTable($task) running]} continue if {$::cron::trace > 2} { puts [list RUNNING $task [task info $task]] } if {[dict exists $processTable($task) coroutine]} { set coro [dict get $processTable($task) coroutine] } else { set coro {} } dict set processTable($task) running 1 if {[dict exists $processTable($task) command]} { set command [dict get $processTable($task) command] } else { set command {} } if {$command eq {} && $coro eq {}} { # Task has nothing to do. Slot it for destruction lappend cancellist $task } elseif {$coro ne {}} { if {[info command $coro] eq {}} { set object [dict get $processTable($task) object] # Trigger coroutine again if a command was given |
︙ | ︙ | |||
611 612 613 614 615 616 617 | idle 0 wake 0 } } } ::cron::wake STARTUP | < | 621 622 623 624 625 626 627 628 | idle 0 wake 0 } } } ::cron::wake STARTUP |
Changes to modules/cron/cron.test.
︙ | ︙ | |||
12 13 14 15 16 17 18 | devtools testutilities.tcl] package require tcltest testsNeedTcl 8.6 testsNeedTcltest 1.0 support { | < | | 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 | devtools testutilities.tcl] package require tcltest testsNeedTcl 8.6 testsNeedTcltest 1.0 support { } testing { useLocal cron.tcl cron } ### # For the first part of our testing, control the clock # via the test harness ### set ::cron::trace 0 set ::cron::time [expr {[clock scan {2016-01-01}]*1000}] foreach {val testval} { 1000 1000 11235 11000 1241241 1241000 } { test cron-step-$val [list test clock_step function for $val] { ::cron::clock_step $val } $testval } proc test_elapsed_time {start target} { set now [::cron::current_time] set value [expr {$now-$start}] if {$value < ($target-5)} { puts "ELAPSED TIME WAS SHORT: $value / $target" |
︙ | ︙ | |||
210 211 212 213 214 215 216 | method exit_loop {} { my variable doloop set doloop 0 if {$::cron::trace} { puts [list [self] SIGNAL TO EXIT] } } | | | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | method exit_loop {} { my variable doloop set doloop 0 if {$::cron::trace} { puts [list [self] SIGNAL TO EXIT] } } method DoLoop {} { if {$::cron::trace} { puts "[self] CORO START" } my variable doloop set doloop 1 set ::TESTOBJ([self]) 0 |
︙ | ︙ | |||
358 359 360 361 362 363 364 | set delay [expr {($::my_coro_end - $::my_coro_start)}] if {$delay < 1000 || $delay > 2000} { puts "TIME DELAY OUT OF RANGE: $delay" return 1 } else { return 0 } | | | 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | set delay [expr {($::my_coro_end - $::my_coro_start)}] if {$delay < 1000 || $delay > 2000} { puts "TIME DELAY OUT OF RANGE: $delay" return 1 } else { return 0 } } 0 ### # Tests after this point test interactions with the Tcl event loop # We need to be slaved to the real time clock to work properly ### set ::cron::trace 0 |
︙ | ︙ |
Changes to modules/cron/pkgIndex.tcl.
1 | if {![package vsatisfies [package provide Tcl] 8.6]} {return} | | | 1 2 | if {![package vsatisfies [package provide Tcl] 8.6]} {return} package ifneeded cron 2.1.1 [list source [file join $dir cron.tcl]] |
Changes to modules/dicttool/dicttool.tcl.
︙ | ︙ | |||
24 25 26 27 28 29 30 | } foreach item [lsort -unique $args] { while {[set i [lsearch $var $item]]>=0} { set var [lreplace $var $i $i] } } return $var | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | } foreach item [lsort -unique $args] { while {[set i [lsearch $var $item]]>=0} { set var [lreplace $var $i $i] } } return $var } } if {[::info commands ::tcl::dict::getnull] eq {}} { proc ::tcl::dict::getnull {dictionary args} { if {[exists $dictionary {*}$args]} { get $dictionary {*}$args } |
︙ | ︙ | |||
57 58 59 60 61 62 63 | } else { ::append buffer \n "[::string repeat " " $indent]\{" ::incr indent 2 foreach {sf sv} $item { _putb buffer $indent $sf $sv } ::incr indent -2 | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | } else { ::append buffer \n "[::string repeat " " $indent]\{" ::incr indent 2 foreach {sf sv} $item { _putb buffer $indent $sf $sv } ::incr indent -2 ::append buffer \n "[::string repeat " " $indent]\}" } } err] { puts [list FAILED $indent $field $item] puts $err puts "$::errorInfo" } } |
︙ | ︙ | |||
86 87 88 89 90 91 92 | proc ::tcl::dict::print dict { ::set buffer {} ::foreach {field value} $dict { _putb buffer 0 $field $value } return $buffer } | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | proc ::tcl::dict::print dict { ::set buffer {} ::foreach {field value} $dict { _putb buffer 0 $field $value } return $buffer } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] print ::tcl::dict::print] } if {[::info commands ::tcl::dict::is_dict] eq {}} { ### # Test if element is a dict ### |
︙ | ︙ | |||
125 126 127 128 129 130 131 | # Element names that end in ":" are assumed to be literals set result $k $v } elseif { [dict exists $result $k] } { # key exists in a and b? let's see if both values are dicts # both are dicts, so merge the dicts if { [is_dict [get $result $k]] && [is_dict $v] } { set result $k [rmerge [get $result $k] $v] | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | # Element names that end in ":" are assumed to be literals set result $k $v } elseif { [dict exists $result $k] } { # key exists in a and b? let's see if both values are dicts # both are dicts, so merge the dicts if { [is_dict [get $result $k]] && [is_dict $v] } { set result $k [rmerge [get $result $k] $v] } else { set result $k $v } } else { set result $k $v } } } |
︙ | ︙ | |||
148 149 150 151 152 153 154 | if {![exists $dictionary {*}$args]} {return 1} return [expr {[get $dictionary {*}$args] in {{} NULL null}}] } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull] } | | | 148 149 150 151 152 153 154 155 | if {![exists $dictionary {*}$args]} {return 1} return [expr {[get $dictionary {*}$args] in {{} NULL null}}] } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull] } #package provide dicttool 1.1 |
Changes to modules/tool/build/build.tcl.
1 2 3 | set srcdir [file dirname [file normalize [file join [pwd] [info script]]]] set moddir [file dirname $srcdir] | | | 1 2 3 4 5 6 7 8 9 10 11 | set srcdir [file dirname [file normalize [file join [pwd] [info script]]]] set moddir [file dirname $srcdir] set version 0.7.1 set module [file tail $moddir] set fout [open [file join $moddir ${module}.tcl] w] dict set map %module% $module dict set map %version% $version puts $fout [string map $map {### |
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | # Track what files we have included so far set loaded {} lappend loaded build.tcl # These files must be loaded in a particular order foreach file { core.tcl uuid.tcl ensemble.tcl metaclass.tcl option.tcl event.tcl pipeline.tcl | > > > > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | # Track what files we have included so far set loaded {} lappend loaded build.tcl # These files must be loaded in a particular order foreach file { dicttool.tcl dialect.tcl oometa.tcl cron.tcl core.tcl uuid.tcl ensemble.tcl metaclass.tcl option.tcl event.tcl pipeline.tcl |
︙ | ︙ |
Changes to modules/tool/build/core.tcl.
1 | package require Tcl 8.6 ;# try in pipeline.tcl. Possibly other things. | | < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | package require Tcl 8.6 ;# try in pipeline.tcl. Possibly other things. package require coroutine package require TclOO package require sha1 #package require cron 2.0 #package require oo::dialect ::oo::dialect::create ::tool ::namespace eval ::tool {} set ::tool::trace 0 proc ::tool::script_path {} { set path [file dirname [file join [pwd] [info script]]] |
︙ | ︙ |
Added modules/tool/build/cron.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 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 | ### # This file implements a process table # Instead of having individual components try to maintain their own timers # we centrally manage how often tasks should be kicked off here. ### # # Author: Sean Woods (for T&E Solutions) ::namespace eval ::cron {} proc ::cron::task {command args} { if {$::cron::trace > 1} { puts [list ::cron::task $command $args] } variable processTable switch $command { TEMPLATE { return [list object {} lastevent 0 lastrun 0 err 0 result {} \ running 0 coroutine {} scheduled 0 frequency 0 command {}] } delete { unset -nocomplain ::cron::processTable([lindex $args 0]) } exists { return [::info exists ::cron::processTable([lindex $args 0])] } info { set process [lindex $args 0] if {![::info exists ::cron::processTable($process)]} { error "Process $process does not exist" } return $::cron::processTable($process) } frequency { set process [lindex $args 0] set time [lindex $args 1] if {![info exists ::cron::processTable($process)]} return dict with ::cron::processTable($process) { set now [clock_step [current_time]] set frequency [expr {0+$time}] if {$scheduled>($now+$time)} { dict set ::cron::processTable($process) scheduled [expr {$now+$time}] } } } sleep { set process [lindex $args 0] set time [lindex $args 1] if {![info exists ::cron::processTable($process)]} return dict with ::cron::processTable($process) { set now [clock_step [current_time]] set frequency 0 set scheduled [expr {$now+$time}] } } create - set { set process [lindex $args 0] if {![::info exists ::cron::processTable($process)]} { set ::cron::processTable($process) [task TEMPLATE] } if {[llength $args]==2} { foreach {field value} [lindex $args 1] { dict set ::cron::processTable($process) $field $value } } else { foreach {field value} [lrange $args 1 end] { dict set ::cron::processTable($process) $field $value } } } } } proc ::cron::at args { if {$::cron::trace > 1} { puts [list ::cron::at $args] } switch [llength $args] { 2 { variable processuid set process event#[incr processuid] lassign $args timecode command } 3 { lassign $args process timecode command } default { error "Usage: ?process? timecode command" } } variable processTable if {[string is integer -strict $timecode]} { set scheduled [expr {$timecode*1000}] } else { set scheduled [expr {[clock scan $timecode]*1000}] } ::cron::task set $process \ frequency -1 \ command $command \ scheduled $scheduled \ coroutine {} if {$::cron::trace > 1} { puts [list ::cron::task info $process - > [::cron::task info $process]] } ::cron::wake NEW return $process } proc ::cron::idle args { if {$::cron::trace > 1} { puts [list ::cron::idle $args] } switch [llength $args] { 2 { variable processuid set process event#[incr processuid] lassign $args command } 3 { lassign $args process command } default { error "Usage: ?process? timecode command" } } ::cron::task set $process \ scheduled 0 \ frequency 0 \ command $command ::cron::wake NEW return $process } proc ::cron::in args { if {$::cron::trace > 1} { puts [list ::cron::in $args] } switch [llength $args] { 2 { variable processuid set process event#[incr processuid] lassign $args timecode command } 3 { lassign $args process timecode command } default { error "Usage: ?process? timecode command" } } set now [clock_step [current_time]] set scheduled [expr {$timecode*1000+$now}] ::cron::task set $process \ frequency -1 \ command $command \ scheduled $scheduled ::cron::wake NEW return $process } proc ::cron::cancel {process} { if {$::cron::trace > 1} { puts [list ::cron::cancel $process] } ::cron::task delete $process } ### # topic: 0776dccd7e84530fa6412e507c02487c ### proc ::cron::every {process frequency command} { if {$::cron::trace > 1} { puts [list ::cron::every $process $frequency $command] } variable processTable set mnow [clock_step [current_time]] set frequency [expr {$frequency*1000}] ::cron::task set $process \ frequency $frequency \ command $command \ scheduled [expr {$mnow + $frequency}] ::cron::wake NEW } proc ::cron::object_coroutine {objname coroutine {info {}}} { if {$::cron::trace > 1} { puts [list ::cron::object_coroutine $objname $coroutine $info] } task set $coroutine \ {*}$info \ object $objname \ coroutine $coroutine return $coroutine } # Notification that an object has been destroyed, and that # it should give up any toys associated with events proc ::cron::object_destroy {objname} { if {$::cron::trace > 1} { puts [list ::cron::object_destroy $objname] } variable processTable set dat [array get processTable] foreach {process info} $dat { if {[dict exists $info object] && [dict get $info object] eq $objname} { unset -nocomplain processTable($process) } } } ### # topic: 97015814408714af539f35856f85bce6 ### proc ::cron::run process { variable processTable set mnow [clock_step [current_time]] if {[dict exists processTable($process) scheduled] && [dict exists processTable($process) scheduled]>0} { dict set processTable($process) scheduled [expr {$mnow-1000}] } else { dict set processTable($process) lastrun 0 } ::cron::wake PROCESS } proc ::cron::clock_step timecode { return [expr {$timecode-($timecode%1000)}] } proc ::cron::clock_delay {delay} { set now [current_time] set then [clock_step [expr {$delay+$now}]] return [expr {$then-$now}] } # Sleep for X seconds, wake up at the top proc ::cron::clock_sleep {{sec 1} {offset 0}} { set now [current_time] set delay [expr {[clock_delay [expr {$sec*1000}]]+$offset}] sleep $delay } proc ::cron::current_time {} { if {$::cron::time < 0} { return [clock milliseconds] } return $::cron::time } proc ::cron::clock_set newtime { variable time for {} {$time < $newtime} {incr time 100} { uplevel #0 {::cron::do_one_event CLOCK_ADVANCE} } set time $newtime uplevel #0 {::cron::do_one_event CLOCK_ADVANCE} } proc ::cron::once_in_a_while body { set script {set _eventid_ $::cron::current_event} append script $body # Add a safety to allow this while to only execute once per call append script {if {$_eventid_==$::cron::current_event} yield} uplevel 1 [list while 1 $script] } proc ::cron::sleep ms { if {$::cron::trace > 1} { puts [list ::cron::sleep $ms [info coroutine]] } set coro [info coroutine] # When the clock is being externally # controlled, advance the clock when # a sleep is called variable time if {$time >= 0 && $coro eq {}} { ::cron::clock_set [expr {$time+$ms}] return } if {$coro ne {}} { set mnow [current_time] set start $mnow set end [expr {$start+$ms}] set eventid $coro if {$::cron::trace} { puts "::cron::sleep $ms $coro" } # Mark as running task set $eventid scheduled $end coroutine $coro running 1 ::cron::wake WAKE_IN_CORO yield 2 while {$end >= $mnow} { if {$::cron::trace} { puts "::cron::sleep $ms $coro (loop)" } set mnow [current_time] yield 2 } # Mark as not running to resume idle computation task set $eventid running 0 if {$::cron::trace} { puts "/::cron::sleep $ms $coro" } } else { set eventid [incr ::cron::eventcount] set var ::cron::event_#$eventid set $var 0 if {$::cron::trace} { puts "::cron::sleep $ms $eventid waiting for $var" ::after $ms "set $var 1 ; puts \"::cron::sleep - $eventid - FIRED\"" } else { ::after $ms "set $var 1" } ::vwait $var if {$::cron::trace} { puts "/::cron::sleep $ms $eventid" } unset $var } } ### # topic: 21de7bb8db019f3a2fd5a6ae9b38fd55 # description: # Called once per second, and timed to ensure # we run in roughly realtime ### proc ::cron::runTasksCoro {} { ### # Do this forever ### variable processTable variable processing variable all_coroutines variable coroutine_object variable coroutine_busy variable nextevent variable current_event while 1 { incr current_event set lastevent 0 set now [current_time] # Wake me up in 5 minute intervals, just out of principle set nextevent [expr {$now-($now % 300000) + 300000}] set next_idle_event [expr {$now+250}] if {$::cron::trace > 1} { puts [list CRON TASK RUNNER nextevent $nextevent] } ### # Determine what tasks to run this timestep ### set tasks {} set cancellist {} set nexttask {} foreach {process} [lsort -dictionary [array names processTable]] { dict with processTable($process) { if {$::cron::trace > 1} { puts [list CRON TASK RUNNER process $process frequency: $frequency scheduled: $scheduled] } if {$scheduled==0 && $frequency==0} { set lastrun $now set lastevent $now lappend tasks $process } else { if { $scheduled <= $now } { lappend tasks $process if { $frequency < 0 } { lappend cancellist $process } elseif {$frequency==0} { set scheduled 0 if {$::cron::trace > 1} { puts [list CRON TASK RUNNER process $process demoted to idle] } } else { set scheduled [clock_step [expr {$frequency+$lastrun}]] if { $scheduled <= $now } { set scheduled [clock_step [expr {$frequency+$now}]] } if {$::cron::trace > 1} { puts [list CRON TASK RUNNER process $process rescheduled to $scheduled] } } set lastrun $now } set lastevent $now } } } foreach task $tasks { dict set processTable($task) lastrun $now if {[dict exists processTable($task) foreground] && [dict set processTable($task) foreground]} continue if {[dict exists processTable($task) running] && [dict set processTable($task) running]} continue if {$::cron::trace > 2} { puts [list RUNNING $task [task info $task]] } if {[dict exists $processTable($task) coroutine]} { set coro [dict get $processTable($task) coroutine] } else { set coro {} } dict set processTable($task) running 1 if {[dict exists $processTable($task) command]} { set command [dict get $processTable($task) command] } else { set command {} } if {$command eq {} && $coro eq {}} { # Task has nothing to do. Slot it for destruction lappend cancellist $task } elseif {$coro ne {}} { if {[info command $coro] eq {}} { set object [dict get $processTable($task) object] # Trigger coroutine again if a command was given # If this coroutine is associated with an object, ensure # the object still exists before invoking its method if {$command eq {} || ($object ne {} && [info command $object] eq {})} { lappend cancellist $task dict set processTable($task) running 0 continue } if {$::cron::trace} { puts [list RESTARTING $task - coroutine $coro - with $command] } ::coroutine $coro {*}$command } try $coro on return {} { # Terminate the coroutine lappend cancellist $task } on break {} { # Terminate the coroutine lappend cancellist $task } on error {errtxt errdat} { # Coroutine encountered an error lappend cancellist $task puts "ERROR $coro" set errorinfo [dict get $errdat -errorinfo] if {[info exists coroutine_object($coro)] && $coroutine_object($coro) ne {}} { catch { puts "OBJECT: $coroutine_object($coro)" puts "CLASS: [info object class $coroutine_object($coro)]" } } puts "$errtxt" puts *** puts $errorinfo } on continue {result opts} { # Ignore continue if { $result eq "done" } { lappend cancellist $task } } on ok {result opts} { if { $result eq "done" } { lappend cancellist $task } } } else { dict with processTable($task) { set err [catch {uplevel #0 $command} result errdat] if $err { puts "CRON TASK FAILURE:" puts "PROCESS: $task" puts $result puts *** puts [dict get $errdat -errorinfo] } } yield 0 } dict set processTable($task) running 0 } foreach {task} $cancellist { unset -nocomplain processTable($task) } foreach {process} [lsort -dictionary [array names processTable]] { set scheduled 0 set frequency 0 dict with processTable($process) { if {$scheduled==0 && $frequency==0} { if {$next_idle_event < $nextevent} { set nexttask $task set nextevent $next_idle_event } } elseif {$scheduled < $nextevent} { set nexttask $process set nextevent $scheduled } set lastevent $now } } foreach {eventid msec} [array get ::cron::coro_sleep] { if {$msec < 0} continue if {$msec<$nextevent} { set nexttask "CORO $eventid" set nextevent $scheduled } } set delay [expr {$nextevent-$now}] if {$delay <= 0} { yield 0 } else { if {$::cron::trace > 1} { puts "NEXT EVENT $delay - NEXT TASK $nexttask" } yield $delay } } } proc ::cron::wake {{who ???}} { ## # Only triggered by cron jobs kicking off other cron jobs within # the script body ## if {$::cron::trace} { puts "::cron::wake $who" } if {$::cron::busy} { return } after cancel $::cron::next_event set ::cron::next_event [after idle [list ::cron::do_one_event $who]] } proc ::cron::do_one_event {{who ???}} { if {$::cron::trace} { puts "::cron::do_one_event $who" } after cancel $::cron::next_event set now [current_time] set ::cron::busy 1 while {$::cron::busy} { if {[info command ::cron::COROUTINE] eq {}} { ::coroutine ::cron::COROUTINE ::cron::runTasksCoro } set cron_delay [::cron::COROUTINE] if {$cron_delay==0} { if {[incr loops]>10} { if {$::cron::trace} { puts "Breaking out of 10 recursive loops" } set ::cron::wake_time 1000 break } set ::cron::wake_time 0 incr ::cron::loops(active) } else { set ::cron::busy 0 incr ::cron::loops(idle) } } ### # Try to get the event to fire off on the border of the # nearest second ### if {$cron_delay < 10} { set cron_delay 250 } set ctime [current_time] set next [expr {$ctime+$cron_delay}] set ::cron::wake_time [expr {$next/1000}] if {$::cron::trace} { puts [list EVENT LOOP WILL WAKE IN $cron_delay ms next: [clock format $::cron::wake_time -format "%H:%M:%S"] active: $::cron::loops(active) idle: $::cron::loops(idle) woken_by: $who] } set ::cron::next_event [after $cron_delay {::cron::do_one_event TIMER}] } proc ::cron::main {} { # Never launch from a coroutine if {[info coroutine] ne {}} { return } set ::cron::forever 1 while {$::cron::forever} { ::after 120000 {set ::cron::forever 1} # Call an update just to give the rest of the event loop a chance incr ::cron::loops(main) ::after cancel $::cron::next_event set ::cron::next_event [::after idle {::cron::wake MAIN}] set ::cron::forever 1 set ::cron::busy 0 ::vwait ::cron::forever if {$::cron::trace} { puts "MAIN LOOP CYCLE $::cron::loops(main)" } } } ### # topic: 4a891d0caabc6e25fbec9514ea8104dd # description: # This file implements a process table # Instead of having individual components try to maintain their own timers # we centrally manage how often tasks should be kicked off here. ### namespace eval ::cron { variable lastcall 0 variable processTable variable busy 0 variable next_event {} variable trace 0 variable current_event variable time -1 if {![info exists current_event]} { set current_event 0 } if {![info exists ::cron::loops]} { array set ::cron::loops { active 0 main 0 idle 0 wake 0 } } } ::cron::wake STARTUP |
Added modules/tool/build/dialect.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 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 | ### # oodialect.tcl # # Copyright (c) 2015-2018 Sean Woods # Copyright (c) 2015 Donald K Fellows # # BSD License ### # @@ Meta Begin # Package oo::dialect 0.3.4 # Meta platform tcl # Meta summary A utility for defining a domain specific language for TclOO systems # Meta description This package allows developers to generate # Meta description domain specific languages to describe TclOO # Meta description classes and objects. # Meta category TclOO # Meta subject oodialect # Meta require {Tcl 8.6} # Meta author Sean Woods # Meta author Donald K. Fellows # Meta license BSD # @@ Meta End namespace eval ::oo::dialect { namespace export create } # A stack of class names proc ::oo::dialect::Push {class} { ::variable class_stack lappend class_stack $class } proc ::oo::dialect::Peek {} { ::variable class_stack return [lindex $class_stack end] } proc ::oo::dialect::Pop {} { ::variable class_stack set class_stack [lrange $class_stack 0 end-1] } ### # This proc will generate a namespace, a "mother of all classes", and a # rudimentary set of policies for this dialect. ### proc ::oo::dialect::create {name {parent ""}} { set NSPACE [NSNormalize [uplevel 1 {namespace current}] $name] ::namespace eval $NSPACE {::namespace eval define {}} ### # Build the "define" namespace ### if {$parent eq ""} { ### # With no "parent" language, begin with all of the keywords in # oo::define ### foreach command [info commands ::oo::define::*] { set procname [namespace tail $command] interp alias {} ${NSPACE}::define::$procname {} \ ::oo::dialect::DefineThunk $procname } # Create an empty dynamic_methods proc proc ${NSPACE}::dynamic_methods {class} {} namespace eval $NSPACE { ::namespace export dynamic_methods ::namespace eval define {::namespace export *} } set ANCESTORS {} } else { ### # If we have a parent language, that language already has the # [oo::define] keywords as well as additional keywords and behaviors. # We should begin with that ### set pnspace [NSNormalize [uplevel 1 {namespace current}] $parent] apply [list parent { ::namespace export dynamic_methods ::namespace import -force ${parent}::dynamic_methods } $NSPACE] $pnspace apply [list parent { ::namespace import -force ${parent}::define::* ::namespace export * } ${NSPACE}::define] $pnspace set ANCESTORS [list ${pnspace}::object] } ### # Build our dialect template functions ### proc ${NSPACE}::define {oclass args} [string map [list %NSPACE% $NSPACE] { ### # To facilitate library reloading, allow # a dialect to create a class from DEFINE ### set class [::oo::dialect::NSNormalize [uplevel 1 {namespace current}] $oclass] if {[info commands $class] eq {}} { %NSPACE%::class create $class {*}${args} } else { ::oo::dialect::Define %NSPACE% $class {*}${args} } }] interp alias {} ${NSPACE}::define::current_class {} \ ::oo::dialect::Peek interp alias {} ${NSPACE}::define::aliases {} \ ::oo::dialect::Aliases $NSPACE interp alias {} ${NSPACE}::define::superclass {} \ ::oo::dialect::SuperClass $NSPACE if {[info command ${NSPACE}::class] ne {}} { ::rename ${NSPACE}::class {} } ### # Build the metaclass for our language ### ::oo::class create ${NSPACE}::class { superclass ::oo::dialect::MotherOfAllMetaClasses } # Wire up the create method to add in the extra argument we need; the # MotherOfAllMetaClasses will know what to do with it. ::oo::objdefine ${NSPACE}::class \ method create {name {definitionScript ""}} \ "next \$name [list ${NSPACE}::define] \$definitionScript" ### # Build the mother of all classes. Note that $ANCESTORS is already # guaranteed to be a list in canonical form. ### uplevel #0 [string map [list %NSPACE% [list $NSPACE] %name% [list $name] %ANCESTORS% $ANCESTORS] { %NSPACE%::class create %NSPACE%::object { superclass %ANCESTORS% # Put MOACish stuff in here } }] if { "${NSPACE}::class" ni $::oo::dialect::core_classes } { lappend ::oo::dialect::core_classes "${NSPACE}::class" } if { "${NSPACE}::object" ni $::oo::dialect::core_classes } { lappend ::oo::dialect::core_classes "${NSPACE}::object" } } # Support commands; not intended to be called directly. proc ::oo::dialect::NSNormalize {namespace qualname} { if {![string match ::* $qualname]} { set qualname ${namespace}::$qualname } regsub -all {::+} $qualname "::" } proc ::oo::dialect::DefineThunk {target args} { tailcall ::oo::define [Peek] $target {*}$args } proc ::oo::dialect::Canonical {namespace NSpace class} { namespace upvar $namespace cname cname #if {[string match ::* $class]} { # return $class #} if {[info exists cname($class)]} { return $cname($class) } if {[info exists ::oo::dialect::cname($class)]} { return $::oo::dialect::cname($class) } if {[info exists ::oo::dialect::cname(${NSpace}::${class})]} { return $::oo::dialect::cname(${NSpace}::${class}) } foreach item [list "${NSpace}::$class" "::$class"] { if {[info commands $item] ne {}} { return $item } } return ${NSpace}::$class } ### # Implementation of the languages' define command ### proc ::oo::dialect::Define {namespace class args} { Push $class try { if {[llength $args]==1} { namespace eval ${namespace}::define [lindex $args 0] } else { ${namespace}::define::[lindex $args 0] {*}[lrange $args 1 end] } ${namespace}::dynamic_methods $class } finally { Pop } } ### # Implementation of how we specify the other names that this class will answer # to ### proc ::oo::dialect::Aliases {namespace args} { set class [Peek] namespace upvar $namespace cname cname set NSpace [join [lrange [split $class ::] 1 end-2] ::] set cname($class) $class foreach name $args { set cname($name) $class #set alias $name set alias [NSNormalize $NSpace $name] # Add a local metaclass reference if {![info exists ::oo::dialect::cname($alias)]} { lappend ::oo::dialect::aliases($class) $alias ## # Add a global reference, first come, first served ## set ::oo::dialect::cname($alias) $class } } } ### # Implementation of a superclass keyword which will enforce the inheritance of # our language's mother of all classes ### proc ::oo::dialect::SuperClass {namespace args} { set class [Peek] namespace upvar $namespace class_info class_info dict set class_info($class) superclass 1 set ::oo::dialect::cname($class) $class set NSpace [join [lrange [split $class ::] 1 end-2] ::] set unique {} foreach item $args { set Item [Canonical $namespace $NSpace $item] dict set unique $Item $item } set root ${namespace}::object if {$class ne $root} { dict set unique $root $root } tailcall ::oo::define $class superclass {*}[dict keys $unique] } ### # Implementation of the common portions of the the metaclass for our # languages. ### if {[info commands ::oo::dialect::MotherOfAllMetaClasses] eq {}} { ::oo::class create ::oo::dialect::MotherOfAllMetaClasses { superclass ::oo::class constructor {define definitionScript} { $define [self] { superclass } $define [self] $definitionScript } method aliases {} { if {[info exists ::oo::dialect::aliases([self])]} { return $::oo::dialect::aliases([self]) } } } } namespace eval ::oo::dialect { variable core_classes {::oo::class ::oo::object} } |
Added modules/tool/build/dicttool.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 | ### # This package enhances the stock dict implementation with some # creature comforts ### if {[info commands ::ladd] eq {}} { 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 } } if {[info command ::ldelete] eq {}} { proc ::ldelete {varname args} { upvar 1 $varname var if ![info exists var] { return } foreach item [lsort -unique $args] { while {[set i [lsearch $var $item]]>=0} { set var [lreplace $var $i $i] } } return $var } } if {[::info commands ::tcl::dict::getnull] eq {}} { proc ::tcl::dict::getnull {dictionary args} { if {[exists $dictionary {*}$args]} { get $dictionary {*}$args } } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] getnull ::tcl::dict::getnull] } if {[::info commands ::tcl::dict::print] eq {}} { ### # Test if element is a dict ### proc ::tcl::dict::_putb {buffervar indent field value} { ::upvar 1 $buffervar buffer ::append buffer \n [::string repeat " " $indent] [::list $field] " " if {[string index $field end] eq "/"} { ::incr indent 2 ::append buffer "\{" foreach item $value { if [catch { if {![is_dict $item]} { ::append buffer \n [::string repeat " " $indent] [list $item] } else { ::append buffer \n "[::string repeat " " $indent]\{" ::incr indent 2 foreach {sf sv} $item { _putb buffer $indent $sf $sv } ::incr indent -2 ::append buffer \n "[::string repeat " " $indent]\}" } } err] { puts [list FAILED $indent $field $item] puts $err puts "$::errorInfo" } } ::incr indent -2 ::append buffer \n [::string repeat " " $indent] "\}" } elseif {[string index $field end] eq ":" || ![is_dict $value]} { ::append buffer [::list $value] } else { ::incr indent 2 ::append buffer "\{" foreach {f v} $value { _putb buffer $indent $f $v } ::incr indent -2 ::append buffer \n [::string repeat " " $indent] "\}" } } proc ::tcl::dict::print dict { ::set buffer {} ::foreach {field value} $dict { _putb buffer 0 $field $value } return $buffer } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] print ::tcl::dict::print] } if {[::info commands ::tcl::dict::is_dict] eq {}} { ### # Test if element is a dict ### proc ::tcl::dict::is_dict { d } { # is it a dict, or can it be treated like one? if {[catch {dict size $d} err]} { #::set ::errorInfo {} return 0 } return 1 } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] is_dict ::tcl::dict::is_dict] } if {[::info commands ::tcl::dict::rmerge] eq {}} { ### # title: A recursive form of dict merge # description: # A routine to recursively dig through dicts and merge # adapted from http://stevehavelka.com/tcl-dict-operation-nested-merge/ ### proc ::tcl::dict::rmerge {a args} { ::set result $a # Merge b into a, and handle nested dicts appropriately ::foreach b $args { for { k v } $b { if {[string index $k end] eq ":"} { # Element names that end in ":" are assumed to be literals set result $k $v } elseif { [dict exists $result $k] } { # key exists in a and b? let's see if both values are dicts # both are dicts, so merge the dicts if { [is_dict [get $result $k]] && [is_dict $v] } { set result $k [rmerge [get $result $k] $v] } else { set result $k $v } } else { set result $k $v } } } return $result } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] rmerge ::tcl::dict::rmerge] } if {[::info commands ::tcl::dict::isnull] eq {}} { proc ::tcl::dict::isnull {dictionary args} { if {![exists $dictionary {*}$args]} {return 1} return [expr {[get $dictionary {*}$args] in {{} NULL null}}] } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull] } |
Changes to modules/tool/build/metaclass.tcl.
1 | #------------------------------------------------------------------------- | | | 1 2 3 4 5 6 7 8 9 | #------------------------------------------------------------------------- # TITLE: # tool.tcl # # PROJECT: # tool: TclOO Helper Library # # DESCRIPTION: # tool(n): Implementation File |
︙ | ︙ | |||
321 322 323 324 325 326 327 | variable mixins {} variable mixinmap {} variable DestroyEvent 0 constructor args { my Config_merge [::tool::args_to_options {*}$args] } | | | | | | | | | 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 | variable mixins {} variable mixinmap {} variable DestroyEvent 0 constructor args { my Config_merge [::tool::args_to_options {*}$args] } destructor {} method ancestors {{reverse 0}} { set result [::oo::meta::ancestors [info object class [self]]] if {$reverse} { return [lreverse $result] } return $result } method DestroyEvent {} { my variable DestroyEvent return $DestroyEvent } ### # title: Forward a method ### method forward {method args} { oo::objdefine [self] forward $method {*}$args } ### # title: Direct a series of sub-functions to a seperate object ### method graft args { my variable organs if {[llength $args] == 1} { error "Need two arguments" } set object {} foreach {stub object} $args { if {$stub eq "class"} { # Force class to always track the object's current class set obj [info object class [self]] } dict set organs $stub $object oo::objdefine [self] forward <${stub}> $object oo::objdefine [self] export <${stub}> } return $object } # Called after all options and public variables are initialized method initialize {} {} ### # topic: 3c4893b65a1c79b2549b9ee88f23c9e3 # description: # Provide a default value for all options and # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. |
︙ | ︙ | |||
389 390 391 392 393 394 395 | # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. # Note, by default an odie object will ignore # signals until a later call to <i>my lock remove pipeline</i> ### method InitializePublic {} { | | > > > > > > | | 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 | # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. # Note, by default an odie object will ignore # signals until a later call to <i>my lock remove pipeline</i> ### method InitializePublic {} { my variable config meta mixinmap mixins if {![info exists mixins]} { set mixins {} } if {![info exists mixinmap]} { set mixinmap {} } if {![info exists meta]} { set meta {} } if {![info exists config]} { set config {} } my ClassPublicApply {} } class_method info {which} { my variable cache if {![info exists cache($which)]} { set cache($which) {} switch $which { public { dict set cache(public) variable [my meta branchget variable] |
︙ | ︙ | |||
428 429 430 431 432 433 434 | dict set cache(public) option_canonical $var $var } } } } return $cache($which) } | | | | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | dict set cache(public) option_canonical $var $var } } } } return $cache($which) } ### # Incorporate the class's variables, arrays, and options ### method ClassPublicApply class { my variable config set integrate 0 if {$class eq {}} { set class [info object class [self]] } else { set integrate 1 } set public [$class info public] foreach {var value} [dict getnull $public variable] { if { $var in {meta config} } continue my variable $var |
︙ | ︙ | |||
490 491 492 493 494 495 496 | set script [dict getnull $dat $field set-command:] dict set config $field $val if {$script ne {}} { {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script] } } } | | | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | set script [dict getnull $dat $field set-command:] dict set config $field $val if {$script ne {}} { {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script] } } } ### # topic: 3c4893b65a1c79b2549b9ee88f23c9e3 # description: # Provide a default value for all options and # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. |
︙ | ︙ | |||
524 525 526 527 528 529 530 | foreach class $args { if {$class ni $prior} { my meta mixin $class } my ClassPublicApply $class } foreach class $prior { | | | | | 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 | foreach class $args { if {$class ni $prior} { my meta mixin $class } my ClassPublicApply $class } foreach class $prior { if {$class ni $mixins } { my meta mixout $class } } } method mixinmap args { my variable mixinmap set priorlist {} foreach {slot classes} $args { if {[dict exists $mixinmap $slot]} { lappend priorlist {*}[dict get $mixinmap $slot] foreach class [dict get $mixinmap $slot] { if {$class ni $classes && [$class meta exists mixin unmap-script:]} { if {[catch [$class meta get mixin unmap-script:] err errdat]} { puts stderr "[self] MIXIN ERROR POPPING $class:\n[dict get $errdat -errorinfo]" } } } |
︙ | ︙ | |||
582 583 584 585 586 587 588 | foreach {item class} $mixinmap { if {$class ne {}} { lappend classlist $class } } my mixin {*}$classlist } | | | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 | foreach {item class} $mixinmap { if {$class ne {}} { lappend classlist $class } } my mixin {*}$classlist } method morph newclass { if {$newclass eq {}} return set class [string trimleft [info object class [self]]] set newclass [string trimleft $newclass :] if {[info command ::$newclass] eq {}} { error "Class $newclass does not exist" } |
︙ | ︙ | |||
610 611 612 613 614 615 616 | # Commands to perform as this object transitions out of the present class ### method Morph_leave {} {} ### # Commands to perform as this object transitions into this class as a new class ### method Morph_enter {} {} | | | 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 | # Commands to perform as this object transitions out of the present class ### method Morph_leave {} {} ### # Commands to perform as this object transitions into this class as a new class ### method Morph_enter {} {} ### # title: List which objects are forwarded as organs ### method organ {{stub all}} { my variable organs if {![info exists organs]} { return {} |
︙ | ︙ |
Added modules/tool/build/oometa.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 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 | namespace eval ::oo::meta { set dirty_classes {} } proc ::oo::meta::args_to_dict args { if {[llength $args]==1} { return [lindex $args 0] } return $args } proc ::oo::meta::args_to_options args { set result {} foreach {var val} [args_to_dict {*}$args] { lappend result [string trimleft $var -] $val } return $result } proc ::oo::meta::ancestors class { set class [::oo::meta::normalize $class] set core_result {} set queue $class set result {} # Rig things such that that the top superclasses # are evaluated first while {[llength $queue]} { set tqueue $queue set queue {} foreach qclass $tqueue { if {$qclass in $::oo::dialect::core_classes} { if {$qclass ni $core_result} { lappend core_result $qclass } continue } foreach aclass [::info class superclasses $qclass] { if { $aclass in $result } continue if { $aclass in $core_result } continue if { $aclass in $queue } continue lappend queue $aclass } } foreach item $tqueue { if {$item in $core_result} continue if { $item ni $result } { set result [linsert $result 0 $item] } } } # Handle core classes last set queue $core_result while {[llength $queue]} { set tqueue $queue set queue {} foreach qclass $tqueue { foreach aclass [::info class superclasses $qclass] { if { $aclass in $result } continue if { $aclass in $queue } continue lappend queue $aclass } } foreach item $tqueue { if { $item ni $result } { set result [linsert $result 0 $item] } } } return $result } proc oo::meta::info {class submethod args} { set class [::oo::meta::normalize $class] switch $submethod { cget { ### # submethod: cget # arguments: ?*path* ...? *field* # format: markdown # description: # Retrieve a value from the class' meta data. Values are searched in the # following order: # 1. From class meta data as const **path** **field:** # 2. From class meta data as const **path** **field** # 3. From class meta data as **path** **field:** # 4. From class meta data as **path** **field** ### set path [lrange $args 0 end-1] set field [string trimright [lindex $args end] :] foreach mclass [lreverse [::oo::meta::ancestors $class]] { if {![::info exists ::oo::meta::local_property($mclass)]} continue set class_metadata $::oo::meta::local_property($mclass) if {[dict exists $class_metadata const {*}$path $field:]} { return [dict get $class_metadata const {*}$path $field:] } if {[dict exists $class_metadata const {*}$path $field]} { return [dict get $class_metadata const {*}$path $field] } if {[dict exists $class_metadata {*}$path $field:]} { return [dict get $class_metadata {*}$path $field:] } if {[dict exists $class_metadata {*}$path $field]} { return [dict get $class_metadata {*}$path $field] } } return {} } rebuild { ::oo::meta::rebuild $class } is { set info [metadata $class] return [string is [lindex $args 0] -strict [dict getnull $info {*}[lrange $args 1 end]]] } for - map { set info [metadata $class] uplevel 1 [list ::dict $submethod [lindex $args 0] [dict get $info {*}[lrange $args 1 end-1]] [lindex $args end]] } with { upvar 1 TEMPVAR info set info [metadata $class] return [uplevel 1 [list ::dict with TEMPVAR {*}$args]] } branchget { set info [metadata $class] set result {} foreach {field value} [dict getnull $info {*}$args] { dict set result [string trimright $field :] $value } return $result } branchset { ::oo::meta::rebuild $class foreach {field value} [lindex $args end] { ::dict set ::oo::meta::local_property($class) {*}[lrange $args 0 end-1] [string trimright $field :]: $value } } leaf_add { if {[::info exists ::oo::meta::local_property($class)]} { set result [dict getnull $::oo::meta::local_property($class) {*}[lindex $args 0]] } ladd result {*}[lrange $args 1 end] dict set ::oo::meta::local_property($class) {*}[lindex $args 0] $result } leaf_remove { if {![::info exists ::oo::meta::local_property($class)]} return set result {} forearch element [dict getnull $::oo::meta::local_property($class) {*}[lindex $args 0]] { if { $element in [lrange $args 1 end]} continue lappend result $element } dict set ::oo::meta::local_property($class) {*}[lindex $args 0] $result } append - incr - lappend - set - unset - update { ::oo::meta::rebuild $class ::dict $submethod ::oo::meta::local_property($class) {*}$args } merge { ::oo::meta::rebuild $class set ::oo::meta::local_property($class) [dict rmerge $::oo::meta::local_property($class) {*}$args] } dump { set info [metadata $class] return $info } default { set info [metadata $class] return [::dict $submethod $info {*}$args] } } } proc ::oo::meta::localdata {class args} { if {![::info exists ::oo::meta::local_property($class)]} { return {} } if {[::llength $args]==0} { return $::oo::meta::local_property($class) } return [::dict getnull $::oo::meta::local_property($class) {*}$args] } proc ::oo::meta::normalize class { set class ::[string trimleft $class :] } proc ::oo::meta::metadata {class {force 0}} { set class [::oo::meta::normalize $class] ### # Destroy the cache of all derivitive classes ### if {$force} { unset -nocomplain ::oo::meta::cached_property unset -nocomplain ::oo::meta::cached_hierarchy } else { variable dirty_classes foreach dclass $dirty_classes { foreach {cclass cancestors} [array get ::oo::meta::cached_hierarchy] { if {$dclass in $cancestors} { unset -nocomplain ::oo::meta::cached_property($cclass) unset -nocomplain ::oo::meta::cached_hierarchy($cclass) } } if {![::info exists ::oo::meta::local_property($dclass)]} continue if {[dict getnull $::oo::meta::local_property($dclass) classinfo type:] eq "core"} { if {$dclass ni $::oo::dialect::core_classes} { lappend ::oo::dialect::core_classes $dclass } } } set dirty_classes {} } ### # If the cache is available, use it ### variable cached_property if {[::info exists cached_property($class)]} { return $cached_property($class) } ### # Build a cache of the hierarchy and the # aggregate metadata for this class and store # them for future use ### variable cached_hierarchy set metadata {} set stack {} variable local_property set cached_hierarchy($class) [::oo::meta::ancestors $class] foreach class $cached_hierarchy($class) { if {[::info exists local_property($class)]} { lappend metadata $local_property($class) } } #foreach aclass [lreverse [::info class superclasses $class]] { # lappend metadata [::oo::meta::metadata $aclass] #} lappend metadata {classinfo {type: {}}} if {[::info exists local_property($class)]} { lappend metadata $local_property($class) } set metadata [dict rmerge {*}$metadata] set cached_property($class) $metadata return $metadata } proc ::oo::meta::rebuild args { foreach class $args { if {$class ni $::oo::meta::dirty_classes} { lappend ::oo::meta::dirty_classes $class } } } proc ::oo::meta::search args { variable local_property set path [lrange $args 0 end-1] set value [lindex $args end] set result {} foreach {class info} [array get local_property] { if {[dict exists $info {*}$path:]} { if {[string match [dict get $info {*}$path:] $value]} { lappend result $class } continue } if {[dict exists $info {*}$path]} { if {[string match [dict get $info {*}$path] $value]} { lappend result $class } } } return $result } proc ::oo::define::meta {args} { set class [lindex [::info level -1] 1] if {[lindex $args 0] in "cget set branchset"} { ::oo::meta::info $class {*}$args } else { ::oo::meta::info $class set {*}$args } } oo::define oo::class { method meta {submethod args} { tailcall ::oo::meta::info [self] $submethod {*}$args } } oo::define oo::object { ### # title: Provide access to meta data # format: markdown # description: # The *meta* method allows an object access # to a combination of its own meta data as # well as to that of its class ### method meta {submethod args} { my variable meta MetaMixin if {![info exists MetaMixin]} { set MetaMixin {} } set class [::info object class [self object]] set classlist [list $class {*}$MetaMixin] switch $submethod { cget { ### # submethod: cget # arguments: ?*path* ...? *field* # format: markdown # description: # Retrieve a value from the local objects **meta** dict # or from the class' meta data. Values are searched in the # following order: # 0. (If path length==1) From the _config array # 1. From the local dict as **path** **field:** # 2. From the local dict as **path** **field** # 3. From class meta data as const **path** **field:** # 4. From class meta data as const **path** **field** # 5. From class meta data as **path** **field:** # 6. From class meta data as **path** **field** ### set path [lrange $args 0 end-1] set field [string trim [lindex $args end] :] if {[dict exists $meta {*}$path $field:]} { return [dict get $meta {*}$path $field:] } if {[dict exists $meta {*}$path $field]} { return [dict get $meta {*}$path $field] } foreach mclass [lreverse $classlist] { set class_metadata [::oo::meta::metadata $mclass] if {[dict exists $class_metadata const {*}$path $field:]} { return [dict get $class_metadata const {*}$path $field:] } if {[dict exists $class_metadata const {*}$path $field]} { return [dict get $class_metadata const {*}$path $field] } if {[dict exists $class_metadata {*}$path $field:]} { return [dict get $class_metadata {*}$path $field:] } if {[dict exists $class_metadata {*}$path $field]} { return [dict get $class_metadata {*}$path $field] } } return {} } is { set value [my meta cget {*}[lrange $args 1 end]] return [string is [lindex $args 0] -strict $value] } for - map { foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } set info [dict rmerge {*}$mdata $meta] uplevel 1 [list ::dict $submethod [lindex $args 0] [dict get $info {*}[lrange $args 1 end-1]] [lindex $args end]] } with { upvar 1 TEMPVAR info foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } set info [dict rmerge {*}$mdata $meta] return [uplevel 1 [list dict with TEMPVAR {*}$args]] } dump { foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } return [dict rmerge {*}$mdata $meta] } append - incr - lappend - set - unset - update { return [dict $submethod meta {*}$args] } branchset { foreach {field value} [lindex $args end] { dict set meta {*}[lrange $args 0 end-1] [string trimright $field :]: $value } } rmerge - merge { set meta [dict rmerge $meta {*}$args] return $meta } exists { foreach mclass $classlist { if {[dict exists [::oo::meta::metadata $mclass] {*}$args]} { return 1 } } if {[dict exists $meta {*}$args]} { return 1 } return 0 } get - getnull { if {[string index [lindex $args end] end]==":"} { # Looking for a leaf node if {[dict exists $meta {*}$args]} { return [dict get $meta {*}$args] } foreach mclass [lreverse $classlist] { set mdata [::oo::meta::metadata $mclass] if {[dict exists $mdata {*}$args]} { return [dict get $mdata {*}$args] } } if {$submethod == "get"} { error "key \"$args\" not known in metadata" } return {} } # Looking for a branch node # So we need to composite the result set found 0 foreach mclass $classlist { set mdata [::oo::meta::metadata $mclass] if {[dict exists $mdata {*}$args]} { set found 1 lappend result [dict get $mdata {*}$args] } } if {[dict exists $meta {*}$args]} { set found 1 lappend result [dict get $meta {*}$args] } if {!$found} { if {$submethod == "get"} { error "key \"$args\" not known in metadata" } return {} } return [dict rmerge {*}$result] } branchget { set result {} foreach mclass [lreverse $classlist] { foreach {field value} [dict getnull [::oo::meta::metadata $mclass] {*}$args] { dict set result [string trimright $field :] $value } } foreach {field value} [dict getnull $meta {*}$args] { dict set result [string trimright $field :] $value } return $result } mixin { foreach mclass $args { set mclass [::oo::meta::normalize $mclass] if {$mclass ni $MetaMixin} { lappend MetaMixin $mclass } } } mixout { foreach mclass $args { set mclass [::oo::meta::normalize $mclass] while {[set i [lsearch $MetaMixin $mclass]]>=0} { set MetaMixin [lreplace $MetaMixin $i $i] } } } default { foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } set info [dict rmerge {*}$mdata $meta] return [dict $submethod $info {*}$args] } } } } |
Changes to modules/tool/pkgIndex.tcl.
1 2 3 4 5 6 7 8 9 10 11 | # Tcl package index file, version 1.1 # This file is generated by the "pkg_mkIndex" command # and sourced either when an application starts up or # by a "package unknown" script. It invokes the # "package ifneeded" command to set up package-related # information so that packages will be loaded automatically # in response to "package require" commands. When this # script is sourced, the variable $dir must contain the # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.6]} {return} | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | # Tcl package index file, version 1.1 # This file is generated by the "pkg_mkIndex" command # and sourced either when an application starts up or # by a "package unknown" script. It invokes the # "package ifneeded" command to set up package-related # information so that packages will be loaded automatically # in response to "package require" commands. When this # script is sourced, the variable $dir must contain the # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.6]} {return} package ifneeded tool 0.7.1 [list source [file join $dir tool.tcl]] |
Changes to modules/tool/tool.tcl.
1 2 3 4 5 | ### # Amalgamated package for tool # Do not edit directly, tweak the source in src/ and rerun # build.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 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 | ### # Amalgamated package for tool # Do not edit directly, tweak the source in src/ and rerun # build.tcl ### package provide tool 0.7.1 namespace eval ::tool {} ### # START: dicttool.tcl ### ### # This package enhances the stock dict implementation with some # creature comforts ### if {[info commands ::ladd] eq {}} { 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 } } if {[info command ::ldelete] eq {}} { proc ::ldelete {varname args} { upvar 1 $varname var if ![info exists var] { return } foreach item [lsort -unique $args] { while {[set i [lsearch $var $item]]>=0} { set var [lreplace $var $i $i] } } return $var } } if {[::info commands ::tcl::dict::getnull] eq {}} { proc ::tcl::dict::getnull {dictionary args} { if {[exists $dictionary {*}$args]} { get $dictionary {*}$args } } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] getnull ::tcl::dict::getnull] } if {[::info commands ::tcl::dict::print] eq {}} { ### # Test if element is a dict ### proc ::tcl::dict::_putb {buffervar indent field value} { ::upvar 1 $buffervar buffer ::append buffer \n [::string repeat " " $indent] [::list $field] " " if {[string index $field end] eq "/"} { ::incr indent 2 ::append buffer "\{" foreach item $value { if [catch { if {![is_dict $item]} { ::append buffer \n [::string repeat " " $indent] [list $item] } else { ::append buffer \n "[::string repeat " " $indent]\{" ::incr indent 2 foreach {sf sv} $item { _putb buffer $indent $sf $sv } ::incr indent -2 ::append buffer \n "[::string repeat " " $indent]\}" } } err] { puts [list FAILED $indent $field $item] puts $err puts "$::errorInfo" } } ::incr indent -2 ::append buffer \n [::string repeat " " $indent] "\}" } elseif {[string index $field end] eq ":" || ![is_dict $value]} { ::append buffer [::list $value] } else { ::incr indent 2 ::append buffer "\{" foreach {f v} $value { _putb buffer $indent $f $v } ::incr indent -2 ::append buffer \n [::string repeat " " $indent] "\}" } } proc ::tcl::dict::print dict { ::set buffer {} ::foreach {field value} $dict { _putb buffer 0 $field $value } return $buffer } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] print ::tcl::dict::print] } if {[::info commands ::tcl::dict::is_dict] eq {}} { ### # Test if element is a dict ### proc ::tcl::dict::is_dict { d } { # is it a dict, or can it be treated like one? if {[catch {dict size $d} err]} { #::set ::errorInfo {} return 0 } return 1 } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] is_dict ::tcl::dict::is_dict] } if {[::info commands ::tcl::dict::rmerge] eq {}} { ### # title: A recursive form of dict merge # description: # A routine to recursively dig through dicts and merge # adapted from http://stevehavelka.com/tcl-dict-operation-nested-merge/ ### proc ::tcl::dict::rmerge {a args} { ::set result $a # Merge b into a, and handle nested dicts appropriately ::foreach b $args { for { k v } $b { if {[string index $k end] eq ":"} { # Element names that end in ":" are assumed to be literals set result $k $v } elseif { [dict exists $result $k] } { # key exists in a and b? let's see if both values are dicts # both are dicts, so merge the dicts if { [is_dict [get $result $k]] && [is_dict $v] } { set result $k [rmerge [get $result $k] $v] } else { set result $k $v } } else { set result $k $v } } } return $result } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] rmerge ::tcl::dict::rmerge] } if {[::info commands ::tcl::dict::isnull] eq {}} { proc ::tcl::dict::isnull {dictionary args} { if {![exists $dictionary {*}$args]} {return 1} return [expr {[get $dictionary {*}$args] in {{} NULL null}}] } namespace ensemble configure dict -map [dict replace\ [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull] } ### # END: dicttool.tcl ### ### # START: dialect.tcl ### ### # oodialect.tcl # # Copyright (c) 2015-2018 Sean Woods # Copyright (c) 2015 Donald K Fellows # # BSD License ### # @@ Meta Begin # Package oo::dialect 0.3.4 # Meta platform tcl # Meta summary A utility for defining a domain specific language for TclOO systems # Meta description This package allows developers to generate # Meta description domain specific languages to describe TclOO # Meta description classes and objects. # Meta category TclOO # Meta subject oodialect # Meta require {Tcl 8.6} # Meta author Sean Woods # Meta author Donald K. Fellows # Meta license BSD # @@ Meta End namespace eval ::oo::dialect { namespace export create } # A stack of class names proc ::oo::dialect::Push {class} { ::variable class_stack lappend class_stack $class } proc ::oo::dialect::Peek {} { ::variable class_stack return [lindex $class_stack end] } proc ::oo::dialect::Pop {} { ::variable class_stack set class_stack [lrange $class_stack 0 end-1] } ### # This proc will generate a namespace, a "mother of all classes", and a # rudimentary set of policies for this dialect. ### proc ::oo::dialect::create {name {parent ""}} { set NSPACE [NSNormalize [uplevel 1 {namespace current}] $name] ::namespace eval $NSPACE {::namespace eval define {}} ### # Build the "define" namespace ### if {$parent eq ""} { ### # With no "parent" language, begin with all of the keywords in # oo::define ### foreach command [info commands ::oo::define::*] { set procname [namespace tail $command] interp alias {} ${NSPACE}::define::$procname {} \ ::oo::dialect::DefineThunk $procname } # Create an empty dynamic_methods proc proc ${NSPACE}::dynamic_methods {class} {} namespace eval $NSPACE { ::namespace export dynamic_methods ::namespace eval define {::namespace export *} } set ANCESTORS {} } else { ### # If we have a parent language, that language already has the # [oo::define] keywords as well as additional keywords and behaviors. # We should begin with that ### set pnspace [NSNormalize [uplevel 1 {namespace current}] $parent] apply [list parent { ::namespace export dynamic_methods ::namespace import -force ${parent}::dynamic_methods } $NSPACE] $pnspace apply [list parent { ::namespace import -force ${parent}::define::* ::namespace export * } ${NSPACE}::define] $pnspace set ANCESTORS [list ${pnspace}::object] } ### # Build our dialect template functions ### proc ${NSPACE}::define {oclass args} [string map [list %NSPACE% $NSPACE] { ### # To facilitate library reloading, allow # a dialect to create a class from DEFINE ### set class [::oo::dialect::NSNormalize [uplevel 1 {namespace current}] $oclass] if {[info commands $class] eq {}} { %NSPACE%::class create $class {*}${args} } else { ::oo::dialect::Define %NSPACE% $class {*}${args} } }] interp alias {} ${NSPACE}::define::current_class {} \ ::oo::dialect::Peek interp alias {} ${NSPACE}::define::aliases {} \ ::oo::dialect::Aliases $NSPACE interp alias {} ${NSPACE}::define::superclass {} \ ::oo::dialect::SuperClass $NSPACE if {[info command ${NSPACE}::class] ne {}} { ::rename ${NSPACE}::class {} } ### # Build the metaclass for our language ### ::oo::class create ${NSPACE}::class { superclass ::oo::dialect::MotherOfAllMetaClasses } # Wire up the create method to add in the extra argument we need; the # MotherOfAllMetaClasses will know what to do with it. ::oo::objdefine ${NSPACE}::class \ method create {name {definitionScript ""}} \ "next \$name [list ${NSPACE}::define] \$definitionScript" ### # Build the mother of all classes. Note that $ANCESTORS is already # guaranteed to be a list in canonical form. ### uplevel #0 [string map [list %NSPACE% [list $NSPACE] %name% [list $name] %ANCESTORS% $ANCESTORS] { %NSPACE%::class create %NSPACE%::object { superclass %ANCESTORS% # Put MOACish stuff in here } }] if { "${NSPACE}::class" ni $::oo::dialect::core_classes } { lappend ::oo::dialect::core_classes "${NSPACE}::class" } if { "${NSPACE}::object" ni $::oo::dialect::core_classes } { lappend ::oo::dialect::core_classes "${NSPACE}::object" } } # Support commands; not intended to be called directly. proc ::oo::dialect::NSNormalize {namespace qualname} { if {![string match ::* $qualname]} { set qualname ${namespace}::$qualname } regsub -all {::+} $qualname "::" } proc ::oo::dialect::DefineThunk {target args} { tailcall ::oo::define [Peek] $target {*}$args } proc ::oo::dialect::Canonical {namespace NSpace class} { namespace upvar $namespace cname cname #if {[string match ::* $class]} { # return $class #} if {[info exists cname($class)]} { return $cname($class) } if {[info exists ::oo::dialect::cname($class)]} { return $::oo::dialect::cname($class) } if {[info exists ::oo::dialect::cname(${NSpace}::${class})]} { return $::oo::dialect::cname(${NSpace}::${class}) } foreach item [list "${NSpace}::$class" "::$class"] { if {[info commands $item] ne {}} { return $item } } return ${NSpace}::$class } ### # Implementation of the languages' define command ### proc ::oo::dialect::Define {namespace class args} { Push $class try { if {[llength $args]==1} { namespace eval ${namespace}::define [lindex $args 0] } else { ${namespace}::define::[lindex $args 0] {*}[lrange $args 1 end] } ${namespace}::dynamic_methods $class } finally { Pop } } ### # Implementation of how we specify the other names that this class will answer # to ### proc ::oo::dialect::Aliases {namespace args} { set class [Peek] namespace upvar $namespace cname cname set NSpace [join [lrange [split $class ::] 1 end-2] ::] set cname($class) $class foreach name $args { set cname($name) $class #set alias $name set alias [NSNormalize $NSpace $name] # Add a local metaclass reference if {![info exists ::oo::dialect::cname($alias)]} { lappend ::oo::dialect::aliases($class) $alias ## # Add a global reference, first come, first served ## set ::oo::dialect::cname($alias) $class } } } ### # Implementation of a superclass keyword which will enforce the inheritance of # our language's mother of all classes ### proc ::oo::dialect::SuperClass {namespace args} { set class [Peek] namespace upvar $namespace class_info class_info dict set class_info($class) superclass 1 set ::oo::dialect::cname($class) $class set NSpace [join [lrange [split $class ::] 1 end-2] ::] set unique {} foreach item $args { set Item [Canonical $namespace $NSpace $item] dict set unique $Item $item } set root ${namespace}::object if {$class ne $root} { dict set unique $root $root } tailcall ::oo::define $class superclass {*}[dict keys $unique] } ### # Implementation of the common portions of the the metaclass for our # languages. ### if {[info commands ::oo::dialect::MotherOfAllMetaClasses] eq {}} { ::oo::class create ::oo::dialect::MotherOfAllMetaClasses { superclass ::oo::class constructor {define definitionScript} { $define [self] { superclass } $define [self] $definitionScript } method aliases {} { if {[info exists ::oo::dialect::aliases([self])]} { return $::oo::dialect::aliases([self]) } } } } namespace eval ::oo::dialect { variable core_classes {::oo::class ::oo::object} } ### # END: dialect.tcl ### ### # START: oometa.tcl ### namespace eval ::oo::meta { set dirty_classes {} } proc ::oo::meta::args_to_dict args { if {[llength $args]==1} { return [lindex $args 0] } return $args } proc ::oo::meta::args_to_options args { set result {} foreach {var val} [args_to_dict {*}$args] { lappend result [string trimleft $var -] $val } return $result } proc ::oo::meta::ancestors class { set class [::oo::meta::normalize $class] set core_result {} set queue $class set result {} # Rig things such that that the top superclasses # are evaluated first while {[llength $queue]} { set tqueue $queue set queue {} foreach qclass $tqueue { if {$qclass in $::oo::dialect::core_classes} { if {$qclass ni $core_result} { lappend core_result $qclass } continue } foreach aclass [::info class superclasses $qclass] { if { $aclass in $result } continue if { $aclass in $core_result } continue if { $aclass in $queue } continue lappend queue $aclass } } foreach item $tqueue { if {$item in $core_result} continue if { $item ni $result } { set result [linsert $result 0 $item] } } } # Handle core classes last set queue $core_result while {[llength $queue]} { set tqueue $queue set queue {} foreach qclass $tqueue { foreach aclass [::info class superclasses $qclass] { if { $aclass in $result } continue if { $aclass in $queue } continue lappend queue $aclass } } foreach item $tqueue { if { $item ni $result } { set result [linsert $result 0 $item] } } } return $result } proc oo::meta::info {class submethod args} { set class [::oo::meta::normalize $class] switch $submethod { cget { ### # submethod: cget # arguments: ?*path* ...? *field* # format: markdown # description: # Retrieve a value from the class' meta data. Values are searched in the # following order: # 1. From class meta data as const **path** **field:** # 2. From class meta data as const **path** **field** # 3. From class meta data as **path** **field:** # 4. From class meta data as **path** **field** ### set path [lrange $args 0 end-1] set field [string trimright [lindex $args end] :] foreach mclass [lreverse [::oo::meta::ancestors $class]] { if {![::info exists ::oo::meta::local_property($mclass)]} continue set class_metadata $::oo::meta::local_property($mclass) if {[dict exists $class_metadata const {*}$path $field:]} { return [dict get $class_metadata const {*}$path $field:] } if {[dict exists $class_metadata const {*}$path $field]} { return [dict get $class_metadata const {*}$path $field] } if {[dict exists $class_metadata {*}$path $field:]} { return [dict get $class_metadata {*}$path $field:] } if {[dict exists $class_metadata {*}$path $field]} { return [dict get $class_metadata {*}$path $field] } } return {} } rebuild { ::oo::meta::rebuild $class } is { set info [metadata $class] return [string is [lindex $args 0] -strict [dict getnull $info {*}[lrange $args 1 end]]] } for - map { set info [metadata $class] uplevel 1 [list ::dict $submethod [lindex $args 0] [dict get $info {*}[lrange $args 1 end-1]] [lindex $args end]] } with { upvar 1 TEMPVAR info set info [metadata $class] return [uplevel 1 [list ::dict with TEMPVAR {*}$args]] } branchget { set info [metadata $class] set result {} foreach {field value} [dict getnull $info {*}$args] { dict set result [string trimright $field :] $value } return $result } branchset { ::oo::meta::rebuild $class foreach {field value} [lindex $args end] { ::dict set ::oo::meta::local_property($class) {*}[lrange $args 0 end-1] [string trimright $field :]: $value } } leaf_add { if {[::info exists ::oo::meta::local_property($class)]} { set result [dict getnull $::oo::meta::local_property($class) {*}[lindex $args 0]] } ladd result {*}[lrange $args 1 end] dict set ::oo::meta::local_property($class) {*}[lindex $args 0] $result } leaf_remove { if {![::info exists ::oo::meta::local_property($class)]} return set result {} forearch element [dict getnull $::oo::meta::local_property($class) {*}[lindex $args 0]] { if { $element in [lrange $args 1 end]} continue lappend result $element } dict set ::oo::meta::local_property($class) {*}[lindex $args 0] $result } append - incr - lappend - set - unset - update { ::oo::meta::rebuild $class ::dict $submethod ::oo::meta::local_property($class) {*}$args } merge { ::oo::meta::rebuild $class set ::oo::meta::local_property($class) [dict rmerge $::oo::meta::local_property($class) {*}$args] } dump { set info [metadata $class] return $info } default { set info [metadata $class] return [::dict $submethod $info {*}$args] } } } proc ::oo::meta::localdata {class args} { if {![::info exists ::oo::meta::local_property($class)]} { return {} } if {[::llength $args]==0} { return $::oo::meta::local_property($class) } return [::dict getnull $::oo::meta::local_property($class) {*}$args] } proc ::oo::meta::normalize class { set class ::[string trimleft $class :] } proc ::oo::meta::metadata {class {force 0}} { set class [::oo::meta::normalize $class] ### # Destroy the cache of all derivitive classes ### if {$force} { unset -nocomplain ::oo::meta::cached_property unset -nocomplain ::oo::meta::cached_hierarchy } else { variable dirty_classes foreach dclass $dirty_classes { foreach {cclass cancestors} [array get ::oo::meta::cached_hierarchy] { if {$dclass in $cancestors} { unset -nocomplain ::oo::meta::cached_property($cclass) unset -nocomplain ::oo::meta::cached_hierarchy($cclass) } } if {![::info exists ::oo::meta::local_property($dclass)]} continue if {[dict getnull $::oo::meta::local_property($dclass) classinfo type:] eq "core"} { if {$dclass ni $::oo::dialect::core_classes} { lappend ::oo::dialect::core_classes $dclass } } } set dirty_classes {} } ### # If the cache is available, use it ### variable cached_property if {[::info exists cached_property($class)]} { return $cached_property($class) } ### # Build a cache of the hierarchy and the # aggregate metadata for this class and store # them for future use ### variable cached_hierarchy set metadata {} set stack {} variable local_property set cached_hierarchy($class) [::oo::meta::ancestors $class] foreach class $cached_hierarchy($class) { if {[::info exists local_property($class)]} { lappend metadata $local_property($class) } } #foreach aclass [lreverse [::info class superclasses $class]] { # lappend metadata [::oo::meta::metadata $aclass] #} lappend metadata {classinfo {type: {}}} if {[::info exists local_property($class)]} { lappend metadata $local_property($class) } set metadata [dict rmerge {*}$metadata] set cached_property($class) $metadata return $metadata } proc ::oo::meta::rebuild args { foreach class $args { if {$class ni $::oo::meta::dirty_classes} { lappend ::oo::meta::dirty_classes $class } } } proc ::oo::meta::search args { variable local_property set path [lrange $args 0 end-1] set value [lindex $args end] set result {} foreach {class info} [array get local_property] { if {[dict exists $info {*}$path:]} { if {[string match [dict get $info {*}$path:] $value]} { lappend result $class } continue } if {[dict exists $info {*}$path]} { if {[string match [dict get $info {*}$path] $value]} { lappend result $class } } } return $result } proc ::oo::define::meta {args} { set class [lindex [::info level -1] 1] if {[lindex $args 0] in "cget set branchset"} { ::oo::meta::info $class {*}$args } else { ::oo::meta::info $class set {*}$args } } oo::define oo::class { method meta {submethod args} { tailcall ::oo::meta::info [self] $submethod {*}$args } } oo::define oo::object { ### # title: Provide access to meta data # format: markdown # description: # The *meta* method allows an object access # to a combination of its own meta data as # well as to that of its class ### method meta {submethod args} { my variable meta MetaMixin if {![info exists MetaMixin]} { set MetaMixin {} } set class [::info object class [self object]] set classlist [list $class {*}$MetaMixin] switch $submethod { cget { ### # submethod: cget # arguments: ?*path* ...? *field* # format: markdown # description: # Retrieve a value from the local objects **meta** dict # or from the class' meta data. Values are searched in the # following order: # 0. (If path length==1) From the _config array # 1. From the local dict as **path** **field:** # 2. From the local dict as **path** **field** # 3. From class meta data as const **path** **field:** # 4. From class meta data as const **path** **field** # 5. From class meta data as **path** **field:** # 6. From class meta data as **path** **field** ### set path [lrange $args 0 end-1] set field [string trim [lindex $args end] :] if {[dict exists $meta {*}$path $field:]} { return [dict get $meta {*}$path $field:] } if {[dict exists $meta {*}$path $field]} { return [dict get $meta {*}$path $field] } foreach mclass [lreverse $classlist] { set class_metadata [::oo::meta::metadata $mclass] if {[dict exists $class_metadata const {*}$path $field:]} { return [dict get $class_metadata const {*}$path $field:] } if {[dict exists $class_metadata const {*}$path $field]} { return [dict get $class_metadata const {*}$path $field] } if {[dict exists $class_metadata {*}$path $field:]} { return [dict get $class_metadata {*}$path $field:] } if {[dict exists $class_metadata {*}$path $field]} { return [dict get $class_metadata {*}$path $field] } } return {} } is { set value [my meta cget {*}[lrange $args 1 end]] return [string is [lindex $args 0] -strict $value] } for - map { foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } set info [dict rmerge {*}$mdata $meta] uplevel 1 [list ::dict $submethod [lindex $args 0] [dict get $info {*}[lrange $args 1 end-1]] [lindex $args end]] } with { upvar 1 TEMPVAR info foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } set info [dict rmerge {*}$mdata $meta] return [uplevel 1 [list dict with TEMPVAR {*}$args]] } dump { foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } return [dict rmerge {*}$mdata $meta] } append - incr - lappend - set - unset - update { return [dict $submethod meta {*}$args] } branchset { foreach {field value} [lindex $args end] { dict set meta {*}[lrange $args 0 end-1] [string trimright $field :]: $value } } rmerge - merge { set meta [dict rmerge $meta {*}$args] return $meta } exists { foreach mclass $classlist { if {[dict exists [::oo::meta::metadata $mclass] {*}$args]} { return 1 } } if {[dict exists $meta {*}$args]} { return 1 } return 0 } get - getnull { if {[string index [lindex $args end] end]==":"} { # Looking for a leaf node if {[dict exists $meta {*}$args]} { return [dict get $meta {*}$args] } foreach mclass [lreverse $classlist] { set mdata [::oo::meta::metadata $mclass] if {[dict exists $mdata {*}$args]} { return [dict get $mdata {*}$args] } } if {$submethod == "get"} { error "key \"$args\" not known in metadata" } return {} } # Looking for a branch node # So we need to composite the result set found 0 foreach mclass $classlist { set mdata [::oo::meta::metadata $mclass] if {[dict exists $mdata {*}$args]} { set found 1 lappend result [dict get $mdata {*}$args] } } if {[dict exists $meta {*}$args]} { set found 1 lappend result [dict get $meta {*}$args] } if {!$found} { if {$submethod == "get"} { error "key \"$args\" not known in metadata" } return {} } return [dict rmerge {*}$result] } branchget { set result {} foreach mclass [lreverse $classlist] { foreach {field value} [dict getnull [::oo::meta::metadata $mclass] {*}$args] { dict set result [string trimright $field :] $value } } foreach {field value} [dict getnull $meta {*}$args] { dict set result [string trimright $field :] $value } return $result } mixin { foreach mclass $args { set mclass [::oo::meta::normalize $mclass] if {$mclass ni $MetaMixin} { lappend MetaMixin $mclass } } } mixout { foreach mclass $args { set mclass [::oo::meta::normalize $mclass] while {[set i [lsearch $MetaMixin $mclass]]>=0} { set MetaMixin [lreplace $MetaMixin $i $i] } } } default { foreach mclass $classlist { lappend mdata [::oo::meta::metadata $mclass] } set info [dict rmerge {*}$mdata $meta] return [dict $submethod $info {*}$args] } } } } ### # END: oometa.tcl ### ### # START: cron.tcl ### ### # This file implements a process table # Instead of having individual components try to maintain their own timers # we centrally manage how often tasks should be kicked off here. ### # # Author: Sean Woods (for T&E Solutions) ::namespace eval ::cron {} proc ::cron::task {command args} { if {$::cron::trace > 1} { puts [list ::cron::task $command $args] } variable processTable switch $command { TEMPLATE { return [list object {} lastevent 0 lastrun 0 err 0 result {} \ running 0 coroutine {} scheduled 0 frequency 0 command {}] } delete { unset -nocomplain ::cron::processTable([lindex $args 0]) } exists { return [::info exists ::cron::processTable([lindex $args 0])] } info { set process [lindex $args 0] if {![::info exists ::cron::processTable($process)]} { error "Process $process does not exist" } return $::cron::processTable($process) } frequency { set process [lindex $args 0] set time [lindex $args 1] if {![info exists ::cron::processTable($process)]} return dict with ::cron::processTable($process) { set now [clock_step [current_time]] set frequency [expr {0+$time}] if {$scheduled>($now+$time)} { dict set ::cron::processTable($process) scheduled [expr {$now+$time}] } } } sleep { set process [lindex $args 0] set time [lindex $args 1] if {![info exists ::cron::processTable($process)]} return dict with ::cron::processTable($process) { set now [clock_step [current_time]] set frequency 0 set scheduled [expr {$now+$time}] } } create - set { set process [lindex $args 0] if {![::info exists ::cron::processTable($process)]} { set ::cron::processTable($process) [task TEMPLATE] } if {[llength $args]==2} { foreach {field value} [lindex $args 1] { dict set ::cron::processTable($process) $field $value } } else { foreach {field value} [lrange $args 1 end] { dict set ::cron::processTable($process) $field $value } } } } } proc ::cron::at args { if {$::cron::trace > 1} { puts [list ::cron::at $args] } switch [llength $args] { 2 { variable processuid set process event#[incr processuid] lassign $args timecode command } 3 { lassign $args process timecode command } default { error "Usage: ?process? timecode command" } } variable processTable if {[string is integer -strict $timecode]} { set scheduled [expr {$timecode*1000}] } else { set scheduled [expr {[clock scan $timecode]*1000}] } ::cron::task set $process \ frequency -1 \ command $command \ scheduled $scheduled \ coroutine {} if {$::cron::trace > 1} { puts [list ::cron::task info $process - > [::cron::task info $process]] } ::cron::wake NEW return $process } proc ::cron::idle args { if {$::cron::trace > 1} { puts [list ::cron::idle $args] } switch [llength $args] { 2 { variable processuid set process event#[incr processuid] lassign $args command } 3 { lassign $args process command } default { error "Usage: ?process? timecode command" } } ::cron::task set $process \ scheduled 0 \ frequency 0 \ command $command ::cron::wake NEW return $process } proc ::cron::in args { if {$::cron::trace > 1} { puts [list ::cron::in $args] } switch [llength $args] { 2 { variable processuid set process event#[incr processuid] lassign $args timecode command } 3 { lassign $args process timecode command } default { error "Usage: ?process? timecode command" } } set now [clock_step [current_time]] set scheduled [expr {$timecode*1000+$now}] ::cron::task set $process \ frequency -1 \ command $command \ scheduled $scheduled ::cron::wake NEW return $process } proc ::cron::cancel {process} { if {$::cron::trace > 1} { puts [list ::cron::cancel $process] } ::cron::task delete $process } ### # topic: 0776dccd7e84530fa6412e507c02487c ### proc ::cron::every {process frequency command} { if {$::cron::trace > 1} { puts [list ::cron::every $process $frequency $command] } variable processTable set mnow [clock_step [current_time]] set frequency [expr {$frequency*1000}] ::cron::task set $process \ frequency $frequency \ command $command \ scheduled [expr {$mnow + $frequency}] ::cron::wake NEW } proc ::cron::object_coroutine {objname coroutine {info {}}} { if {$::cron::trace > 1} { puts [list ::cron::object_coroutine $objname $coroutine $info] } task set $coroutine \ {*}$info \ object $objname \ coroutine $coroutine return $coroutine } # Notification that an object has been destroyed, and that # it should give up any toys associated with events proc ::cron::object_destroy {objname} { if {$::cron::trace > 1} { puts [list ::cron::object_destroy $objname] } variable processTable set dat [array get processTable] foreach {process info} $dat { if {[dict exists $info object] && [dict get $info object] eq $objname} { unset -nocomplain processTable($process) } } } ### # topic: 97015814408714af539f35856f85bce6 ### proc ::cron::run process { variable processTable set mnow [clock_step [current_time]] if {[dict exists processTable($process) scheduled] && [dict exists processTable($process) scheduled]>0} { dict set processTable($process) scheduled [expr {$mnow-1000}] } else { dict set processTable($process) lastrun 0 } ::cron::wake PROCESS } proc ::cron::clock_step timecode { return [expr {$timecode-($timecode%1000)}] } proc ::cron::clock_delay {delay} { set now [current_time] set then [clock_step [expr {$delay+$now}]] return [expr {$then-$now}] } # Sleep for X seconds, wake up at the top proc ::cron::clock_sleep {{sec 1} {offset 0}} { set now [current_time] set delay [expr {[clock_delay [expr {$sec*1000}]]+$offset}] sleep $delay } proc ::cron::current_time {} { if {$::cron::time < 0} { return [clock milliseconds] } return $::cron::time } proc ::cron::clock_set newtime { variable time for {} {$time < $newtime} {incr time 100} { uplevel #0 {::cron::do_one_event CLOCK_ADVANCE} } set time $newtime uplevel #0 {::cron::do_one_event CLOCK_ADVANCE} } proc ::cron::once_in_a_while body { set script {set _eventid_ $::cron::current_event} append script $body # Add a safety to allow this while to only execute once per call append script {if {$_eventid_==$::cron::current_event} yield} uplevel 1 [list while 1 $script] } proc ::cron::sleep ms { if {$::cron::trace > 1} { puts [list ::cron::sleep $ms [info coroutine]] } set coro [info coroutine] # When the clock is being externally # controlled, advance the clock when # a sleep is called variable time if {$time >= 0 && $coro eq {}} { ::cron::clock_set [expr {$time+$ms}] return } if {$coro ne {}} { set mnow [current_time] set start $mnow set end [expr {$start+$ms}] set eventid $coro if {$::cron::trace} { puts "::cron::sleep $ms $coro" } # Mark as running task set $eventid scheduled $end coroutine $coro running 1 ::cron::wake WAKE_IN_CORO yield 2 while {$end >= $mnow} { if {$::cron::trace} { puts "::cron::sleep $ms $coro (loop)" } set mnow [current_time] yield 2 } # Mark as not running to resume idle computation task set $eventid running 0 if {$::cron::trace} { puts "/::cron::sleep $ms $coro" } } else { set eventid [incr ::cron::eventcount] set var ::cron::event_#$eventid set $var 0 if {$::cron::trace} { puts "::cron::sleep $ms $eventid waiting for $var" ::after $ms "set $var 1 ; puts \"::cron::sleep - $eventid - FIRED\"" } else { ::after $ms "set $var 1" } ::vwait $var if {$::cron::trace} { puts "/::cron::sleep $ms $eventid" } unset $var } } ### # topic: 21de7bb8db019f3a2fd5a6ae9b38fd55 # description: # Called once per second, and timed to ensure # we run in roughly realtime ### proc ::cron::runTasksCoro {} { ### # Do this forever ### variable processTable variable processing variable all_coroutines variable coroutine_object variable coroutine_busy variable nextevent variable current_event while 1 { incr current_event set lastevent 0 set now [current_time] # Wake me up in 5 minute intervals, just out of principle set nextevent [expr {$now-($now % 300000) + 300000}] set next_idle_event [expr {$now+250}] if {$::cron::trace > 1} { puts [list CRON TASK RUNNER nextevent $nextevent] } ### # Determine what tasks to run this timestep ### set tasks {} set cancellist {} set nexttask {} foreach {process} [lsort -dictionary [array names processTable]] { dict with processTable($process) { if {$::cron::trace > 1} { puts [list CRON TASK RUNNER process $process frequency: $frequency scheduled: $scheduled] } if {$scheduled==0 && $frequency==0} { set lastrun $now set lastevent $now lappend tasks $process } else { if { $scheduled <= $now } { lappend tasks $process if { $frequency < 0 } { lappend cancellist $process } elseif {$frequency==0} { set scheduled 0 if {$::cron::trace > 1} { puts [list CRON TASK RUNNER process $process demoted to idle] } } else { set scheduled [clock_step [expr {$frequency+$lastrun}]] if { $scheduled <= $now } { set scheduled [clock_step [expr {$frequency+$now}]] } if {$::cron::trace > 1} { puts [list CRON TASK RUNNER process $process rescheduled to $scheduled] } } set lastrun $now } set lastevent $now } } } foreach task $tasks { dict set processTable($task) lastrun $now if {[dict exists processTable($task) foreground] && [dict set processTable($task) foreground]} continue if {[dict exists processTable($task) running] && [dict set processTable($task) running]} continue if {$::cron::trace > 2} { puts [list RUNNING $task [task info $task]] } if {[dict exists $processTable($task) coroutine]} { set coro [dict get $processTable($task) coroutine] } else { set coro {} } dict set processTable($task) running 1 if {[dict exists $processTable($task) command]} { set command [dict get $processTable($task) command] } else { set command {} } if {$command eq {} && $coro eq {}} { # Task has nothing to do. Slot it for destruction lappend cancellist $task } elseif {$coro ne {}} { if {[info command $coro] eq {}} { set object [dict get $processTable($task) object] # Trigger coroutine again if a command was given # If this coroutine is associated with an object, ensure # the object still exists before invoking its method if {$command eq {} || ($object ne {} && [info command $object] eq {})} { lappend cancellist $task dict set processTable($task) running 0 continue } if {$::cron::trace} { puts [list RESTARTING $task - coroutine $coro - with $command] } ::coroutine $coro {*}$command } try $coro on return {} { # Terminate the coroutine lappend cancellist $task } on break {} { # Terminate the coroutine lappend cancellist $task } on error {errtxt errdat} { # Coroutine encountered an error lappend cancellist $task puts "ERROR $coro" set errorinfo [dict get $errdat -errorinfo] if {[info exists coroutine_object($coro)] && $coroutine_object($coro) ne {}} { catch { puts "OBJECT: $coroutine_object($coro)" puts "CLASS: [info object class $coroutine_object($coro)]" } } puts "$errtxt" puts *** puts $errorinfo } on continue {result opts} { # Ignore continue if { $result eq "done" } { lappend cancellist $task } } on ok {result opts} { if { $result eq "done" } { lappend cancellist $task } } } else { dict with processTable($task) { set err [catch {uplevel #0 $command} result errdat] if $err { puts "CRON TASK FAILURE:" puts "PROCESS: $task" puts $result puts *** puts [dict get $errdat -errorinfo] } } yield 0 } dict set processTable($task) running 0 } foreach {task} $cancellist { unset -nocomplain processTable($task) } foreach {process} [lsort -dictionary [array names processTable]] { set scheduled 0 set frequency 0 dict with processTable($process) { if {$scheduled==0 && $frequency==0} { if {$next_idle_event < $nextevent} { set nexttask $task set nextevent $next_idle_event } } elseif {$scheduled < $nextevent} { set nexttask $process set nextevent $scheduled } set lastevent $now } } foreach {eventid msec} [array get ::cron::coro_sleep] { if {$msec < 0} continue if {$msec<$nextevent} { set nexttask "CORO $eventid" set nextevent $scheduled } } set delay [expr {$nextevent-$now}] if {$delay <= 0} { yield 0 } else { if {$::cron::trace > 1} { puts "NEXT EVENT $delay - NEXT TASK $nexttask" } yield $delay } } } proc ::cron::wake {{who ???}} { ## # Only triggered by cron jobs kicking off other cron jobs within # the script body ## if {$::cron::trace} { puts "::cron::wake $who" } if {$::cron::busy} { return } after cancel $::cron::next_event set ::cron::next_event [after idle [list ::cron::do_one_event $who]] } proc ::cron::do_one_event {{who ???}} { if {$::cron::trace} { puts "::cron::do_one_event $who" } after cancel $::cron::next_event set now [current_time] set ::cron::busy 1 while {$::cron::busy} { if {[info command ::cron::COROUTINE] eq {}} { ::coroutine ::cron::COROUTINE ::cron::runTasksCoro } set cron_delay [::cron::COROUTINE] if {$cron_delay==0} { if {[incr loops]>10} { if {$::cron::trace} { puts "Breaking out of 10 recursive loops" } set ::cron::wake_time 1000 break } set ::cron::wake_time 0 incr ::cron::loops(active) } else { set ::cron::busy 0 incr ::cron::loops(idle) } } ### # Try to get the event to fire off on the border of the # nearest second ### if {$cron_delay < 10} { set cron_delay 250 } set ctime [current_time] set next [expr {$ctime+$cron_delay}] set ::cron::wake_time [expr {$next/1000}] if {$::cron::trace} { puts [list EVENT LOOP WILL WAKE IN $cron_delay ms next: [clock format $::cron::wake_time -format "%H:%M:%S"] active: $::cron::loops(active) idle: $::cron::loops(idle) woken_by: $who] } set ::cron::next_event [after $cron_delay {::cron::do_one_event TIMER}] } proc ::cron::main {} { # Never launch from a coroutine if {[info coroutine] ne {}} { return } set ::cron::forever 1 while {$::cron::forever} { ::after 120000 {set ::cron::forever 1} # Call an update just to give the rest of the event loop a chance incr ::cron::loops(main) ::after cancel $::cron::next_event set ::cron::next_event [::after idle {::cron::wake MAIN}] set ::cron::forever 1 set ::cron::busy 0 ::vwait ::cron::forever if {$::cron::trace} { puts "MAIN LOOP CYCLE $::cron::loops(main)" } } } ### # topic: 4a891d0caabc6e25fbec9514ea8104dd # description: # This file implements a process table # Instead of having individual components try to maintain their own timers # we centrally manage how often tasks should be kicked off here. ### namespace eval ::cron { variable lastcall 0 variable processTable variable busy 0 variable next_event {} variable trace 0 variable current_event variable time -1 if {![info exists current_event]} { set current_event 0 } if {![info exists ::cron::loops]} { array set ::cron::loops { active 0 main 0 idle 0 wake 0 } } } ::cron::wake STARTUP ### # END: cron.tcl ### ### # START: core.tcl ### package require Tcl 8.6 ;# try in pipeline.tcl. Possibly other things. package require coroutine package require TclOO package require sha1 #package require cron 2.0 #package require oo::dialect ::oo::dialect::create ::tool ::namespace eval ::tool {} set ::tool::trace 0 proc ::tool::script_path {} { set path [file dirname [file join [pwd] [info script]]] |
︙ | ︙ | |||
574 575 576 577 578 579 580 | ### # END: ensemble.tcl ### ### # START: metaclass.tcl ### #------------------------------------------------------------------------- | | | 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 | ### # END: ensemble.tcl ### ### # START: metaclass.tcl ### #------------------------------------------------------------------------- # TITLE: # tool.tcl # # PROJECT: # tool: TclOO Helper Library # # DESCRIPTION: # tool(n): Implementation File |
︙ | ︙ | |||
900 901 902 903 904 905 906 | variable mixins {} variable mixinmap {} variable DestroyEvent 0 constructor args { my Config_merge [::tool::args_to_options {*}$args] } | | | | | | | | | 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 | variable mixins {} variable mixinmap {} variable DestroyEvent 0 constructor args { my Config_merge [::tool::args_to_options {*}$args] } destructor {} method ancestors {{reverse 0}} { set result [::oo::meta::ancestors [info object class [self]]] if {$reverse} { return [lreverse $result] } return $result } method DestroyEvent {} { my variable DestroyEvent return $DestroyEvent } ### # title: Forward a method ### method forward {method args} { oo::objdefine [self] forward $method {*}$args } ### # title: Direct a series of sub-functions to a seperate object ### method graft args { my variable organs if {[llength $args] == 1} { error "Need two arguments" } set object {} foreach {stub object} $args { if {$stub eq "class"} { # Force class to always track the object's current class set obj [info object class [self]] } dict set organs $stub $object oo::objdefine [self] forward <${stub}> $object oo::objdefine [self] export <${stub}> } return $object } # Called after all options and public variables are initialized method initialize {} {} ### # topic: 3c4893b65a1c79b2549b9ee88f23c9e3 # description: # Provide a default value for all options and # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. |
︙ | ︙ | |||
968 969 970 971 972 973 974 | # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. # Note, by default an odie object will ignore # signals until a later call to <i>my lock remove pipeline</i> ### method InitializePublic {} { | | > > > > > > | | 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 | # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. # Note, by default an odie object will ignore # signals until a later call to <i>my lock remove pipeline</i> ### method InitializePublic {} { my variable config meta mixinmap mixins if {![info exists mixins]} { set mixins {} } if {![info exists mixinmap]} { set mixinmap {} } if {![info exists meta]} { set meta {} } if {![info exists config]} { set config {} } my ClassPublicApply {} } class_method info {which} { my variable cache if {![info exists cache($which)]} { set cache($which) {} switch $which { public { dict set cache(public) variable [my meta branchget variable] |
︙ | ︙ | |||
1007 1008 1009 1010 1011 1012 1013 | dict set cache(public) option_canonical $var $var } } } } return $cache($which) } | | | | 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 | dict set cache(public) option_canonical $var $var } } } } return $cache($which) } ### # Incorporate the class's variables, arrays, and options ### method ClassPublicApply class { my variable config set integrate 0 if {$class eq {}} { set class [info object class [self]] } else { set integrate 1 } set public [$class info public] foreach {var value} [dict getnull $public variable] { if { $var in {meta config} } continue my variable $var |
︙ | ︙ | |||
1069 1070 1071 1072 1073 1074 1075 | set script [dict getnull $dat $field set-command:] dict set config $field $val if {$script ne {}} { {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script] } } } | | | 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 | set script [dict getnull $dat $field set-command:] dict set config $field $val if {$script ne {}} { {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script] } } } ### # topic: 3c4893b65a1c79b2549b9ee88f23c9e3 # description: # Provide a default value for all options and # publically declared variables, and locks the # pipeline mutex to prevent signal processing # while the contructor is still running. |
︙ | ︙ | |||
1103 1104 1105 1106 1107 1108 1109 | foreach class $args { if {$class ni $prior} { my meta mixin $class } my ClassPublicApply $class } foreach class $prior { | | | | | 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 | foreach class $args { if {$class ni $prior} { my meta mixin $class } my ClassPublicApply $class } foreach class $prior { if {$class ni $mixins } { my meta mixout $class } } } method mixinmap args { my variable mixinmap set priorlist {} foreach {slot classes} $args { if {[dict exists $mixinmap $slot]} { lappend priorlist {*}[dict get $mixinmap $slot] foreach class [dict get $mixinmap $slot] { if {$class ni $classes && [$class meta exists mixin unmap-script:]} { if {[catch [$class meta get mixin unmap-script:] err errdat]} { puts stderr "[self] MIXIN ERROR POPPING $class:\n[dict get $errdat -errorinfo]" } } } |
︙ | ︙ | |||
1161 1162 1163 1164 1165 1166 1167 | foreach {item class} $mixinmap { if {$class ne {}} { lappend classlist $class } } my mixin {*}$classlist } | | | 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 | foreach {item class} $mixinmap { if {$class ne {}} { lappend classlist $class } } my mixin {*}$classlist } method morph newclass { if {$newclass eq {}} return set class [string trimleft [info object class [self]]] set newclass [string trimleft $newclass :] if {[info command ::$newclass] eq {}} { error "Class $newclass does not exist" } |
︙ | ︙ | |||
1189 1190 1191 1192 1193 1194 1195 | # Commands to perform as this object transitions out of the present class ### method Morph_leave {} {} ### # Commands to perform as this object transitions into this class as a new class ### method Morph_enter {} {} | | | 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 | # Commands to perform as this object transitions out of the present class ### method Morph_leave {} {} ### # Commands to perform as this object transitions into this class as a new class ### method Morph_enter {} {} ### # title: List which objects are forwarded as organs ### method organ {{stub all}} { my variable organs if {![info exists organs]} { return {} |
︙ | ︙ |
Changes to modules/tool/tool.test.
1 2 3 4 5 6 7 8 9 10 11 | # tool.test - Copyright (c) 2015 Sean Woods # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ devtools testutilities.tcl] testsNeedTcl 8.6 testsNeedTcltest 2 testsNeed TclOO 1 | | < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # tool.test - Copyright (c) 2015 Sean Woods # ------------------------------------------------------------------------- source [file join \ [file dirname [file dirname [file join [pwd] [info script]]]] \ devtools testutilities.tcl] testsNeedTcl 8.6 testsNeedTcltest 2 testsNeed TclOO 1 # use oodialect/oodialect.tcl oo::dialect support { use cron/cron.tcl cron use sha1/sha1.tcl sha1 } testing { useLocal tool.tcl tool } # ------------------------------------------------------------------------- |
︙ | ︙ | |||
100 101 102 103 104 105 106 | tool::class create OptionClass2 { superclass OptionClass property mass 1400kg option color {default: blue} } | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | tool::class create OptionClass2 { superclass OptionClass property mass 1400kg option color {default: blue} } OptionClass create ObjectOptionTest1 OptionClass create ObjectOptionTest2 bodystyle wagon transmission standard OptionClass2 create ObjectOptionTest3 OptionClass2 create ObjectOptionTest4 bodystyle SUV transmission cvt color white ### # Property ignores options ### |
︙ | ︙ | |||
412 413 414 415 416 417 418 | if {[string index $tkpath 0] eq "."} { set obj [my new $tkpath {*}[lrange $args 1 end]] $obj tkalias $tkpath return $tkpath } next {*}$args } | | | | 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 | 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 graft 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 graft tkwidget $hullwidget |
︙ | ︙ | |||
465 466 467 468 469 470 471 | my config set $args } } DummyClass create ::DbObj OrganClass create OrganObject db ::DbObj test tool-constructor-args-001 {Test that organs passed as options map correctly} { OrganObject organ db | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | my config set $args } } DummyClass create ::DbObj OrganClass create OrganObject db ::DbObj test tool-constructor-args-001 {Test that organs passed as options map correctly} { OrganObject organ db } {::DbObj} test tool-constructor-args-002 {Test that organs passed as options map correctly} { OrganObject cget db } {::DbObj} tool::object create MorphOrganObject#1 tool::object create MorphOrganObject#2 MorphOrganObject#2 graft db ::DbObj |
︙ | ︙ | |||
575 576 577 578 579 580 581 | } {C} ### # Set of tests to exercise the mixinmap system ### tool::define MixinMainClass { variable mainvar unchanged | | | | | | | | | | 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 | } {C} ### # Set of tests to exercise the mixinmap system ### tool::define MixinMainClass { variable mainvar unchanged method test::which {} { my variable mainvar return $mainvar } method test::main args { puts [list this is main $method $args] } } tool::define MixinTool { variable toolvar unchanged.mixin meta set mixin unmap-script: { my test untool $class } meta set mixin map-script: { my test tool $class } meta set mixin name: {Generic Tool} method test::untool class { my variable toolvar mainvar set mainvar {} set toolvar {} } method test::tool class { my variable toolvar mainvar set mainvar [$class meta get mixin name:] set toolvar [$class meta get mixin name:] } } tool::define MixinToolA { superclass MixinTool meta set mixin name: {Tool A} } |
︙ | ︙ | |||
653 654 655 656 657 658 659 | mixintest test which } {} ### # Coroutine tests ### tool::define coro_example { | | | | 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 | mixintest test which } {} ### # Coroutine tests ### tool::define coro_example { dict_ensemble coro_a_info coro_a_info { initialize { restart 0 phase 0 loop 0 event 0 idle 0 } } coroutine coro_a { my coro_a_info merge { phase 0 loop 0 event 0 idle 0 } |
︙ | ︙ | |||
698 699 700 701 702 703 704 | b { my coro_b send [lrange $event 1 end] } } } } } | | | | 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 | b { my coro_b send [lrange $event 1 end] } } } } } dict_ensemble coro_b_info coro_b_info { initialize { restart 0 phase 0 loop 0 event 0 idle 0 } } coroutine coro_b { my coro_b_info merge { phase 0 loop 0 event 0 idle 0 } |
︙ | ︙ | |||
739 740 741 742 743 744 745 | a { my coro_a [lrange $event 1 end] } } } } } | | | | 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 | a { my coro_a [lrange $event 1 end] } } } } } dict_ensemble coro_yodawg_info coro_yodawg_info { initialize { restart 0 phase 0 loop 0 event 0 idle 0 yodawg 0 } } coroutine coro_yodawg { my coro_yodawg_info merge { phase 0 loop 0 event 0 idle 0 yodawg 0 |
︙ | ︙ |