Changeset 2710 for code/trunk/src/tolua/lua/typedef.lua

Timestamp:

Feb 28, 2009, 7:46:37 PM (15 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/tolua/lua/typedef.lua (modified) (3 diffs)

code/trunk/src/tolua/lua/typedef.lua

@@ -21 +21 @@
 --   mod = modifiers to the 'de facto' type
 classTypedef = {
- utype = '',
- mod = '',
- type = ''
+    utype = '',
+    mod = '',
+    type = ''
 }
 classTypedef.__index = classTypedef
@@ -29 +29 @@
 -- Print method
 function classTypedef:print (ident,close)
- print(ident.."Typedef{")
- print(ident.." utype = '"..self.utype.."',")
- print(ident.." mod = '"..self.mod.."',")
- print(ident.." type = '"..self.type.."',")
- print(ident.."}"..close)
+    print(ident.."Typedef{")
+    print(ident.." utype = '"..self.utype.."',")
+    print(ident.." mod = '"..self.mod.."',")
+    print(ident.." type = '"..self.type.."',")
+    print(ident.."}"..close)
 end
 
 -- Return it's not a variable
 function classTypedef:isvariable ()
- return false
+    return false
 end
 
 -- Internal constructor
 function _Typedef (t)
- setmetatable(t,classTypedef)
- t.type = resolve_template_types(t.type)
- appendtypedef(t)
- return t
+    setmetatable(t,classTypedef)
+    t.type = resolve_template_types(t.type)
+    appendtypedef(t)
+    return t
 end
 
@@ -52 +52 @@
 -- Expects one string representing the type definition.
 function Typedef (s)
- if strfind(string.gsub(s, '%b<>', ''),'[%*&]') then
-  tolua_error("#invalid typedef: pointers (and references) are not supported")
- end
- local o = {mod = ''}
- if string.find(s, "[<>]") then
-        _,_,o.type,o.utype = string.find(s, "^%s*([^<>]+%b<>[^%s]*)%s+(.-)$")
- else
-        local t = split(gsub(s,"%s%s*"," ")," ")
-        o = {
-          utype = t[t.n],
-          type = t[t.n-1],
-          mod = concat(t,1,t.n-2),
-         }
- end
- return _Typedef(o)
+    if strfind(string.gsub(s, '%b<>', ''),'[%*&]') then
+        tolua_error("#invalid typedef: pointers (and references) are not supported")
+    end
+    local o = {mod = ''}
+    if string.find(s, "[<>]") then
+        _,_,o.type,o.utype = string.find(s, "^%s*([^<>]+%b<>[^%s]*)%s+(.-)$")
+    else
+        local t = split(gsub(s,"%s%s*"," ")," ")
+        o = {
+            utype = t[t.n],
+            type = t[t.n-1],
+            mod = concat(t,1,t.n-2),
+        }
+    end
+    return _Typedef(o)
 end