Changeset 3138 for code/branches/pch/src/tolua/lua/package.lua

Timestamp:

Jun 10, 2009, 4:01:42 PM (15 years ago)

Author:

rgrieder

Message:

Tolua update to v1.0.93 is not working properly and I would not know how to fix it. I have created a patch however, just in case we need it after all.

File:

• code/branches/pch/src/tolua/lua/package.lua (modified) (7 diffs)

code/branches/pch/src/tolua/lua/package.lua

@@ -146 +146 @@
             output('{')
             output(' '..i..'* self = ('..i..'*) tolua_tousertype(tolua_S,1,0);')
-            output('    Mtolua_delete(self);')
+            output('    delete self;')
             output('    return 0;')
             output('}')
@@ -157 +157 @@
     output('static void tolua_reg_types (lua_State* tolua_S)')
     output('{')
-
+    foreach(_usertype,function(n,v) output(' tolua_usertype(tolua_S,"',v,'");') end)
     if flags.t then
         output("#ifndef Mtolua_typeid\n#define Mtolua_typeid(L,TI,T)\n#endif\n")
-    end
-    foreach(_usertype,function(n,v)
-        if (not _global_classes[v]) or _global_classes[v]:check_public_access() then
-            output(' tolua_usertype(tolua_S,"',v,'");')
-            if flags.t then
-                output(' Mtolua_typeid(tolua_S,typeid(',v,'), "',v,'");')
-            end
-        end
-    end)
- output('}')
+        foreach(_usertype,function(n,v) output(' Mtolua_typeid(tolua_S,typeid(',v,'), "',v,'");') end)
+    end
+    output('}')
     output('\n')
 end
@@ -256 +249 @@
 
     -- open input file, if any
-    local st,msg
     if fn then
         local file
@@ -268 +260 @@
             file = flags.f
         end
-        st, msg = readfrom(file)
+        local st, msg = readfrom(file)
         if not st then
             error('#'..msg..' path: '..flags.f)
@@ -274 +266 @@
         local _; _, _, ext = strfind(fn,".*%.(.*)$")
     end
-    local code
-    if ext == 'pkg' then
-        code = prep(st)
-    else
-        code = "\n" .. read('*a')
-        if ext == 'h' or ext == 'hpp' then
-            code = extract_code(fn,code)
-        end
+    local code = "\n" .. read('*a')
+    if ext == 'h' or ext == 'hpp' then
+        code = extract_code(fn,code)
     end
 
@@ -313 +300 @@
                     error('#'..msg..': '..fn)
                 end
-                if kind == 'p' then
-                    local s = prep(fp)
-                    closefile(fp)
-                    return s
-                end
                 local s = read(fp,'*a')
                 closefile(fp)
                 if kind == 'c' or kind == 'h' then
                     return extract_code(fn,s)
+                elseif kind == 'p' then
+                    return "\n\n" .. s
                 elseif kind == 'l' then
                     return "\n$[--##"..fn.."\n" .. s .. "\n$]\n"
@@ -353 +337 @@
 
 
-setmetatable(_extra_parameters, { __index = _G })
-
-function prep(file)
-
-    local chunk = {'local __ret = {"\\n"}\n'}
-    for line in file:lines() do
-        if string.find(line, "^##") then
-            table.insert(chunk, string.sub(line, 3) .. "\n")
-        else
-            local last = 1
-            for text, expr, index in string.gfind(line, "(.-)$(%b())()") do 
-                last = index
-                if text ~= "" then
-                    table.insert(chunk, string.format('table.insert(__ret, %q )', text))
-                end
-                table.insert(chunk, string.format('table.insert(__ret, %s )', expr))
-            end
-            table.insert(chunk, string.format('table.insert(__ret, %q)\n',
-                                string.sub(line, last).."\n"))
-        end
-    end
-    table.insert(chunk, '\nreturn table.concat(__ret)\n')
-    local f,e = loadstring(table.concat(chunk))
-    if e then
-        error("#"..e)
-    end
-    setfenv(f, _extra_parameters)
-    return f()
-end