diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-22 16:16:07 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-22 16:16:07 +0100 |
| commit | 830a9c3bb46485f9d961078cff6c7055f4e9d569 (patch) | |
| tree | 716719729672a3977c9d4159b3d21494bd36d14b /lib/tolua++/src | |
| parent | Updated the tolua++ executable for Win builds. (diff) | |
| download | cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.tar cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.tar.gz cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.tar.bz2 cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.tar.lz cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.tar.xz cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.tar.zst cuberite-830a9c3bb46485f9d961078cff6c7055f4e9d569.zip | |
Diffstat (limited to '')
| -rw-r--r-- | lib/tolua++/src/bin/lua/container.lua | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/tolua++/src/bin/lua/container.lua b/lib/tolua++/src/bin/lua/container.lua index 2d11db7df..97e7b58fd 100644 --- a/lib/tolua++/src/bin/lua/container.lua +++ b/lib/tolua++/src/bin/lua/container.lua @@ -606,14 +606,15 @@ function classContainer:doparse (s) -- try function do --local b,e,decl,arg,const = strfind(s,"^%s*([~_%w][_@%w%s%*&:<>]*[_%w])%s*(%b())%s*(c?o?n?s?t?)%s*=?%s*0?%s*;%s*") - local b,e,decl,arg,const,virt = strfind(s,"^%s*([^%(\n]+)%s*(%b())%s*(c?o?n?s?t?)%s*(=?%s*0?)%s*;%s*") + local b,e,decl,arg,const,virt = strfind(s,"^%s*([^%(\n]+)%s*(%b())%s*(c?o?n?s?t?)%s*o?v?e?r?i?d?e?%s*(=?%s*0?)%s*;%s*") + warning("trace" .. b .. "," .. e "," .. decl) if not b then -- try function with template - b,e,decl,arg,const = strfind(s,"^%s*([~_%w][_@%w%s%*&:<>]*[_%w]%b<>)%s*(%b())%s*(c?o?n?s?t?)%s*=?%s*0?%s*;%s*") + b,e,decl,arg,const = strfind(s,"^%s*([~_%w][_@%w%s%*&:<>]*[_%w]%b<>)%s*(%b())%s*(c?o?n?s?t?)%s*o?v?e?r?i?d?e?%s*=?%s*0?%s*;%s*") end if not b then -- try a single letter function name - b,e,decl,arg,const = strfind(s,"^%s*([_%w])%s*(%b())%s*(c?o?n?s?t?)%s*;%s*") + b,e,decl,arg,const = strfind(s,"^%s*([_%w])%s*(%b())%s*(c?o?n?s?t?)%s*o?v?e?r?i?d?e?%s*;%s*") end if not b then -- try function pointer @@ -636,11 +637,11 @@ function classContainer:doparse (s) -- try inline function do - local b,e,decl,arg,const = strfind(s,"^%s*([^%(\n]+)%s*(%b())%s*(c?o?n?s?t?)[^;{]*%b{}%s*;?%s*") + local b,e,decl,arg,const = strfind(s,"^%s*([^%(\n]+)%s*(%b())%s*(c?o?n?s?t?)%s*o?v?e?r?i?d?e?[^;{]*%b{}%s*;?%s*") --local b,e,decl,arg,const = strfind(s,"^%s*([~_%w][_@%w%s%*&:<>]*[_%w>])%s*(%b())%s*(c?o?n?s?t?)[^;]*%b{}%s*;?%s*") if not b then -- try a single letter function name - b,e,decl,arg,const = strfind(s,"^%s*([_%w])%s*(%b())%s*(c?o?n?s?t?).-%b{}%s*;?%s*") + b,e,decl,arg,const = strfind(s,"^%s*([_%w])%s*(%b())%s*(c?o?n?s?t?)%s*o?v?e?r?i?d?e?.-%b{}%s*;?%s*") end if b then _curr_code = strsub(s,b,e) |