From 5affea737b7efd46ea3f5c9aadfa58a1a5f45af2 Mon Sep 17 00:00:00 2001
From: "p.kosyh"
Date: Fri, 29 Jul 2011 05:30:46 +0000
Subject: [PATCH] savemembers moved to stead, __do_xact hidden
---
stead/dbg.lua | 2 +-
stead/gui.lua | 2 +-
stead/input.lua | 2 +-
stead/object.lua | 2 +-
stead/prefs.lua | 2 +-
stead/stead.lua | 25 +++++++++++++------------
stead/vars.lua | 4 ++--
stead/xact.lua | 6 +++---
8 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/stead/dbg.lua b/stead/dbg.lua
index 0408b69..d6ea219 100644
--- a/stead/dbg.lua
+++ b/stead/dbg.lua
@@ -81,7 +81,7 @@ function disp_obj()
if need then
h:write(stead.string.format("%s = disp_obj();\n", name));
end
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
}
return v;
diff --git a/stead/gui.lua b/stead/gui.lua
index d3018c3..d3a1836 100644
--- a/stead/gui.lua
+++ b/stead/gui.lua
@@ -224,7 +224,7 @@ function menu_save(self, name, h, need)
print ("Warning: menu "..name.." can not be saved!");
return
end
- savemembers(h, self, name, need);
+ stead.savemembers(h, self, name, need);
end
MENU_TAG_ID = 10000
diff --git a/stead/input.lua b/stead/input.lua
index fb5678a..114eed9 100644
--- a/stead/input.lua
+++ b/stead/input.lua
@@ -310,7 +310,7 @@ function inp(n, info, txt)
h:write(stead.string.format("%s = inp (%q, %q, %q);\n",
name, self.nam, self.info, self._txt))
end
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
return obj(v)
end
diff --git a/stead/object.lua b/stead/object.lua
index fb677b7..e5fa69b 100644
--- a/stead/object.lua
+++ b/stead/object.lua
@@ -82,7 +82,7 @@ function vobj_save(self, name, h, need)
stead.tostring(dsc),
stead.tostring(w)));
end
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
function vobj_act(self, ...)
diff --git a/stead/prefs.lua b/stead/prefs.lua
index 77d61a8..7c6f19d 100644
--- a/stead/prefs.lua
+++ b/stead/prefs.lua
@@ -14,7 +14,7 @@ prefs = obj {
local name = get_savepath() .. '/prefs';
local h = stead.io.open(name,"w");
if not h then return false end
- savemembers(h, s, 'prefs', true);
+ stead.savemembers(h, s, 'prefs', true);
h:flush();
h:close();
end,
diff --git a/stead/stead.lua b/stead/stead.lua
index 3b7c994..61b3590 100644
--- a/stead/stead.lua
+++ b/stead/stead.lua
@@ -463,7 +463,7 @@ function obj_save(self, name, h, need)
print ("Warning: object "..name.." can not be saved!");
return
end
- savemembers(h, self, name, need);
+ stead.savemembers(h, self, name, need);
end
function obj_str(self)
@@ -668,7 +668,7 @@ function list_save(self, name, h, need)
h:write(name.." = list({});\n");
need = true;
end
- savemembers(h, self, name, need);
+ stead.savemembers(h, self, name, need);
end
function list_name(self, name, dis)
@@ -931,7 +931,7 @@ function room_save(self, name, h, need)
print ("Warning: room "..name.." can not be saved!");
return
end
- savemembers(h, self, name, need);
+ stead.savemembers(h, self, name, need);
end
function room(v) --constructor
@@ -1166,7 +1166,7 @@ function phrase_save(self, name, h, need)
stead.tostring(self.ans),
stead.tostring(self.do_act)));
end
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
function phrase_look(self, n)
@@ -1417,7 +1417,7 @@ end
function player_save(self, name, h)
h:write(tostring(name)..".where = '"..stead.deref(self.where).."';\n");
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
function player(v)
@@ -1699,7 +1699,7 @@ stead.clearvar = function(v)
end
clearvar = stead.clearvar
-function savemembers(h, self, name, need)
+stead.savemembers = function(h, self, name, need)
local k,v
for k,v in pairs(self) do
local need2
@@ -1717,6 +1717,7 @@ function savemembers(h, self, name, need)
end
end
end
+savemembers = stead.savemembers;
stead.savevar = function(h, v, n, need)
local r,f
@@ -1778,7 +1779,7 @@ stead.savevar = function(h, v, n, need)
h:write(n.." = {};\n");
end
- savemembers(h, v, n, need);
+ stead.savemembers(h, v, n, need);
return;
end
@@ -1864,7 +1865,7 @@ function game_save(self, name, file)
if file ~= nil then
file:write(name..".pl = '"..stead.deref(self.pl).."'\n");
- savemembers(file, self, name, false);
+ stead.savemembers(file, self, name, false);
return nil, true
end
@@ -2280,7 +2281,7 @@ function allocator_save(s, name, h, need, auto)
end
end
end
- savemembers(h, s, name, false);
+ stead.savemembers(h, s, name, false);
if s.auto_allocated then
s.auto_saved = true
end
@@ -2310,7 +2311,7 @@ function vobj_save(self, name, h, need)
stead.tostring(w)));
end
- savemembers(h, self, name,false);
+ stead.savemembers(h, self, name,false);
end
function vobj_act(self, ...)
@@ -2342,7 +2343,7 @@ function vroom_save(self, name, h, need)
if need then
h:write(name.." = vroom('"..self.nam.."','"..stead.deref(self.where).."');\n");
end
- savemembers(h, self, name,false);
+ stead.savemembers(h, self, name,false);
end
function vroom_enter(self, ...)
@@ -2929,7 +2930,7 @@ stead.objects = function(s)
end,
objects = {
save = function(self, name, h, need)
- savemembers(h, self, name, true);
+ stead.savemembers(h, self, name, true);
end,
},
};
diff --git a/stead/vars.lua b/stead/vars.lua
index 7636d95..b686dc3 100644
--- a/stead/vars.lua
+++ b/stead/vars.lua
@@ -13,7 +13,7 @@ function isForSave(k, v, s) -- k - key, v - value, s -- parent table
return stead.string.find(k, '_') == 1
end
-function __vars_add(s, v, set)
+local function __vars_add(s, v, set)
local k, o
for k,o in pairs(v) do
if tonumber(k) then
@@ -34,7 +34,7 @@ function __vars_add(s, v, set)
end
end
-function __vars_fill(v)
+local function __vars_fill(v)
local k,o
if type(v) ~= 'table' then
return
diff --git a/stead/xact.lua b/stead/xact.lua
index 0eac986..380ef0b 100644
--- a/stead/xact.lua
+++ b/stead/xact.lua
@@ -22,12 +22,12 @@ xact = function(n, f) -- just simple action!
end
h:write(stead.string.format("%s = xact(%q, %s);\n", name, self.nam, f))
end
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
return v
end
-__do_xact = function(str, self)
+local __do_xact = function(str, self)
local aarg = {}
local function parg(v)
stead.table.insert(aarg, v);
@@ -116,7 +116,7 @@ function xdsc(n)
if need then
h:write(stead.string.format("%s = xdsc(%q);\n", name, self.disp))
end
- savemembers(h, self, name, false);
+ stead.savemembers(h, self, name, false);
end
return obj(v)
end