oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

goodby xobj

Browse source
This commit is contained in:
p.kosyh 2010-06-27 09:43:18 +00:00
parent ec21a2df10
commit 6006dc933f
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stead/Makefile.windows
View file

@ -6,7 +6,7 @@ install:
copy stead.lua ..\bin\stead
copy gui.lua ..\bin\stead
copy goto.lua ..\bin\stead
copy xobj.lua ..\bin\stead
copy xact.lua ..\bin\stead
copy input.lua ..\bin\stead
copy click.lua ..\bin\stead
copy dbg.lua ..\bin\stead

26
stead/xact.lua
View file

@ -21,7 +21,7 @@ xact = function(n, f) -- just simple action!
return v
end
__do_xact = function(str)
__do_xact = function(str, self)
local aarg = {}
local function parg(v)
stead.table.insert(aarg, v);
@ -29,7 +29,7 @@ __do_xact = function(str)
end
local xrefrep = function(str)
local s = stead.string.gsub(str,'[{}]','');
local o,d, a;
local o,d,a, oo;
local i = s:find(":", 1, true);
aarg = {}
if i then
@ -42,15 +42,23 @@ __do_xact = function(str)
a:gsub('[^,()]+', parg);
end
if o == '' then
error("Empty link: "..s, 3);
if isObject(self) then
oo = self
else
error("Empty link: "..s, 3);
end
else
oo = objs():srch(o)
if not oo then
oo = ref(o)
end
end
elseif isObject(self) then
oo = self
d = s;
else
error("Wrong link: "..s, 3);
end
local oo = objs():srch(o)
if not oo then
oo = ref(o)
end
return xref(d, ref(oo), unpack(aarg));
end
if type(str) ~= 'string' then return end
@ -66,9 +74,9 @@ stead.fmt = stead.hook(stead.fmt, function(f, ...)
return r;
end)
xobj = stead.inherit(obj, function(v)
obj = stead.inherit(obj, function(v)
v.xref = function(s, str)
return str
return __do_xact(str, s);
end
return v
end)