Module:Lua class - Revision history

Lemondoge: Fixing short-circuit in ternary expression (`lorem and nil or ipsum` short-circuits to `ipsum`, because nil is falsy; however, `not lorem and ipsum or nil` works as intended)

2023-05-06T18:06:46Z

Fixing short-circuit in ternary expression (`lorem and nil or ipsum` short-circuits to `ipsum`, because nil is falsy; however, `not lorem and ipsum or nil` works as intended)

← Previous revision		Revision as of 18:06, 6 May 2023
Line 215:		Line 215:
	setmetatable(self_public, mt)		setmetatable(self_public, mt)
	instances[self_public] = self_private		instances[self_public] = self_private
	return self_public, classes[wrapper] and ~~nil~~ or ~~self_private~~ -- so that constructions in private scopes have access to private instances		return self_public, not classes[wrapper] and self_private or nil -- so that constructions in private scopes have access to private instances
	end		end

Alexiscoutinho: Made "class" and "constructor" appropriately return the created private object and added option to suppress default_hash if __eq is not defined

2022-08-28T20:44:48Z

Made "class" and "constructor" appropriately return the created private object and added option to suppress default_hash if __eq is not defined

← Previous revision		Revision as of 20:44, 28 August 2022
Line 215:		Line 215:
	setmetatable(self_public, mt)		setmetatable(self_public, mt)
	instances[self_public] = self_private		instances[self_public] = self_private
			return self_public, classes[wrapper] and nil or self_private -- so that constructions in private scopes have access to private instances
	return self_public
	end		end

Line 296:		Line 296:
	}		}

	local function ~~hash~~(obj_private)		local function default_hash(obj_private)
	if ~~not~~ obj_private.__hash then -- not inheritable		if obj_private.__hash == nil then -- not inheritable
	obj_private.__hash = tonumber('0x' .. mw.hash.hashValue('fnv1a32', tostring(os.time() + math.random())))		obj_private.__hash = tonumber('0x' .. mw.hash.hashValue('fnv1a32', tostring(os.time() + math.random())))
	end		end
Line 447:		Line 447:

	cls.__normalmethods.hash = true		cls.__normalmethods.hash = true
	cls.hash = function () return ~~hash~~(cls_private) end -- classes are always hashable so this is independent from _hash		cls.hash = function () return default_hash(cls_private) end -- classes are always hashable so this is independent from _hash
	cls.hash()		cls.hash()

			-- see https://docs.python.org/3/reference/datamodel.html#object.__hash__
	if kwargs.__eq == nil then		if kwargs.__eq == nil then
	if kwargs._hash ~~~= nil~~ then		if kwargs._hash then
	warn("ValueWarning: _hash is defined but not __eq, which is expected", 2)		warn("ValueWarning: _hash is defined but not __eq, which is expected", 2)
			elseif kwargs._hash == false then
			kwargs._hash = nil
	else		else
	kwargs._hash = ~~hash~~		kwargs._hash = default_hash
	end		end
	end		end
Line 527:		Line 530:
	setmetatable(cls_public, cls_public_mt)		setmetatable(cls_public, cls_public_mt)
	classes[cls_public] = cls_private		classes[cls_public] = cls_private
	return cls_public		return cls_public, cls_private
	end		end

Alexiscoutinho: Added warning when missing __eq but not _hash and added __metatable to classes and instances proxies

2021-08-05T12:55:04Z

Added warning when missing __eq but not _hash and added __metatable to classes and instances proxies

← Previous revision		Revision as of 12:55, 5 August 2021
Line 450:		Line 450:
	cls.hash()		cls.hash()

	if kwargs.__eq == nil ~~and~~ kwargs._hash == nil then		if kwargs.__eq == nil then
			if kwargs._hash ~= nil then
			warn("ValueWarning: _hash is defined but not __eq, which is expected", 2)
⚫	kwargs._hash = hash
			else
		⚫	kwargs._hash = hash
			end
	end		end
	if kwargs._hash ~= nil then		if kwargs._hash ~= nil then
Line 755:		Line 759:
	setmetatable(classes_proxy, {		setmetatable(classes_proxy, {
	__index = classes, -- create function to limit access only to modules which define the requested classes and testcases pages		__index = classes, -- create function to limit access only to modules which define the requested classes and testcases pages
	__newindex = function () error("KeyError: forbidden write attempt to classes proxy", 2) end		__newindex = function () error("KeyError: forbidden write attempt to classes proxy", 2) end,
			__metatable = "unauthorized access attempt of classes proxy metatable"
	})		})

	setmetatable(instances_proxy, {		setmetatable(instances_proxy, {
	__index = instances, -- create function to limit access only to testcases pages		__index = instances, -- create function to limit access only to testcases pages
	__newindex = function () error("KeyError: forbidden write attempt to instances proxy", 2) end		__newindex = function () error("KeyError: forbidden write attempt to instances proxy", 2) end,
			__metatable = "unauthorized access attempt of instances proxy metatable"
	})		})

