diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2019-12-31 22:58:01 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2019-12-31 22:58:01 (GMT) |
| commit | c4f94adb460fd2389bbf4b3db9befcbfb97dae0b (patch) | |
| tree | 8de6a6651f12db3e3b5409c06aca51fc402d01a0 /tools/tclOOScript.tcl | |
| parent | d4b3d3a460efcdaa6f0ef897a6c3e52b3331e421 (diff) | |
| download | tcl-c4f94adb460fd2389bbf4b3db9befcbfb97dae0b.zip tcl-c4f94adb460fd2389bbf4b3db9befcbfb97dae0b.tar.gz tcl-c4f94adb460fd2389bbf4b3db9befcbfb97dae0b.tar.bz2 | |
Other list-returning [info class] subcommands are plurals, so change property -> properties
Diffstat (limited to 'tools/tclOOScript.tcl')
| -rw-r--r-- | tools/tclOOScript.tcl | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl index 56a7bf8..095a3ad 100644 --- a/tools/tclOOScript.tcl +++ b/tools/tclOOScript.tcl @@ -528,32 +528,24 @@ } # Install the option + set reader <ReadProp$realprop> + set writer <WriteProp$realprop> switch $kind { readable { - uplevel 2 [list \ - $readslot -append $realprop] - uplevel 2 [list \ - $writeslot -remove $realprop] - uplevel 2 [list \ - method <ReadProp$realprop> {} $getter] + uplevel 2 [list $readslot -append $realprop] + uplevel 2 [list $writeslot -remove $realprop] + uplevel 2 [list method $reader -unexport {} $getter] } writable { - uplevel 2 [list \ - $readslot -remove $realprop] - uplevel 2 [list \ - $writeslot -append $realprop] - uplevel 2 [list \ - method <WriteProp$realprop> {value} $setter] + uplevel 2 [list $readslot -remove $realprop] + uplevel 2 [list $writeslot -append $realprop] + uplevel 2 [list method $writer -unexport {value} $setter] } readwrite { - uplevel 2 [list \ - $readslot -append $realprop] - uplevel 2 [list \ - $writeslot -append $realprop] - uplevel 2 [list \ - method <ReadProp$realprop> {} $getter] - uplevel 2 [list \ - method <WriteProp$realprop> {value} $setter] + uplevel 2 [list $readslot -append $realprop] + uplevel 2 [list $writeslot -append $realprop] + uplevel 2 [list method $reader -unexport {} $getter] + uplevel 2 [list method $writer -unexport {value} $setter] } } } @@ -575,6 +567,8 @@ ::oo::configuresupport::readableproperties \ ::oo::configuresupport::writableproperties {*}$args } + # Plural alias just in case; deliberately NOT documented! + ::proc properties args {::tailcall property {*}$args} ::namespace path ::oo::define ::namespace export property } @@ -585,6 +579,8 @@ ::oo::configuresupport::objreadableproperties \ ::oo::configuresupport::objwritableproperties {*}$args } + # Plural alias just in case; deliberately NOT documented! + ::proc properties args {::tailcall property {*}$args} ::namespace path ::oo::objdefine ::namespace export property } @@ -599,7 +595,7 @@ proc ReadAll {object my} { set result {} - foreach prop [info object property $object -all -readable] { + foreach prop [info object properties $object -all -readable] { try { dict set result $prop [$my <ReadProp$prop>] } on error {msg opt} { @@ -629,7 +625,7 @@ # ------------------------------------------------------------------ proc ReadOne {object my propertyName} { - set props [info object property $object -all -readable] + set props [info object properties $object -all -readable] set prop [prefix match -message "property" -error [list\ -level 2 -errorcode [list \ TCL LOOKUP INDEX property $propertyName]] \ @@ -661,7 +657,7 @@ # ------------------------------------------------------------------ proc WriteMany {object my setterMap} { - set props [info object property $object -all -writable] + set props [info object properties $object -all -writable] foreach {prop value} $setterMap { set prop [prefix match -message "property" -error [list\ -level 2 -errorcode [list \ |