View difference between Paste ID: 2qPybHqp and zvdvQLCy

-wO={}
+local classes={}
-wO.global={}
+
-wO.global.clone=function(self) local cloneObj={} for i,v in pairs(self) do cloneObj[i]=v end return cloneObj end
+--Objects/proxies
-wO.global.isA=function(self, arg)
+
-	if self.className==arg then
+local function functionToTable(tab)
-		return true
+
-	elseif self.className~="base" then
+	mt.__call=
-		if self.extends:isA(arg) then
+	function(a,...)
 		local prevSelf=self
 		self=tab
 		local src=a.func
-		return false
+		local ret={pcall(src,...)}
 		if not ret[1] then
 			assert(pcall(src))
-wO.global.className="base"
+
-wO.global.__settings={new=function(...) return {} end}
+		table.remove(ret,1)
-wO.global.omt={}
+		self=prevSelf
 		return unpack(ret)
-setmetatable(wO.global, {__tostring=function(a) return "Class "..a.className end})
+
 	for i,v in pairs(tab) do
-wO.classes={base=wO.global}
+		if type(v)=="function" then
 			local oldV=v
 			tab[i]={func=oldV}
 			setmetatable(tab[i],mt)
 		end
-	b.extends=(type(arg[2])=="table" and wO.classes[arg[1]] or wO.classes["base"])
+
 end
 
 local function createProxy(o,omt)
-	mt.__index=b.extends
+	local proxy=newproxy(true)
 	local mt=getmetatable(proxy)
 
-	if not b.mt then
+	for i,v in pairs(omt) do
-		b.mt=mt
+		mt[i]=v
 	end
-		for i,v in pairs(mt) do
+
-			table.insert(b.mt)
+	mt.__index=
 	function(tab,ind)
 		if not ind:find("__") then
-	setmetatable(b, b.mt)
+			if o[ind]~=nil then
-	wO.classes[a]=b
+				return o[ind]
-end
+			else
 				error("Value not found : "..ind)
 			end
-	local o=(wO.classes[a].__settings.new(...))
+		elseif bypassing and ind=="___bypassing" then
 			return tab.___self
-	for i,v in pairs(wO.classes[a].omt) do
+
 			error("Private value : "..ind)
 		end
-	omt.__index=wO.classes[a]
+
-	setmetatable(o, omt)
+
-	return o
+	mt.__newindex=
 	function(tab,ind,val)
 		if not ind:find("_") then
 			if o[ind] then
 				o[ind]=val
 			else
 				error("Value not found : "..ind)
 			end
 		else
 			error("Read only or private value : "..ind)
 		end
 	end
 
 	mt.__metatable=false
 	return proxy
 end
 
 local function newObj(a,...)
 	local arg={...}
 	local o
-setmetatable(_G,{__index=function(_,a) return (a=="class" and addClass or (a==("newObj" or "new") and newObj or (wO.classes[a] or nil))) end}) --Ugly piece of code.
+	local class
 	if arg[1]=="bypassNewFunc" then
 		o={}
 		class=classes[a] or {}
 	else
 		o=((classes[a]) and classes[a].__settings.new(...) or {})
 		class=classes[a] or {}
 	end
 	local omt={}
 	for i,v in pairs((class.__omt or (classes["base"] or {}))) do
 		omt[i]=v
 	end
 	omt.__index=class
 	setmetatable(o,omt)
 	for i,v in pairs(class) do
 		o[i]=(o[i] or v)
 	end
 	o.___self=o
 	functionToTable(o)
 	local proxy=createProxy(o,omt)
 	return proxy
 end
 
 --Classes
 
 local function newClass(a, ...)
 	arg={...}
 	b=(type(arg[1])=="table" and arg[1] or arg[2])
 	b.extends=classes[(type(arg[2])=="table" and arg[1] or "base")] or {}
 	b.className=a
 	b.name=a.."Obj"
 	local mt=(b.__mt or {})
 	mt.__tostring=function(a) return "Class "..a.className end
 	mt.__call=function(a,...) local arg={...} return newObj(a.className,...) end
 	mt.__concat=function(a,b) return tostring(a)..tostring(b) end
 	if not b.__mt then
 		b.__mt=mt
 	end
 	setmetatable(b, b.__mt)
 	classes[a]=b
 	for i,v in pairs(b.extends) do
 		if not b[i] then
 			b[i]=v
 		end
 	end
 	b.extends=newObj(b.extends.className,"bypassNewFunc")
 	_G[a]=b
 end
 
 local function addClassInheritance(name, b)
 	return function(...)
 		newClass(name, b, arg[1])
 	end
 end
 
 local function addClass(name)
 	return function(...)
 		local arg={...}
 		if type(arg[1])=="table" then
 			newClass(name,...)
 		else
 			return addClassInheritance(name,arg[1])
 		end
 	end
 end
 
 function class(name)
 	return addClass(name)
 end
 
 --load default classes and such
 
 class "base"
 {
 	isA=
 	function(arg)
 		if self.className==arg then
 			return true
 		elseif self.className~="base" then
 			if self.extends.isA(arg) then
 				return true
 			end
 		else
 			return false
 		end
 	end,
 
 	className="base",
 	__settings={new=function(...) return {} end},
 	__omt={__tostring=function(a) return "Object "..a.className end,__concat=function(a,b) return tostring(a)..tostring(b) end},
 	__mt={__tostring=function(a) return "Class "..a.className end}
 }