Alexiscoutinho: Improved hash function to not tamper with or depend on the "math" seed

2021-08-02T19:35:16Z

Improved hash function to not tamper with or depend on the "math" seed

← Previous revision		Revision as of 19:35, 2 August 2021
Line 295:		Line 295:
	__metatable = "unauthorized access attempt of wrapper object metatable"		__metatable = "unauthorized access attempt of wrapper object metatable"
	}		}

	math.randomseed(os.time())

	local function hash(obj_private)		local function hash(obj_private)
	if not obj_private.__hash then -- not inheritable		if not obj_private.__hash then -- not inheritable
	obj_private.__hash = ~~math~~.~~floor~~(~~math~~.~~random~~() * 2^32) -- due to math.random ~~bug in Lua 5.1~~		obj_private.__hash = tonumber('0x' .. mw.hash.hashValue('fnv1a32', tostring(os.time() + math.random())))
	end		end
	return obj_private.__hash		return obj_private.__hash

Alexiscoutinho: Added garbage collection. Split registry tables to simplify access control in proxies for certain modules. Fixed incorrect error message in isinstance.

2021-08-01T23:01:03Z

Added garbage collection. Split registry tables to simplify access control in proxies for certain modules. Fixed incorrect error message in isinstance.

Show changes

Alexiscoutinho: Made private and internal objects only accessible via "classes" and "instances"

2021-07-29T17:32:06Z

Made private and internal objects only accessible via "classes" and "instances"

← Previous revision		Revision as of 17:32, 29 July 2021
Line 521:		Line 521:
	setmetatable(cls_public, cls_public_mt)		setmetatable(cls_public, cls_public_mt)
	classes[cls_public] = cls_private		classes[cls_public] = cls_private
			return cls_public
	return cls_public, cls_private -- cls_private should not be accesible outside the module which defined it!
			end
	end --make it a proxy to try to enforce behavior?


Line 742:		Line 742:
	end		end

	return classes, instances--		return {classes, instances} -- make them proxies to try to control access/indexing

Alexiscoutinho: Generalized isinstance to support checking if a value is an(y) instance

2021-07-24T23:50:06Z

Generalized isinstance to support checking if a value is an(y) instance

← Previous revision		Revision as of 23:50, 24 July 2021
Line 558:		Line 558:
	function isinstance(instance, classinfo)		function isinstance(instance, classinfo)
	instance = instances[instance]		instance = instances[instance]
			if classinfo == nil then
⚫	if instance then -- because named (ClassName) instances would fail with checkType
	return ~~rissubclass1(classes[~~instance~~.__class],~~ ~~classinfo,~~ ~~'isinstance',~~ 4)		return instance and true or false
	end		end
		⚫	if not instance then -- because named (ClassName) instances would fail with checkType
	error(("TypeError: bad argument #1 to 'isinstance' (instance expected, got %s)"):format(type(instance)), 2)		error(("TypeError: bad argument #1 to 'isinstance' (instance expected, got %s)"):format(type(instance)), 2)
			end
			return rissubclass1(classes[instance.__class], classinfo, 'isinstance', 4)
	end		end

Alexiscoutinho: Turned overridden libraryUtil local, but still accessible to other modules. Added warnings. Made error handling go brrr. Implemented hashing. Completed error levels. Optimized closures. Returned cls_private from "class". And a little more.

2021-07-21T22:48:08Z

Turned overridden libraryUtil local, but still accessible to other modules. Added warnings. Made error handling go brrr. Implemented hashing. Completed error levels. Optimized closures. Returned cls_private from "class". And a little more.

Show changes

Alexiscoutinho: Fixed bug where "type" calls below _G.type used the local (original) function

2021-07-12T05:10:24Z

Fixed bug where "type" calls below _G.type used the local (original) function

@@ Line 419: / Line 419: @@
 	end
 	error(("TypeError: bad argument #1 to 'isinstance' (instance expected, got %s)"):format(type(instance)), 2)
 end
@@ Line 495: / Line 509: @@
 	end
 	error(("TypeError: bad named argument %s to '%s' (%s expected, got %s)"):format(argName, name, typeList, type(arg)), level or 3)
 end

Alexiscoutinho: Fixed numeric indexing spillover into classes

2021-07-10T04:43:41Z

Fixed numeric indexing spillover into classes

← Previous revision		Revision as of 04:43, 10 July 2021
Line 61:		Line 61:
	local inst_mt = {		local inst_mt = {
	__index = function (self, key)		__index = function (self, key)
			if tonumber(key) then
			return nil -- don't search numeric keys in classes
			end
	return self.__class[key] -- key could be misbehaved here without issues as __index(cls_private, key) would handle it		return self.__class[key] -- key could be misbehaved here without issues as __index(cls_private, key) would handle it
	end,		end,