library-mirrors/middleclass
1
0
Fork 0
mirror of https://github.com/kikito/middleclass.git synced 2024-10-05 23:24:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

started working on 3.0

Browse Source
This commit is contained in:
kikito 2013-09-16 10:37:56 +02:00
parent cd9609e1ae
commit 219550cd58
2 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
middleclass.lua
View File

@ -125,6 +125,15 @@ end
function Object.static:subclassed(other) end
function Object.static:isSubclassOf(other)
if type(other) ~= 'table' or
type(self) ~= 'table' or
type(self.super) ~= 'table' or
type(self.super.isSubclassOf) ~= 'function' then return false end
return self.super == other or self.super:isSubclassOf(other)
end
function Object.static:include( ... )
assert(self, "Make sure you that you are using 'Class:include' instead of 'Class.include'")
for _,mixin in ipairs({...}) do _includeMixin(self, mixin) end
@ -135,15 +144,13 @@ function Object:initialize() end
function Object:__tostring() return "instance of " .. tostring(self.class) end
function instanceOf(aClass, obj)
if type(aClass) ~= 'table' or type(obj) ~= 'table' or not obj.class then return false end
if obj.class == aClass then return true end
return subclassOf(aClass, obj.class)
end
function Object:isInstanceOf(aClass)
if type(self) ~= 'table' or
type(self.class) ~= 'table' or
type(aClass) ~= 'table' or
type(aClass.isSubclassOf) ~= 'function' then return false end
function subclassOf(other, aClass)
if type(other) ~= 'table' or type(aClass) ~= 'table' or not aClass.super then return false end
return aClass.super == other or subclassOf(other, aClass.super)
return aClass == self.class or aClass:isSubclassOf(self.class)
end
function includes(mixin, aClass)

42
spec/instanceOf_spec.lua
View File

@ -1,7 +1,7 @@
local class = require 'middleclass'
local Object = class.Object
context('instanceOf', function()
context('Object.isInstanceOf', function()
context('nils, integers, strings, tables, and functions', function()
local o = Object:new()
@ -11,9 +11,9 @@ context('instanceOf', function()
local theType = type(primitive)
context('A ' .. theType, function()
local f1 = function() return instanceOf(Object, primitive) end
local f2 = function() return instanceOf(primitive, o) end
local f3 = function() return instanceOf(primitive, primitive) end
local f1 = function() return Object.isInstanceOf(primitive, Object) end
local f2 = function() return Object.isInstanceOf(primitive, o) end
local f3 = function() return Object.isInstanceOf(primitive, primitive) end
context('does not throw errors', function()
test('instanceOf(Object, '.. theType ..')', function()
@ -46,34 +46,34 @@ context('instanceOf', function()
local o1, o2, o3 = Class1:new(), Class2:new(), Class3:new()
test('is instanceOf(Object)', function()
assert_true(instanceOf(Object, o1))
assert_true(instanceOf(Object, o2))
assert_true(instanceOf(Object, o3))
test('isInstanceOf(Object)', function()
assert_true(o1:isInstanceOf(Object))
assert_true(o2:isInstanceOf(Object))
assert_true(o3:isInstanceOf(Object))
end)
test('is instanceOf its class', function()
assert_true(instanceOf(Class1, o1))
assert_true(instanceOf(Class2, o2))
assert_true(instanceOf(Class3, o3))
test('isInstanceOf its class', function()
assert_true(o1:isInstanceOf(Class1))
assert_true(o2:isInstanceOf(Class2))
assert_true(o3:isInstanceOf(Class3))
end)
test('is instanceOf its class\' superclasses', function()
assert_true(instanceOf(Class1, o2))
assert_true(instanceOf(Class1, o3))
assert_true(instanceOf(Class2, o3))
assert_true(o2:isInstanceOf(Class1))
assert_true(o3:isInstanceOf(Class1))
assert_true(o3:isInstanceOf(Class2))
end)
test('is not instanceOf its class\' subclasses', function()
assert_false(instanceOf(Class2, o1))
assert_false(instanceOf(Class3, o1))
assert_false(instanceOf(Class3, o2))
assert_false(o1:isInstanceOf(Class2))
assert_false(o1:isInstanceOf(Class3))
assert_false(o2:isInstanceOf(Class3))
end)
test('is not instanceOf an unrelated class', function()
assert_false(instanceOf(UnrelatedClass, o1))
assert_false(instanceOf(UnrelatedClass, o2))
assert_false(instanceOf(UnrelatedClass, o3))
assert_false(o1:isInstanceOf(UnrelatedClass))
assert_false(o2:isInstanceOf(UnrelatedClass))
assert_false(o3:isInstanceOf(UnrelatedClass))
end)
end)