From 3014bcc45bf978c49946ef3308fe013b5a0174ea Mon Sep 17 00:00:00 2001 From: Manuel Simon Hirsig Date: Mon, 28 Nov 2016 12:15:41 +0100 Subject: [PATCH] bugfix for libraries --- libs/T.lua | 2 +- libs/module.lua | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/T.lua b/libs/T.lua index d212416..26c32d4 100644 --- a/libs/T.lua +++ b/libs/T.lua @@ -1,4 +1,4 @@ -library 'T' +if module 'T' then return end local next, getn, setn, tremove, setmetatable = next, getn, table.setn, tremove, setmetatable diff --git a/libs/module.lua b/libs/module.lua index d7aeadd..126be3f 100644 --- a/libs/module.lua +++ b/libs/module.lua @@ -60,6 +60,5 @@ function create_module(name) loaded[name], loaded[public_modifier] = P, P end -function module(name) if not loaded[name] then create_module(name) end setfenv(2, environments[name]) end -function library(name) if loaded[name] then _G.error(nil) end create_module(name) setfenv(2, environments[name]) end +function module(name) local loaded = loaded[name] if not loaded then create_module(name) end setfenv(2, environments[name]); return loaded end function require(name) if not loaded[name] then create_module(name) end return interfaces[name] end \ No newline at end of file