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

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