diff options
author | aspect <aspect+tclcore@abstracted-spleen.org> | 2017-03-27 13:02:22 (GMT) |
---|---|---|
committer | aspect <aspect+tclcore@abstracted-spleen.org> | 2017-03-27 13:02:22 (GMT) |
commit | e18d7f592196530ea7602ea21a0a5341f08f960c (patch) | |
tree | f220dd7bcc08724b00fb9400fcb1df73b3b50bdc | |
parent | e30a832a0e2040dd682f2e77c6d26043e0829d80 (diff) | |
download | tcl-e18d7f592196530ea7602ea21a0a5341f08f960c.zip tcl-e18d7f592196530ea7602ea21a0a5341f08f960c.tar.gz tcl-e18d7f592196530ea7602ea21a0a5341f08f960c.tar.bz2 |
Correct this use of isWanted to ensure NO_IMPLEMENTATION methods are not listed (bug [900cb0284bc])
-rw-r--r-- | generic/tclOOCall.c | 1 | ||||
-rw-r--r-- | tests/oo.test | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c index 8003345..c861eb9 100644 --- a/generic/tclOOCall.c +++ b/generic/tclOOCall.c @@ -618,6 +618,7 @@ AddClassMethodNames( if (isNew) { int isWanted = (!(flags & PUBLIC_METHOD) || (mPtr->flags & PUBLIC_METHOD)) ? IN_LIST : 0; + isWanted |= (mPtr->typePtr == NULL ? NO_IMPLEMENTATION : 0); Tcl_SetHashValue(hPtr, INT2PTR(isWanted)); } else if ((PTR2INT(Tcl_GetHashValue(hPtr)) & NO_IMPLEMENTATION) diff --git a/tests/oo.test b/tests/oo.test index ccb05c1..290e41d 100644 --- a/tests/oo.test +++ b/tests/oo.test @@ -2242,6 +2242,44 @@ test oo-17.10 {OO: class introspection} -setup { info class methods foo -all } -result {} +test oo-17.11 {OO: object method unexport (bug 900cb0284bc)} -setup { + oo::object create o + oo::objdefine o unexport m +} -cleanup { + o destroy +} -body { + expr {"m" in [info object methods o -all -private]} +} -result 0 +test oo-17.12 {OO: instance method unexport (bug 900cb0284bc)} -setup { + oo::class create c + c create o + oo::objdefine o unexport m +} -cleanup { + o destroy + c destroy +} -body { + expr {"m" in [info object methods o -all -private]} +} -result 0 +test oo-17.13 {OO: class method unexport (bug 900cb0284bc)} -setup { + oo::class create c + oo::define c unexport m +} -cleanup { + c destroy +} -body { + expr {"m" in [info class methods c -all -private]} +} -result 0 +test oo-17.14 {OO: instance method unexport (bug 900cb0284bc)} -setup { + oo::class create c + oo::define c unexport m + c create o +} -cleanup { + o destroy + c destroy +} -body { + expr {"m" in [info object methods o -all -private]} +} -result 0 + + test oo-18.1 {OO: define command support} { list [catch {oo::define oo::object {error foo}} msg] $msg $errorInfo } {1 foo {foo |