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

Timestamp:

Jun 10, 2009, 4:01:42 PM (16 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.

Location:

code/branches/pch/src/tolua/lua

Files:

• array.lua (modified) (4 diffs)
• basic.lua (modified) (3 diffs)
• class.lua (modified) (3 diffs)
• code.lua (modified) (1 diff)
• compat-5.1.lua (modified) (1 diff)
• container.lua (modified) (5 diffs)
• declaration.lua (modified) (10 diffs)
• doit.lua (modified) (2 diffs)
• enumerate.lua (modified) (2 diffs)
• feature.lua (modified) (4 diffs)
• function.lua (modified) (15 diffs)
• operator.lua (modified) (4 diffs)
• package.lua (modified) (7 diffs)
• template_class.lua (deleted)
• variable.lua (modified) (11 diffs)

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

@@ -102 +102 @@
     -- return value
     local t,ct = isbasic(self.type)
-    local push_func = get_push_function(t)
     if t then
         output(' tolua_push'..t..'(tolua_S,(',ct,')'..self:getvalue(class,static)..');')
@@ -108 +107 @@
         t = self.type
         if self.ptr == '&' or self.ptr == '' then
-            output(' ',push_func,'(tolua_S,(void*)&'..self:getvalue(class,static)..',"',t,'");')
-        else
-            output(' ',push_func,'(tolua_S,(void*)'..self:getvalue(class,static)..',"',t,'");')
+            output(' tolua_pushusertype(tolua_S,(void*)&'..self:getvalue(class,static)..',"',t,'");')
+        else
+            output(' tolua_pushusertype(tolua_S,(void*)'..self:getvalue(class,static)..',"',t,'");')
         end
     end
@@ -194 +193 @@
             output('tolua_to'..t,'(tolua_S,3,',def,'));')
         else
-            local to_func = get_to_function(self.type)
-            output(to_func,'(tolua_S,3,',def,'));')
+            output('tolua_tousertype(tolua_S,3,',def,'));')
         end
         output(' return 0;')
@@ -205 +203 @@
 
 function classArray:register (pre)
-    if not self:check_public_access() then
-        return
-    end
-
     pre = pre or ''
     if self.csetname then

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

@@ -112 +112 @@
 
 function warning (msg)
-    if flags.q then
-        return
-    end
     local out = _OUTPUT
     _OUTPUT = _STDERR
@@ -336 +333 @@
 end
 
--- called before starting output
-function pre_output_hook(package)
-
-end
 
 -- called after writing all the output.
@@ -361 +354 @@
 end
 
--- called from classFunction:supcode, before the call to the function is output
-function pre_call_hook(f)
-
-end
-
--- called from classFunction:supcode, after the call to the function is output
-function post_call_hook(f)
-
-end
-
--- called before the register code is output
-function pre_register_hook(package)
-
-end
-
--- called to output an error message
-function output_error_hook(str, arg)
-    return string.format(str, arg)
-end
-
--- custom pushers
-
-_push_functions = {}
-_is_functions = {}
-_to_functions = {}
-
-_base_push_functions = {}
-_base_is_functions = {}
-_base_to_functions = {}
-
-local function search_base(t, funcs)
-    local class = _global_classes[t]
-
-    while class do
-        if funcs[class.type] then
-            return funcs[class.type]
-        end
-        class = _global_classes[class.btype]
-    end
-    return nil
-end
-
-function get_push_function(t)
-    return _push_functions[t] or search_base(t, _base_push_functions) or "tolua_pushusertype"
-end
-
-function get_to_function(t)
-    return _to_functions[t] or search_base(t, _base_to_functions) or "tolua_tousertype"
-end
- 
-function get_is_function(t)
-    return _is_functions[t] or search_base(t, _base_is_functions) or "tolua_isusertype"
-end
-
+

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

@@ -64 +64 @@
 -- return collection requirement
 function classClass:requirecollection (t)
-    if self.flags.protected_destructor or (not self:check_public_access()) then
+    if self.flags.protected_destructor then
         return false
     end
@@ -148 +148 @@
     -- check for template
     b = string.gsub(b, "^{%s*TEMPLATE_BIND", "{\nTOLUA_TEMPLATE_BIND")
-    local t,_,T,I = string.find(b, '^{%s*TOLUA_TEMPLATE_BIND%s*%(+%s*\"?([^\",]*)\"?%s*,%s*([^%)]*)%s*%)+')
+    local t,_,T,I = string.find(b, "^{%s*TOLUA_TEMPLATE_BIND%s*%(+%s*\"?([^\",]*)\"?%s*,%s*([^%)]*)%s*%)+")
     if t then
 
@@ -159 +159 @@
         local bs = string.gsub(b, "^{%s*TOLUA_TEMPLATE_BIND[^\n]*\n", "{\n")
 
-        local Tl = split(T, " ")
-        local tc = TemplateClass(n, p, bs, Tl)
-
-        tc:throw(types, true)
-        --for i=1,types.n do
-        --    tc:throw(split_c_tokens(types[i], " "), true)
-        --end
+        -- replace
+        for i =1 , types.n do
+
+            local Tl = split(T, " ")
+            local Il = split_c_tokens(types[i], " ")
+            local bI = bs
+            local pI = {}
+            for j = 1,Tl.n do
+                Tl[j] = findtype(Tl[j]) or Tl[j]
+                bI = string.gsub(bI, "([^_%w])"..Tl[j].."([^_%w])", "%1"..Il[j].."%2")
+                if p then
+                    for i=1,table.getn(p) do
+                        pI[i] = string.gsub(p[i], "([^_%w]?)"..Tl[j].."([^_%w]?)", "%1"..Il[j].."%2")
+                    end
+                end
+            end
+            --local append = "<"..string.gsub(types[i], "%s+", ",")..">"
+            local append = "<"..concat(Il, 1, table.getn(Il), ",")..">"
+            append = string.gsub(append, "%s*,%s*", ",")
+            append = string.gsub(append, ">>", "> >")
+            for i=1,table.getn(pI) do
+                --pI[i] = string.gsub(pI[i], ">>", "> >")
+                pI[i] = resolve_template_types(pI[i])
+            end
+            bI = string.gsub(bI, ">>", "> >")
+            Class(n..append, pI, bI)
+        end
         return
     end

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

@@ -47 +47 @@
     end
 
-    -- pad to 16 bytes
-    local npad = 16 - (#s % 16)
-    local spad = ""
-    for i=1,npad do
-        spad = spad .. "-"
-    end
-    s = s..spad
-
     -- convert to C
     output('\n'..pre..'{ /* begin embedded lua code */\n')
     output(pre..' int top = lua_gettop(tolua_S);')
-    output(pre..' static const unsigned char B[] = {\n   ')
+    output(pre..' static unsigned char B[] = {\n   ')
     local t={n=0}
     local b = gsub(s, '(.)',

code/branches/pch/src/tolua/lua/compat-5.1.lua

@@ -26 +26 @@
 
     local f = load(getfile, path)
-    if not f then
-        error("error loading file "..path)
-    end
     return f()
 end

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

@@ -615 +615 @@
             b,e,decl,arg,const = strfind(s,"^%s*([_%w])%s*(%b())%s*(c?o?n?s?t?)%s*;%s*")
         end
-        if not b then
-            -- try function pointer
-            b,e,decl,arg,const = strfind(s,"^%s*([^%(;\n]+%b())%s*(%b())%s*;%s*")
-            if b then
-                decl = string.gsub(decl, "%(%s*%*([^%)]*)%s*%)", " %1 ")
-            end
-        end
         if b then
             if virt and string.find(virt, "[=0]") then
@@ -654 +647 @@
         base = '' body = ''
         b,e,name = strfind(s,"^%s*class%s*([_%w][_%w@]*)%s*;")  -- dummy class
-        local dummy = false
         if not b then
             b,e,name = strfind(s,"^%s*struct%s*([_%w][_%w@]*)%s*;")    -- dummy struct
             if not b then
-                b,e,name,base,body = strfind(s,"^%s*class%s*([_%w][_%w@]*)%s*([^{]-)%s*(%b{})%s*")
+                b,e,name,base,body = strfind(s,"^%s*class%s*([_%w][_%w@]*)%s*(.-)%s*(%b{})%s*;%s*")
                 if not b then
-                    b,e,name,base,body = strfind(s,"^%s*struct%s+([_%w][_%w@]*)%s*([^{]-)%s*(%b{})%s*")
+                    b,e,name,base,body = strfind(s,"^%s*struct%s*([_%w][_%w@]*)%s*(.-)%s*(%b{})%s*;%s*")
                     if not b then
-                        b,e,name,base,body = strfind(s,"^%s*union%s*([_%w][_%w@]*)%s*([^{]-)%s*(%b{})%s*")
+                        b,e,name,base,body = strfind(s,"^%s*union%s*([_%w][_%w@]*)%s*(.-)%s*(%b{})%s*;%s*")
                         if not b then
                             base = ''
-                            b,e,body,name = strfind(s,"^%s*typedef%s%s*struct%s%s*[_%w]*%s*(%b{})%s*([_%w][_%w@]*)%s*;")
+                            b,e,body,name = strfind(s,"^%s*typedef%s%s*struct%s%s*[_%w]*%s*(%b{})%s*([_%w][_%w@]*)%s*;%s*")
                         end
                     end
                 end
-            else dummy = 1 end
-        else dummy = 1 end
+            end
+        end
         if b then
             if base ~= '' then
@@ -683 +675 @@
             _curr_code = strsub(s,b,e)
             Class(name,base,body)
-            if not dummy then
-                varb,vare,varname = string.find(s, "^%s*([_%w]+)%s*;", e+1)
-                if varb then
-                    Variable(name.." "..varname)
-                    e = vare
-                end
-            end
             return strsub(s,e+1)
         end
@@ -738 +723 @@
     -- try array
     do
-    local b,e,decl = strfind(s,"^%s*([_%w][][_@%s%w%d%*&:<>]*[]_%w%d])%s*;%s*")
+        local b,e,decl = strfind(s,"^%s*([_%w][][_@%s%w%d%*&:]*[]_%w%d])%s*;%s*")
         if b then
             _curr_code = strsub(s,b,e)
@@ -758 +743 @@
 function classContainer:parse (s)
 
-    --self.curr_member_access = nil
+    self.curr_member_access = nil
 
     while s ~= '' do

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

@@ -140 +140 @@
         for i=1, table.getn(m) do
             m[i] = string.gsub(m[i],"%s*([%*&])", "%1")
-            if not isbasic(m[i]) then
-                if not isenum(m[i]) then _, m[i] = applytypedef("", m[i]) end
-                m[i] = findtype(m[i]) or m[i]
-                m[i] = resolve_template_types(m[i])
-            end
+            m[i] = findtype(m[i]) or m[i]
+            m[i] = resolve_template_types(m[i])
         end
 
         local b,i
         type,b,i = break_template(type)
-        --print("concat is ",concat(m, 1, m.n))
-        local template_part = "<"..concat(m, 1, m.n, ",")..">"
+        local template_part = "<"..string.gsub(concat(m, 1, m.n), " ", ",")..">"
         type = rebuild_template(type, b, template_part)
         type = string.gsub(type, ">>", "> >")
@@ -191 +187 @@
 -- check if array of values are returned to Lua
 function classDeclaration:requirecollection (t)
-    if self.mod ~= 'const' and
+ if self.mod ~= 'const' and
         self.dim and self.dim ~= '' and
                  not isbasic(self.type) and
-                 self.ptr == '' and self:check_public_access() then
+                 self.ptr == '' then
         local type = gsub(self.type,"%s*const%s+","")
         t[type] = "tolua_collect_" .. clean_template(type)
@@ -226 +222 @@
         --    return 'tolua_isstringarray(tolua_S,'..narg..','..def..',&tolua_err)'
         --else
-        return '!tolua_istable(tolua_S,'..narg..',0,&tolua_err)'
+        return 'tolua_istable(tolua_S,'..narg..',0,&tolua_err)'
         --end
     elseif t then
-        return '!tolua_is'..t..'(tolua_S,'..narg..','..def..',&tolua_err)'
-    else
-        local is_func = get_is_function(self.type)
-        if self.ptr == '&' or self.ptr == '' then
-            return '(tolua_isvaluenil(tolua_S,'..narg..',&tolua_err) || !'..is_func..'(tolua_S,'..narg..',"'..self.type..'",'..def..',&tolua_err))'
-        else
-            return '!'..is_func..'(tolua_S,'..narg..',"'..self.type..'",'..def..',&tolua_err)'
-        end
-   end
+        return 'tolua_is'..t..'(tolua_S,'..narg..','..def..',&tolua_err)'
+    else
+        return 'tolua_isusertype(tolua_S,'..narg..',"'..self.type..'",'..def..',&tolua_err)'
+    end
 end
 
@@ -246 +237 @@
     local mod
     local type = self.type
-    local nctype = gsub(self.type,'const%s+','')
     if self.dim ~= '' then
         type = gsub(self.type,'const%s+','')  -- eliminates const modifier for arrays
@@ -261 +251 @@
         else
             if cplusplus then
-                line = concatparam(line,' = Mtolua_new_dim(',type,ptr,', '..self.dim..');')
+                line = concatparam(line,' = new',type,ptr,'['..self.dim..'];')
             else
                 line = concatparam(line,' = (',type,ptr,'*)',
@@ -283 +273 @@
             end
             line = concatparam(line,') ')
-            if isenum(nctype) then
+            if isenum(type) then
                 line = concatparam(line,'(int) ')
             end
@@ -296 +286 @@
                 line = concatparam(line,'tolua_to'..t,'(tolua_S,',narg,',',def,'));')
             else
-                local to_func = get_to_function(type)
-                line = concatparam(line,to_func..'(tolua_S,',narg,',',def,'));')
+                line = concatparam(line,'tolua_tousertype(tolua_S,',narg,',',def,'));')
             end
         end
@@ -372 +361 @@
                 output('   {')
                 output('#ifdef __cplusplus\n')
-                output('    void* tolua_obj = Mtolua_new((',type,')(',self.name,'[i]));')
+                output('    void* tolua_obj = new',type,'(',self.name,'[i]);')
                 output('    tolua_pushfieldusertype_and_takeownership(tolua_S,',narg,',i+1,tolua_obj,"',type,'");')
                 output('#else\n')
@@ -391 +380 @@
     if self.dim ~= '' and tonumber(self.dim)==nil then
         output('#ifdef __cplusplus\n')
-        output('  Mtolua_delete_dim(',self.name,');')
+        output('  delete []',self.name,';')
         output('#else\n')
         output('  free(',self.name,');')
@@ -416 +405 @@
             output('   tolua_push'..t..'(tolua_S,(',ct,')'..self.name..');')
         else
-            local push_func = get_push_function(self.type)
-            output('   ',push_func,'(tolua_S,(void*)'..self.name..',"',self.type,'");')
+            output('   tolua_pushusertype(tolua_S,(void*)'..self.name..',"',self.type,'");')
         end
         return 1

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

@@ -16 +16 @@
     for k,v in ipairs(_extra_parameters or {}) do
         
-        local b,e,name,value = string.find(v, "^([^=]*)=(.*)$")
+        local b,e,name,value = string.find(v, "^([^=])=(.*)$")
         if b then
             _extra_parameters[name] = value
@@ -94 +94 @@
         p:print()
     else
-        push(p)
-        pre_output_hook(p)
-        pop()
         p:preamble()
         p:supcode()
-        push(p)
-        pre_register_hook(p)
-        pop()
         p:register()
         push(p)

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

@@ -22 +22 @@
 -- register enumeration
 function classEnumerate:register (pre)
-    if not self:check_public_access() then
-        return
-    end
     pre = pre or ''
     local nspace = getnamespace(classContainer.curr)
     local i=1
     while self[i] do
-        if self.lnames[i] and self.lnames[i] ~= "" then
-            output(pre..'tolua_constant(tolua_S,"'..self.lnames[i]..'",'..nspace..self[i]..');')
-        end
+        output(pre..'tolua_constant(tolua_S,"'..self.lnames[i]..'",'..nspace..self[i]..');')
         i = i+1
     end
@@ -61 +56 @@
             Variable("tolua_readonly int "..varname)
         end
-    end
-    local parent = classContainer.curr
-    if parent then
-        t.access = parent.curr_member_access
-        t.global_access = t:check_public_access()
     end
     return t

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

@@ -48 +48 @@
         local n = split(self.name,'@')
         self.name = n[1]
-        self.name = string.gsub(self.name, ":%d*$", "")
         if not n[2] then
             n[2] = applyrenaming(n[1])
         end
         self.lname = n[2] or gsub(n[1],"%[.-%]","")
-        self.lname = string.gsub(self.lname, ":%d*$", "")
         self.original_name = self.name
         self.lname = clean_template(self.lname)
@@ -64 +62 @@
     if parent then
         self.access = parent.curr_member_access
-        self.global_access = self:check_public_access()
     else
     end
@@ -70 +67 @@
 
 function classFeature:check_public_access()
-
-    if type(self.global_access) == "boolean" then
-        return self.global_access
-    end
 
     if self.access and self.access ~= 0 then
@@ -129 +122 @@
     end
 
-    local fname = self.lname
-    if not fname or fname == '' then
-        fname = self.name
-    end
-    n = string.gsub(n..'_'.. (fname), "[<>:, \.%*&]", "_")
+    n = string.gsub(n..'_'.. (self.lname or self.name), "[<>:, \.%*&]", "_")
 
     return n

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

@@ -209 +209 @@
     if class then narg=2 else narg=1 end
     if class then
-        local func = get_is_function(self.parent.type)
+        local func = 'tolua_isusertype'
         local type = self.parent.type
         if self.name=='new' or static~=nil then
@@ -226 +226 @@
             local btype = isbasic(self.args[i].type)
             if btype ~= 'value' and btype ~= 'state' then
-                output('     '..self.args[i]:outchecktype(narg)..' ||\n')
+                output('     !'..self.args[i]:outchecktype(narg)..' ||\n')
             end
             if btype ~= 'state' then
@@ -250 +250 @@
         output(' ',self.const,self.parent.type,'*','self = ')
         output('(',self.const,self.parent.type,'*) ')
-        local to_func = get_to_function(self.parent.type)
-        output(to_func,'(tolua_S,1,0);')
+        output('tolua_tousertype(tolua_S,1,0);')
     elseif static then
         _,_,self.mod = strfind(self.mod,'^%s*static%s%s*(.*)')
@@ -270 +269 @@
     if class and self.name~='new' and static==nil then
         output('#ifndef TOLUA_RELEASE\n')
-        output('  if (!self) tolua_error(tolua_S,"'..output_error_hook("invalid \'self\' in function \'%s\'", self.name)..'", NULL);');
+        output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in function \''..self.name..'\'",NULL);');
         output('#endif\n')
     end
@@ -313 +312 @@
     --------------------------------------------------
 
-    pre_call_hook(self)
-
     local out = string.find(self.mod, "tolua_outside")
 
@@ -326 +323 @@
     -- call function
     if class and self.name=='delete' then
-        output('  Mtolua_delete(self);')
+        output('  delete self;')
     elseif class and self.name == 'operator&[]' then
         if flags['1'] then -- for compatibility with tolua5 ?
@@ -355 +352 @@
     end
     if class and self.name=='new' then
-        output('Mtolua_new((',self.type,')(')
+        output('new',self.type,'(')
     elseif class and static then
         if out then
@@ -367 +364 @@
         else
             if self.cast_operator then
-                --output('static_cast<',self.mod,self.type,self.ptr,' >(*self')
-                output('self->operator ',self.mod,self.type,'(')
+                output('static_cast<',self.mod,self.type,self.ptr,'>(*self')
             else
                 output('self->'..self.name,'(')
@@ -396 +392 @@
         output('-1);')
     else
-        if class and self.name=='new' then
-            output('));') -- close Mtolua_new(
-        else
-            output(');')
-        end
+        output(');')
     end
 
@@ -407 +399 @@
         nret = nret + 1
         local t,ct = isbasic(self.type)
-        if t and self.name ~= "new" then
+        if t then
             if self.cast_operator and _basic_raw_push[t] then
                 output('   ',_basic_raw_push[t],'(tolua_S,(',ct,')tolua_ret);')
@@ -416 +408 @@
                 t = self.type
                 new_t = string.gsub(t, "const%s+", "")
-                local owned = false
-                if string.find(self.mod, "tolua_owned") then
-                    owned = true
-                end
-                local push_func = get_push_function(t)
                 if self.ptr == '' then
                     output('   {')
                     output('#ifdef __cplusplus\n')
-                    output('    void* tolua_obj = Mtolua_new((',new_t,')(tolua_ret));')
-                    output('    ',push_func,'(tolua_S,tolua_obj,"',t,'");')
-                    output('    tolua_register_gc(tolua_S,lua_gettop(tolua_S));')
+                    output('    void* tolua_obj = new',new_t,'(tolua_ret);')
+                    output('    tolua_pushusertype_and_takeownership(tolua_S,tolua_obj,"',t,'");')
                     output('#else\n')
                     output('    void* tolua_obj = tolua_copy(tolua_S,(void*)&tolua_ret,sizeof(',t,'));')
-                    output('    ',push_func,'(tolua_S,tolua_obj,"',t,'");')
-                    output('    tolua_register_gc(tolua_S,lua_gettop(tolua_S));')
+                    output('    tolua_pushusertype_and_takeownership(tolua_S,tolua_obj,"',t,'");')
                     output('#endif\n')
                     output('   }')
                 elseif self.ptr == '&' then
-                    output('   ',push_func,'(tolua_S,(void*)&tolua_ret,"',t,'");')
+                    output('   tolua_pushusertype(tolua_S,(void*)&tolua_ret,"',t,'");')
                 else
-                    output('   ',push_func,'(tolua_S,(void*)tolua_ret,"',t,'");')
-                    if owned or local_constructor then
-                        output('    tolua_register_gc(tolua_S,lua_gettop(tolua_S));')
+                    if local_constructor then
+                        output('   tolua_pushusertype_and_takeownership(tolua_S,(void *)tolua_ret,"',t,'");')
+                    else
+                        output('   tolua_pushusertype(tolua_S,(void*)tolua_ret,"',t,'");')
                     end
                 end
@@ -480 +466 @@
     end
 
-    post_call_hook(self)
-
     output(' }')
     output(' return '..nret..';')
@@ -490 +474 @@
         output('#ifndef TOLUA_RELEASE\n')
         output('tolua_lerror:\n')
-        output(' tolua_error(tolua_S,"'..output_error_hook("#ferror in function \'%s\'.", self.lname)..'",&tolua_err);')
+        output(' tolua_error(tolua_S,"#ferror in function \''..self.lname..'\'.",&tolua_err);')
         output(' return 0;')
         output('#endif\n')
@@ -590 +574 @@
     if string.find(par, "%*") then -- it's a pointer with a default value
 
-        if string.find(par, '=%s*new') or string.find(par, "%(") then -- it's a pointer with an instance as default parameter.. is that valid?
+        if string.find(par, '=%s*new') then -- it's a pointer with an instance as default parameter.. is that valid?
             return true
         end
@@ -677 +661 @@
         --ns = strip_defaults(ns)
 
-        local f = Function(d, ns, c)
+        Function(d, ns, c)
         for i=1,last do
             t[i] = string.gsub(t[i], "=.*$", "")

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

@@ -75 +75 @@
     output(' if (\n')
     -- check self
-    local is_func = get_is_function(self.parent.type)
-    output('     !'..is_func..'(tolua_S,1,"'..self.parent.type..'",0,&tolua_err) ||\n')
+    output('     !'..'tolua_isusertype(tolua_S,1,"'..self.parent.type..'",0,&tolua_err) ||\n')
     output('     !tolua_isnoobj(tolua_S,2,&tolua_err)\n )')
     output('  goto tolua_lerror;')
@@ -87 +86 @@
     output(' ',self.const,self.parent.type,'*','self = ')
     output('(',self.const,self.parent.type,'*) ')
-    local to_func = get_to_func(self.parent.type)
-    output(to_func,'(tolua_S,1,0);')
+    output('tolua_tousertype(tolua_S,1,0);')
 
     -- check self
     output('#ifndef TOLUA_RELEASE\n')
-    output('  if (!self) tolua_error(tolua_S,"'..output_error_hook("invalid \'self\' in function \'%s\'", self.name)..'",NULL);');
+    output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in function \''..self.name..'\'",NULL);');
     output('#endif\n')
 
@@ -105 +103 @@
     else
         t = self.type
-        local push_func = get_push_function(t)
         new_t = string.gsub(t, "const%s+", "")
         if self.ptr == '' then
             output('   {')
             output('#ifdef __cplusplus\n')
-            output('    void* tolua_obj = Mtolua_new((',new_t,')(tolua_ret));')
-            output('    ',push_func,'(tolua_S,tolua_obj,"',t,'");')
-            output('    tolua_register_gc(tolua_S,lua_gettop(tolua_S));')
+            output('    void* tolua_obj = new',new_t,'(tolua_ret);')
+            output('    tolua_pushusertype_and_takeownership(tolua_S,tolua_obj,"',t,'");')
             output('#else\n')
             output('    void* tolua_obj = tolua_copy(tolua_S,(void*)&tolua_ret,sizeof(',t,'));')
-            output('    ',push_func,'(tolua_S,tolua_obj,"',t,'");')
-            output('    tolua_register_gc(tolua_S,lua_gettop(tolua_S));')
+            output('    tolua_pushusertype_and_takeownership(tolua_S,tolua_obj,"',t,'");')
             output('#endif\n')
             output('   }')
         elseif self.ptr == '&' then
-            output('   ',push_func,'(tolua_S,(void*)&tolua_ret,"',t,'");')
+            output('   tolua_pushusertype(tolua_S,(void*)&tolua_ret,"',t,'");')
         else
             if local_constructor then
-                output('   ',push_func,'(tolua_S,(void *)tolua_ret,"',t,'");')
-                output('    tolua_register_gc(tolua_S,lua_gettop(tolua_S));')
+                output('   tolua_pushusertype_and_takeownership(tolua_S,(void *)tolua_ret,"',t,'");')
             else
-                output('   ',push_func,'(tolua_S,(void*)tolua_ret,"',t,'");')
+                output('   tolua_pushusertype(tolua_S,(void*)tolua_ret,"',t,'");')
             end
         end
@@ -136 +130 @@
     output('#ifndef TOLUA_RELEASE\n')
     output('tolua_lerror:\n')
-    output(' tolua_error(tolua_S,"'..output_error_hook("#ferror in function \'%s\'.", self.lname)..'",&tolua_err);')
+    output(' tolua_error(tolua_S,"#ferror in function \''..self.lname..'\'.",&tolua_err);')
     output(' return 0;')
     output('#endif\n')

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

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

@@ -109 +109 @@
     if string.find(self.mod, 'tolua_property') then
 
-        local _,_,type = string.find(self.mod, "tolua_property__([^%s]*)")
+        _,_,type = string.find(self.mod, "tolua_property__([^%s]*)")
         type = type or "default"
         prop_get,prop_set = get_property_methods(type, self.name)
@@ -131 +131 @@
         output(' ',self.parent.type,'*','self = ')
         output('(',self.parent.type,'*) ')
-        local to_func = get_to_function(self.parent.type)
-        output(to_func,'(tolua_S,1,0);')
+        output('tolua_tousertype(tolua_S,1,0);')
     elseif static then
         _,_,self.mod = strfind(self.mod,'^%s*static%s%s*(.*)')
@@ -141 +140 @@
     if class and static==nil then
         output('#ifndef TOLUA_RELEASE\n')
-        output('  if (!self) tolua_error(tolua_S,"'..output_error_hook("invalid \'self\' in accessing variable \'%s\'", self.name)..'",NULL);');
+        output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);');
         output('#endif\n')
     end
@@ -147 +146 @@
     -- return value
     if string.find(self.mod, 'tolua_inherits') then
-    local push_func = get_push_function(self.type)
         output('#ifdef __cplusplus\n')
-        output('  ',push_func,'(tolua_S,(void*)static_cast<'..self.type..'*>(self), "',self.type,'");')
+        output('  tolua_pushusertype(tolua_S,(void*)static_cast<'..self.type..'*>(self), "',self.type,'");')
         output('#else\n')
-        output('  ',push_func,'(tolua_S,(void*)(('..self.type..'*)self), "',self.type,'");')
+        output('  tolua_pushusertype(tolua_S,(void*)(('..self.type..'*)self), "',self.type,'");')
         output('#endif\n')
     else
@@ -158 +156 @@
             output('  tolua_push'..t..'(tolua_S,(',ct,')'..self:getvalue(class,static,prop_get)..');')
         else
-            local push_func = get_push_function(self.type)
             t = self.type
             if self.ptr == '&' or self.ptr == '' then
-                output('  ',push_func,'(tolua_S,(void*)&'..self:getvalue(class,static,prop_get)..',"',t,'");')
-            else
-                output('  ',push_func,'(tolua_S,(void*)'..self:getvalue(class,static,prop_get)..',"',t,'");')
+                output('  tolua_pushusertype(tolua_S,(void*)&'..self:getvalue(class,static,prop_get)..',"',t,'");')
+            else
+                output('  tolua_pushusertype(tolua_S,(void*)'..self:getvalue(class,static,prop_get)..',"',t,'");')
             end
         end
@@ -188 +185 @@
         output(' ',self.parent.type,'*','self = ')
         output('(',self.parent.type,'*) ')
-        local to_func = get_to_function(self.parent.type)
-        output(to_func,'(tolua_S,1,0);')
+        output('tolua_tousertype(tolua_S,1,0);')
         -- check self value
     end
@@ -196 +192 @@
     output('  tolua_Error tolua_err;')
     if class and static==nil then
-        output('  if (!self) tolua_error(tolua_S,"'..output_error_hook("invalid \'self\' in accessing variable \'%s\'", self.name)..'",NULL);');
+        output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);');
     elseif static then
         _,_,self.mod = strfind(self.mod,'^%s*static%s%s*(.*)')
@@ -202 +198 @@
 
     -- check variable type
-    output('  if ('..self:outchecktype(2)..')')
+    output('  if (!'..self:outchecktype(2)..')')
     output('   tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);')
     output('#endif\n')
@@ -210 +206 @@
     if self.def ~= '' then def = self.def end
     if self.type == 'char*' and self.dim ~= '' then -- is string
-        output(' strncpy((char*)')
+        output(' strncpy(')
         if class and static then
             output(self.parent.type..'::'..self.name)
@@ -218 +214 @@
                 output(self.name)
             end
-            output(',(const char*)tolua_tostring(tolua_S,2,',def,'),',self.dim,'-1);')
+            output(',tolua_tostring(tolua_S,2,',def,'),',self.dim,'-1);')
         else
             local ptr = ''
@@ -249 +245 @@
                 output('tolua_to'..t,'(tolua_S,2,',def,'))')
             else
-                local to_func = get_to_function(self.type)
-                output(to_func,'(tolua_S,2,',def,'))')
+                output('tolua_tousertype(tolua_S,2,',def,'))')
             end
             if prop_set then