rpm/lua-toluapp
SHA256
1
0
Fork 0
forked from pool/lua-toluapp
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-toluapp?expand=0&rev=7

Browse Source
This commit is contained in:
Tomáš Chvátal 2017-07-14 12:40:50 +00:00 committed by Git OBS Bridge
parent 65d3bd8e98
commit aad66479db
1 changed files with 159 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
tolua++-1.0.93-lua52.patch
View File

@ -1,6 +1,7 @@
diff -urN tolua++-1.0.93/config_linux.py tolua++-1.0.93.lua52/config_linux.py Index: toluapp-1.0.93/config_linux.py
--- tolua++-1.0.93/config_linux.py 2005-11-30 23:31:27.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/config_linux.py 2014-09-30 18:42:00.850195336 +0200 --- toluapp-1.0.93.orig/config_linux.py
+++ toluapp-1.0.93/config_linux.py
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
# Compiler flags (based on Debian's installation of lua) # Compiler flags (based on Debian's installation of lua)
@ -10,17 +11,18 @@ diff -urN tolua++-1.0.93/config_linux.py tolua++-1.0.93.lua52/config_linux.py
#CCFLAGS = ['-I/usr/include/lua50', '-g'] #CCFLAGS = ['-I/usr/include/lua50', '-g']
# this is the default directory for installation. Files will be installed on # this is the default directory for installation. Files will be installed on
@@ -18,5 +18,5 @@ @@ -18,5 +18,5 @@ CCFLAGS = ['-I/usr/include/lua50', '-O2'
prefix = '/usr/local' prefix = '/usr/local'
# libraries (based on Debian's installation of lua) # libraries (based on Debian's installation of lua)
-LIBS = ['lua50', 'lualib50', 'dl', 'm'] -LIBS = ['lua50', 'lualib50', 'dl', 'm']
+LIBS = ['lua', 'dl', 'm'] +LIBS = ['lua', 'dl', 'm']
diff -urN tolua++-1.0.93/SConstruct tolua++-1.0.93.lua52/SConstruct Index: toluapp-1.0.93/SConstruct
--- tolua++-1.0.93/SConstruct 2008-04-21 02:05:35.000000000 +0200 ===================================================================
+++ tolua++-1.0.93.lua52/SConstruct 2014-10-01 13:51:40.837513339 +0200 --- toluapp-1.0.93.orig/SConstruct
@@ -82,6 +82,8 @@ +++ toluapp-1.0.93/SConstruct
@@ -85,6 +85,8 @@ def make_tolua_code(self, target, source
header = target[:-2] + '.h' header = target[:-2] + '.h'
pheader = Dir('.').path + '/' + header pheader = Dir('.').path + '/' + header
@ -29,9 +31,10 @@ diff -urN tolua++-1.0.93/SConstruct tolua++-1.0.93.lua52/SConstruct
tolua = "" tolua = ""
if bootstrap: if bootstrap:
if os.name == 'nt': if os.name == 'nt':
diff -urN tolua++-1.0.93/src/bin/lua/all.lua tolua++-1.0.93.lua52/src/bin/lua/all.lua Index: toluapp-1.0.93/src/bin/lua/all.lua
--- tolua++-1.0.93/src/bin/lua/all.lua 2007-07-03 08:03:38.000000000 +0200 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/all.lua 2014-10-01 16:30:26.057393850 +0200 --- toluapp-1.0.93.orig/src/bin/lua/all.lua
+++ toluapp-1.0.93/src/bin/lua/all.lua
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
dofile(path.."compat-5.1.lua") dofile(path.."compat-5.1.lua")
dofile(path.."compat.lua") dofile(path.."compat.lua")
@ -42,10 +45,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/all.lua tolua++-1.0.93.lua52/src/bin/lua/al
dofile(path.."code.lua") dofile(path.."code.lua")
dofile(path.."typedef.lua") dofile(path.."typedef.lua")
dofile(path.."container.lua") dofile(path.."container.lua")
diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/basic.lua Index: toluapp-1.0.93/src/bin/lua/basic.lua
--- tolua++-1.0.93/src/bin/lua/basic.lua 2008-11-11 19:14:49.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/basic.lua 2014-10-01 16:30:26.112391980 +0200 --- toluapp-1.0.93.orig/src/bin/lua/basic.lua
@@ -75,8 +75,8 @@ +++ toluapp-1.0.93/src/bin/lua/basic.lua
@@ -75,8 +75,8 @@ function appendrenaming (s)
end end
function applyrenaming (s) function applyrenaming (s)
@ -56,7 +60,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/
if n ~= 0 then if n ~= 0 then
return m return m
end end
@@ -252,7 +252,8 @@ @@ -252,7 +252,8 @@ end
-- concatenate all parameters, following output rules -- concatenate all parameters, following output rules
function concatparam (line, ...) function concatparam (line, ...)
local i=1 local i=1
@ -66,7 +70,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/
if _cont and not strfind(_cont,'[%(,"]') and if _cont and not strfind(_cont,'[%(,"]') and
strfind(arg[i],"^[%a_~]") then strfind(arg[i],"^[%a_~]") then
line = line .. ' ' line = line .. ' '
@@ -263,7 +264,7 @@ @@ -263,7 +264,7 @@ function concatparam (line, ...)
end end
i = i+1 i = i+1
end end
@ -75,7 +79,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/
_cont=nil line = line .. '\n' _cont=nil line = line .. '\n'
end end
return line return line
@@ -272,7 +273,8 @@ @@ -272,7 +273,8 @@ end
-- output line -- output line
function output (...) function output (...)
local i=1 local i=1
@ -85,7 +89,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/
if _cont and not strfind(_cont,'[%(,"]') and if _cont and not strfind(_cont,'[%(,"]') and
strfind(arg[i],"^[%a_~]") then strfind(arg[i],"^[%a_~]") then
write(' ') write(' ')
@@ -283,7 +285,7 @@ @@ -283,7 +285,7 @@ function output (...)
end end
i = i+1 i = i+1
end end
@ -94,7 +98,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/
_cont=nil write('\n') _cont=nil write('\n')
end end
end end
@@ -373,9 +375,10 @@ @@ -373,9 +375,10 @@ function pre_register_hook(package)
end end
@ -106,10 +110,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/basic.lua tolua++-1.0.93.lua52/src/bin/lua/
end end
-- custom pushers -- custom pushers
diff -urN tolua++-1.0.93/src/bin/lua/class.lua tolua++-1.0.93.lua52/src/bin/lua/class.lua Index: toluapp-1.0.93/src/bin/lua/class.lua
--- tolua++-1.0.93/src/bin/lua/class.lua 2007-11-28 06:31:35.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/class.lua 2014-10-01 16:30:26.129391402 +0200 --- toluapp-1.0.93.orig/src/bin/lua/class.lua
@@ -92,7 +92,7 @@ +++ toluapp-1.0.93/src/bin/lua/class.lua
@@ -92,7 +92,7 @@ function classClass:decltype ()
self.btype = typevar(self.base) self.btype = typevar(self.base)
self.ctype = 'const '..self.type self.ctype = 'const '..self.type
if self.extra_bases then if self.extra_bases then
@ -118,7 +123,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/class.lua tolua++-1.0.93.lua52/src/bin/lua/
self.extra_bases[i] = typevar(self.extra_bases[i]) self.extra_bases[i] = typevar(self.extra_bases[i])
end end
end end
@@ -138,9 +138,9 @@ @@ -138,9 +138,9 @@ end
-- Expects the name, the base (array) and the body of the class. -- Expects the name, the base (array) and the body of the class.
function Class (n,p,b) function Class (n,p,b)
@ -130,10 +135,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/class.lua tolua++-1.0.93.lua52/src/bin/lua/
b = b.."\n tolua_inherits "..p[i].." __"..p[i].."__;\n" b = b.."\n tolua_inherits "..p[i].." __"..p[i].."__;\n"
end end
b = b.."\n}" b = b.."\n}"
diff -urN tolua++-1.0.93/src/bin/lua/clean.lua tolua++-1.0.93.lua52/src/bin/lua/clean.lua Index: toluapp-1.0.93/src/bin/lua/clean.lua
--- tolua++-1.0.93/src/bin/lua/clean.lua 2005-11-30 23:31:27.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/clean.lua 2014-10-01 16:30:26.133391266 +0200 --- toluapp-1.0.93.orig/src/bin/lua/clean.lua
@@ -19,14 +19,14 @@ +++ toluapp-1.0.93/src/bin/lua/clean.lua
@@ -19,14 +19,14 @@ MASK = { -- the substitution order is im
} }
function mask (s) function mask (s)
@ -150,10 +156,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/clean.lua tolua++-1.0.93.lua52/src/bin/lua/
s = gsub(s,MASK[i][1],MASK[i][2]) s = gsub(s,MASK[i][1],MASK[i][2])
end end
return s return s
diff -urN tolua++-1.0.93/src/bin/lua/compat-5.1.lua tolua++-1.0.93.lua52/src/bin/lua/compat-5.1.lua Index: toluapp-1.0.93/src/bin/lua/compat-5.1.lua
--- tolua++-1.0.93/src/bin/lua/compat-5.1.lua 2007-07-03 08:03:38.000000000 +0200 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/compat-5.1.lua 2014-10-01 16:30:26.169390042 +0200 --- toluapp-1.0.93.orig/src/bin/lua/compat-5.1.lua
@@ -25,10 +25,10 @@ +++ toluapp-1.0.93/src/bin/lua/compat-5.1.lua
@@ -25,10 +25,10 @@ local function pp_dofile(path)
end end
end end
@ -166,10 +173,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/compat-5.1.lua tolua++-1.0.93.lua52/src/bin
end end
return f() return f()
end end
diff -urN tolua++-1.0.93/src/bin/lua/compat.lua tolua++-1.0.93.lua52/src/bin/lua/compat.lua Index: toluapp-1.0.93/src/bin/lua/compat.lua
--- tolua++-1.0.93/src/bin/lua/compat.lua 2005-11-30 23:31:27.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/compat.lua 2014-10-01 16:30:26.173389906 +0200 --- toluapp-1.0.93.orig/src/bin/lua/compat.lua
@@ -40,15 +40,13 @@ +++ toluapp-1.0.93/src/bin/lua/compat.lua
@@ -40,15 +40,13 @@ function do_ (f, err)
end end
end end
@ -187,7 +195,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/compat.lua tolua++-1.0.93.lua52/src/bin/lua
tinsert = tab.insert tinsert = tab.insert
tremove = tab.remove tremove = tab.remove
sort = tab.sort sort = tab.sort
@@ -78,7 +76,7 @@ @@ -78,7 +76,7 @@ floor = math.floor
frexp = math.frexp frexp = math.frexp
ldexp = math.ldexp ldexp = math.ldexp
log = math.log log = math.log
@ -196,7 +204,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/compat.lua tolua++-1.0.93.lua52/src/bin/lua
max = math.max max = math.max
min = math.min min = math.min
mod = math.mod mod = math.mod
@@ -177,17 +175,19 @@ @@ -177,17 +175,19 @@ end
function read (...) function read (...)
local f = _INPUT local f = _INPUT
@ -218,10 +226,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/compat.lua tolua++-1.0.93.lua52/src/bin/lua
+ return f:write(table.unpack(arg)) + return f:write(table.unpack(arg))
end end
diff -urN tolua++-1.0.93/src/bin/lua/declaration.lua tolua++-1.0.93.lua52/src/bin/lua/declaration.lua Index: toluapp-1.0.93/src/bin/lua/declaration.lua
--- tolua++-1.0.93/src/bin/lua/declaration.lua 2008-07-18 07:27:24.000000000 +0200 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/declaration.lua 2014-10-01 16:30:26.309385281 +0200 --- toluapp-1.0.93.orig/src/bin/lua/declaration.lua
@@ -137,7 +137,7 @@ +++ toluapp-1.0.93/src/bin/lua/declaration.lua
@@ -137,7 +137,7 @@ function resolve_template_types(type)
if b then if b then
m = split_c_tokens(string.sub(m, 2, -2), ",") m = split_c_tokens(string.sub(m, 2, -2), ",")
@ -230,7 +239,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/declaration.lua tolua++-1.0.93.lua52/src/bi
m[i] = string.gsub(m[i],"%s*([%*&])", "%1") m[i] = string.gsub(m[i],"%s*([%*&])", "%1")
if not isbasic(m[i]) then if not isbasic(m[i]) then
if not isenum(m[i]) then _, m[i] = applytypedef("", m[i]) end if not isenum(m[i]) then _, m[i] = applytypedef("", m[i]) end
@@ -522,7 +522,7 @@ @@ -522,7 +522,7 @@ function Declaration (s,kind,is_paramete
end end
-- check the form: mod type* name -- check the form: mod type* name
@ -239,10 +248,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/declaration.lua tolua++-1.0.93.lua52/src/bi
t = split_c_tokens(s1,'%*') t = split_c_tokens(s1,'%*')
if t.n == 2 then if t.n == 2 then
t[2] = gsub(t[2],'\1','%*') -- restore * in dimension expression t[2] = gsub(t[2],'\1','%*') -- restore * in dimension expression
diff -urN tolua++-1.0.93/src/bin/lua/feature.lua tolua++-1.0.93.lua52/src/bin/lua/feature.lua Index: toluapp-1.0.93/src/bin/lua/feature.lua
--- tolua++-1.0.93/src/bin/lua/feature.lua 2007-10-30 02:58:17.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/feature.lua 2014-10-01 16:30:26.362383479 +0200 --- toluapp-1.0.93.orig/src/bin/lua/feature.lua
@@ -132,7 +132,7 @@ +++ toluapp-1.0.93/src/bin/lua/feature.lua
@@ -132,7 +132,7 @@ function classFeature:cfuncname (n)
if not fname or fname == '' then if not fname or fname == '' then
fname = self.name fname = self.name
end end
@ -251,10 +261,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/feature.lua tolua++-1.0.93.lua52/src/bin/lu
return n return n
end end
diff -urN tolua++-1.0.93/src/bin/lua/function.lua tolua++-1.0.93.lua52/src/bin/lua/function.lua Index: toluapp-1.0.93/src/bin/lua/function.lua
--- tolua++-1.0.93/src/bin/lua/function.lua 2008-11-11 19:14:49.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/function.lua 2014-10-01 16:30:26.415381678 +0200 --- toluapp-1.0.93.orig/src/bin/lua/function.lua
@@ -520,7 +520,7 @@ +++ toluapp-1.0.93/src/bin/lua/function.lua
@@ -520,7 +520,7 @@ end
function join(t, sep, first, last) function join(t, sep, first, last)
first = first or 1 first = first or 1
@ -263,10 +274,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/function.lua tolua++-1.0.93.lua52/src/bin/l
local lsep = "" local lsep = ""
local ret = "" local ret = ""
local loop = false local loop = false
diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lua/package.lua Index: toluapp-1.0.93/src/bin/lua/package.lua
--- tolua++-1.0.93/src/bin/lua/package.lua 2007-10-30 02:58:17.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/package.lua 2014-10-01 16:30:26.539377462 +0200 --- toluapp-1.0.93.orig/src/bin/lua/package.lua
@@ -39,7 +39,7 @@ +++ toluapp-1.0.93/src/bin/lua/package.lua
@@ -39,7 +39,7 @@ function classPackage:preprocess ()
self.code = gsub(self.code,"\n%s*%$%]","\2") self.code = gsub(self.code,"\n%s*%$%]","\2")
self.code = gsub(self.code,"(%b\1\2)", function (c) self.code = gsub(self.code,"(%b\1\2)", function (c)
tinsert(L,c) tinsert(L,c)
@ -275,7 +287,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
end) end)
-- avoid preprocessing embedded C code -- avoid preprocessing embedded C code
local C = {} local C = {}
@@ -47,14 +47,14 @@ @@ -47,14 +47,14 @@ function classPackage:preprocess ()
self.code = gsub(self.code,"\n%s*%$%>","\4") self.code = gsub(self.code,"\n%s*%$%>","\4")
self.code = gsub(self.code,"(%b\3\4)", function (c) self.code = gsub(self.code,"(%b\3\4)", function (c)
tinsert(C,c) tinsert(C,c)
@ -292,7 +304,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
end) end)
--self.code = gsub(self.code,"\n%s*#[^d][^\n]*\n", "\n\n") -- eliminate preprocessor directives that don't start with 'd' --self.code = gsub(self.code,"\n%s*#[^d][^\n]*\n", "\n\n") -- eliminate preprocessor directives that don't start with 'd'
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@ function classPackage:preprocess ()
local V = {} local V = {}
self.code = gsub(self.code,"\n(%s*%$[^%[%]][^\n]*)",function (v) self.code = gsub(self.code,"\n(%s*%$[^%[%]][^\n]*)",function (v)
tinsert(V,v) tinsert(V,v)
@ -301,7 +313,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
end) end)
-- perform global substitution -- perform global substitution
@@ -152,14 +152,14 @@ @@ -152,14 +152,14 @@ function classPackage:preamble ()
if flags.t then if flags.t then
output("#ifndef Mtolua_typeid\n#define Mtolua_typeid(L,TI,T)\n#endif\n") output("#ifndef Mtolua_typeid\n#define Mtolua_typeid(L,TI,T)\n#endif\n")
end end
@ -318,7 +330,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
output('}') output('}')
output('\n') output('\n')
end end
@@ -288,7 +288,7 @@ @@ -288,7 +288,7 @@ function Package (name,fn)
local t = {code=s} local t = {code=s}
extra = string.gsub(extra, "^%s*,%s*", "") extra = string.gsub(extra, "^%s*,%s*", "")
local pars = split_c_tokens(extra, ",") local pars = split_c_tokens(extra, ",")
@ -327,7 +339,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
return "\n\n" .. t.code return "\n\n" .. t.code
else else
error('#Invalid include directive (use $cfile, $pfile, $lfile or $ifile)') error('#Invalid include directive (use $cfile, $pfile, $lfile or $ifile)')
@@ -322,7 +322,7 @@ @@ -322,7 +322,7 @@ function prep(file)
table.insert(chunk, string.sub(line, 3) .. "\n") table.insert(chunk, string.sub(line, 3) .. "\n")
else else
local last = 1 local last = 1
@ -336,7 +348,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
last = index last = index
if text ~= "" then if text ~= "" then
table.insert(chunk, string.format('table.insert(__ret, %q )', text)) table.insert(chunk, string.format('table.insert(__ret, %q )', text))
@@ -334,10 +334,9 @@ @@ -334,10 +334,9 @@ function prep(file)
end end
end end
table.insert(chunk, '\nreturn table.concat(__ret)\n') table.insert(chunk, '\nreturn table.concat(__ret)\n')
@ -348,10 +360,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/package.lua tolua++-1.0.93.lua52/src/bin/lu
- setfenv(f, _extra_parameters) - setfenv(f, _extra_parameters)
return f() return f()
end end
diff -urN tolua++-1.0.93/src/bin/lua/template_class.lua tolua++-1.0.93.lua52/src/bin/lua/template_class.lua Index: toluapp-1.0.93/src/bin/lua/template_class.lua
--- tolua++-1.0.93/src/bin/lua/template_class.lua 2007-11-28 06:31:35.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/lua/template_class.lua 2014-10-01 16:30:26.563376645 +0200 --- toluapp-1.0.93.orig/src/bin/lua/template_class.lua
@@ -22,7 +22,7 @@ +++ toluapp-1.0.93/src/bin/lua/template_class.lua
@@ -22,7 +22,7 @@ function classTemplateClass:throw(types,
for i =1 , types.n do for i =1 , types.n do
local Il = split_c_tokens(types[i], " ") local Il = split_c_tokens(types[i], " ")
@ -360,7 +373,7 @@ diff -urN tolua++-1.0.93/src/bin/lua/template_class.lua tolua++-1.0.93.lua52/src
error("#invalid parameter count for "..types[i]) error("#invalid parameter count for "..types[i])
end end
local bI = self.body local bI = self.body
@@ -31,16 +31,16 @@ @@ -31,16 +31,16 @@ function classTemplateClass:throw(types,
--Tl[j] = findtype(Tl[j]) or Tl[j] --Tl[j] = findtype(Tl[j]) or Tl[j]
bI = string.gsub(bI, "([^_%w])"..self.args[j].."([^_%w])", "%1"..Il[j].."%2") bI = string.gsub(bI, "([^_%w])"..self.args[j].."([^_%w])", "%1"..Il[j].."%2")
if self.parents then if self.parents then
@ -380,10 +393,11 @@ diff -urN tolua++-1.0.93/src/bin/lua/template_class.lua tolua++-1.0.93.lua52/src
--pI[i] = string.gsub(pI[i], ">>", "> >") --pI[i] = string.gsub(pI[i], ">>", "> >")
pI[i] = resolve_template_types(pI[i]) pI[i] = resolve_template_types(pI[i])
end end
diff -urN tolua++-1.0.93/src/bin/tolua.c tolua++-1.0.93.lua52/src/bin/tolua.c Index: toluapp-1.0.93/src/bin/tolua.c
--- tolua++-1.0.93/src/bin/tolua.c 2006-07-29 04:45:56.000000000 +0200 ===================================================================
+++ tolua++-1.0.93.lua52/src/bin/tolua.c 2014-09-30 18:42:00.823196281 +0200 --- toluapp-1.0.93.orig/src/bin/tolua.c
@@ -67,7 +67,11 @@ +++ toluapp-1.0.93/src/bin/tolua.c
@@ -67,7 +67,11 @@ static void setfield (lua_State* L, int
static void add_extra (lua_State* L, char* value) { static void add_extra (lua_State* L, char* value) {
int len; int len;
lua_getglobal(L, "_extra_parameters"); lua_getglobal(L, "_extra_parameters");
@ -395,9 +409,47 @@ diff -urN tolua++-1.0.93/src/bin/tolua.c tolua++-1.0.93.lua52/src/bin/tolua.c
lua_pushstring(L, value); lua_pushstring(L, value);
lua_rawseti(L, -2, len+1); lua_rawseti(L, -2, len+1);
lua_pop(L, 1); lua_pop(L, 1);
diff -urN tolua++-1.0.93/src/lib/tolua_event.c tolua++-1.0.93.lua52/src/lib/tolua_event.c @@ -145,7 +149,7 @@ int main (int argc, char* argv[])
--- tolua++-1.0.93/src/lib/tolua_event.c 2006-10-14 08:18:11.000000000 +0200 }
+++ tolua++-1.0.93.lua52/src/lib/tolua_event.c 2014-10-06 11:32:46.162013835 +0200 lua_pop(L,1);
}
-/* #define TOLUA_SCRIPT_RUN */
+#define TOLUA_SCRIPT_RUN
#ifndef TOLUA_SCRIPT_RUN
{
int tolua_tolua_open (lua_State* L);
@@ -153,16 +157,17 @@ int main (int argc, char* argv[])
}
#else
{
- char* p;
- char path[BUFSIZ];
- strcpy(path,argv[0]);
- p = strrchr(path,'/');
- if (p==NULL) p = strrchr(path,'\\');
- p = (p==NULL) ? path : p+1;
- sprintf(p,"%s","../src/bin/lua/");
- lua_pushstring(L,path); lua_setglobal(L,"path");
- strcat(path,"all.lua");
- lua_dofile(L,path);
+ lua_pushstring(L, "/usr/share/toluapp/luapp/"); lua_setglobal(L,"path");
+ if (luaL_loadfile(L, "/usr/share/toluapp/luapp/all.lua") != 0) {
+ fprintf(stderr, "luaL_loadfile failed\n");
+ return 1;
+ }
+ if (lua_pcall(L, 0,0,0) != 0) {
+ const char *errmsg = lua_tostring(L, -1);
+ fprintf(stderr, "lua_pcall failed: %s\n", errmsg);
+ lua_pop(L, 1);
+ return 1;
+ }
}
#endif
return 0;
Index: toluapp-1.0.93/src/lib/tolua_event.c
===================================================================
--- toluapp-1.0.93.orig/src/lib/tolua_event.c
+++ toluapp-1.0.93/src/lib/tolua_event.c
@@ -23,12 +23,20 @@ @@ -23,12 +23,20 @@
static void storeatubox (lua_State* L, int lo) static void storeatubox (lua_State* L, int lo)
{ {
@ -419,7 +471,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_event.c tolua++-1.0.93.lua52/src/lib/tolu
}; };
lua_insert(L, -3); lua_insert(L, -3);
lua_settable(L, -3); /* on lua 5.1, we trade the "tolua_peers" lookup for a settable call */ lua_settable(L, -3); /* on lua 5.1, we trade the "tolua_peers" lookup for a settable call */
@@ -141,7 +149,11 @@ @@ -141,7 +149,11 @@ static int class_index_event (lua_State*
{ {
/* Access alternative table */ /* Access alternative table */
#ifdef LUA_VERSION_NUM /* new macro on version 5.1 */ #ifdef LUA_VERSION_NUM /* new macro on version 5.1 */
@ -431,7 +483,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_event.c tolua++-1.0.93.lua52/src/lib/tolu
if (!lua_rawequal(L, -1, TOLUA_NOPEER)) { if (!lua_rawequal(L, -1, TOLUA_NOPEER)) {
lua_pushvalue(L, 2); /* key */ lua_pushvalue(L, 2); /* key */
lua_gettable(L, -2); /* on lua 5.1, we trade the "tolua_peers" lookup for a gettable call */ lua_gettable(L, -2); /* on lua 5.1, we trade the "tolua_peers" lookup for a gettable call */
@@ -420,6 +432,8 @@ @@ -420,6 +432,8 @@ static int class_gc_event (lua_State* L)
*/ */
TOLUA_API int class_gc_event (lua_State* L) TOLUA_API int class_gc_event (lua_State* L)
{ {
@ -440,7 +492,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_event.c tolua++-1.0.93.lua52/src/lib/tolu
void* u = *((void**)lua_touserdata(L,1)); void* u = *((void**)lua_touserdata(L,1));
int top; int top;
/*fprintf(stderr, "collecting: looking at %p\n", u);*/ /*fprintf(stderr, "collecting: looking at %p\n", u);*/
@@ -427,7 +441,8 @@ @@ -427,7 +441,8 @@ TOLUA_API int class_gc_event (lua_State*
lua_pushstring(L,"tolua_gc"); lua_pushstring(L,"tolua_gc");
lua_rawget(L,LUA_REGISTRYINDEX); lua_rawget(L,LUA_REGISTRYINDEX);
*/ */
@ -450,7 +502,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_event.c tolua++-1.0.93.lua52/src/lib/tolu
lua_pushlightuserdata(L,u); lua_pushlightuserdata(L,u);
lua_rawget(L,-2); /* stack: gc umt */ lua_rawget(L,-2); /* stack: gc umt */
lua_getmetatable(L,1); /* stack: gc umt mt */ lua_getmetatable(L,1); /* stack: gc umt mt */
@@ -456,6 +471,7 @@ @@ -456,6 +471,7 @@ TOLUA_API int class_gc_event (lua_State*
lua_rawset(L,-5); /* stack: gc umt mt */ lua_rawset(L,-5); /* stack: gc umt mt */
} }
lua_pop(L,3); lua_pop(L,3);
@ -458,10 +510,11 @@ diff -urN tolua++-1.0.93/src/lib/tolua_event.c tolua++-1.0.93.lua52/src/lib/tolu
return 0; return 0;
} }
diff -urN tolua++-1.0.93/src/lib/tolua_map.c tolua++-1.0.93.lua52/src/lib/tolua_map.c Index: toluapp-1.0.93/src/lib/tolua_map.c
--- tolua++-1.0.93/src/lib/tolua_map.c 2009-02-14 04:06:32.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/lib/tolua_map.c 2014-09-30 18:42:00.836195826 +0200 --- toluapp-1.0.93.orig/src/lib/tolua_map.c
@@ -262,8 +262,12 @@ +++ toluapp-1.0.93/src/lib/tolua_map.c
@@ -262,8 +262,12 @@ static int tolua_bnd_setpeer(lua_State*
lua_pop(L, 1); lua_pop(L, 1);
lua_pushvalue(L, TOLUA_NOPEER); lua_pushvalue(L, TOLUA_NOPEER);
@ -475,7 +528,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_map.c tolua++-1.0.93.lua52/src/lib/tolua_
return 0; return 0;
}; };
@@ -271,7 +275,11 @@ @@ -271,7 +275,11 @@ static int tolua_bnd_setpeer(lua_State*
static int tolua_bnd_getpeer(lua_State* L) { static int tolua_bnd_getpeer(lua_State* L) {
/* stack: userdata */ /* stack: userdata */
@ -487,7 +540,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_map.c tolua++-1.0.93.lua52/src/lib/tolua_
if (lua_rawequal(L, -1, TOLUA_NOPEER)) { if (lua_rawequal(L, -1, TOLUA_NOPEER)) {
lua_pop(L, 1); lua_pop(L, 1);
lua_pushnil(L); lua_pushnil(L);
@@ -411,7 +419,11 @@ @@ -411,7 +419,11 @@ TOLUA_API void tolua_beginmodule (lua_St
lua_rawget(L,-2); lua_rawget(L,-2);
} }
else else
@ -499,7 +552,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_map.c tolua++-1.0.93.lua52/src/lib/tolua_
} }
/* End module /* End module
@@ -445,7 +457,11 @@ @@ -445,7 +457,11 @@ TOLUA_API void tolua_module (lua_State*
else else
{ {
/* global table */ /* global table */
@ -511,7 +564,7 @@ diff -urN tolua++-1.0.93/src/lib/tolua_map.c tolua++-1.0.93.lua52/src/lib/tolua_
} }
if (hasvar) if (hasvar)
{ {
@@ -473,7 +489,11 @@ @@ -473,7 +489,11 @@ TOLUA_API void tolua_module (lua_State*
else else
{ {
/* global table */ /* global table */
@ -523,10 +576,11 @@ diff -urN tolua++-1.0.93/src/lib/tolua_map.c tolua++-1.0.93.lua52/src/lib/tolua_
} }
if (hasvar) if (hasvar)
{ {
diff -urN tolua++-1.0.93/src/lib/tolua_push.c tolua++-1.0.93.lua52/src/lib/tolua_push.c Index: toluapp-1.0.93/src/lib/tolua_push.c
--- tolua++-1.0.93/src/lib/tolua_push.c 2007-02-10 03:43:56.000000000 +0100 ===================================================================
+++ tolua++-1.0.93.lua52/src/lib/tolua_push.c 2014-09-30 18:42:00.844195546 +0200 --- toluapp-1.0.93.orig/src/lib/tolua_push.c
@@ -79,7 +79,11 @@ +++ toluapp-1.0.93/src/lib/tolua_push.c
@@ -79,7 +79,11 @@ TOLUA_API void tolua_pushusertype (lua_S
#ifdef LUA_VERSION_NUM #ifdef LUA_VERSION_NUM
lua_pushvalue(L, TOLUA_NOPEER); lua_pushvalue(L, TOLUA_NOPEER);
@ -538,3 +592,18 @@ diff -urN tolua++-1.0.93/src/lib/tolua_push.c tolua++-1.0.93.lua52/src/lib/tolua
#endif #endif
} }
else else
Index: toluapp-1.0.93/src/bin/SCsub
===================================================================
--- toluapp-1.0.93.orig/src/bin/SCsub
+++ toluapp-1.0.93/src/bin/SCsub
@@ -5,8 +5,8 @@ src = [
]
-toluabind = env.LuaBinding('toluabind.c', 'tolua_scons.pkg', 'tolua', bootstrap = True)
+#toluabind = env.LuaBinding('toluabind.c', 'tolua_scons.pkg', 'tolua', bootstrap = True)
-env.bin_target = env.Program('#/bin/'+env['tolua_bin'], src + [toluabind], LIBS = ['$tolua_lib'] + env['LIBS'])
+env.bin_target = env.Program('#/bin/'+env['tolua_bin'], src, LIBS = ['$tolua_lib'] + env['LIBS'])
env.bootstrap_target = env.Program('#/bin/'+env['TOLUAPP_BOOTSTRAP'], src + ['toluabind_default.c', env.lib_target_static], LIBS = env['LIBS'])