Changeset 3138 for code/branches/pch/src/tolua/lua/class.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/class.lua (modified) (3 diffs)

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