library-mirrors/middleclass
1
0
Fork 0
mirror of https://github.com/kikito/middleclass.git synced 2024-11-25 02:44:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adds string arg for isInstanceOf and isSubclassOf

Browse Source
This commit is contained in:
Timothy 2018-01-21 20:57:34 -06:00
parent f9955f9285
commit b3bca2a238
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
middleclass.lua
View File

@ -119,7 +119,9 @@ local DefaultMixin = {
initialize = function(self, ...) end,
isInstanceOf = function(self, aClass)
return type(aClass) == 'table' and (aClass == self.class or self.class:isSubclassOf(aClass))
return (type(aClass) == 'table' and (aClass == self.class)) or
(type(aClass) == 'string' and (aClass == self.class)) or
(self.class:isSubclassOf(aClass))
end,
static = {
@ -155,9 +157,9 @@ local DefaultMixin = {
subclassed = function(self, other) end,
isSubclassOf = function(self, other)
return type(other) == 'table' and
type(self.super) == 'table' and
( self.super == other or self.super:isSubclassOf(other) )
return (type(other) == 'table' and type(self.super) == 'table' and ( self.super == other)) or
(type(other) == 'string' and type(self.super) == 'table' and (self.super.name == other)) or
(self.super:isSubclassOf(other) )
end,
include = function(self, ...)