diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-03-19 20:38:00 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-03-19 20:38:00 +0100 |
commit | 6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26 (patch) | |
tree | db269080d2bb4ffb20a42cc95490d9886fbbd560 /lib/tolua++/src/bin/lua/basic.lua | |
parent | Merge branch 'master' into unreachable (diff) | |
download | cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.tar cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.tar.gz cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.tar.bz2 cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.tar.lz cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.tar.xz cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.tar.zst cuberite-6a3fe7adcc2a3855a574dbfc2bb79c86e7539f26.zip |
Diffstat (limited to 'lib/tolua++/src/bin/lua/basic.lua')
-rw-r--r-- | lib/tolua++/src/bin/lua/basic.lua | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/tolua++/src/bin/lua/basic.lua b/lib/tolua++/src/bin/lua/basic.lua index d195f6dec..b5788f2be 100644 --- a/lib/tolua++/src/bin/lua/basic.lua +++ b/lib/tolua++/src/bin/lua/basic.lua @@ -145,12 +145,14 @@ function typevar(type) end end +-- is enum +function isenum (type) + return _enums[type] +end + -- check if basic type function isbasic (type) local t = gsub(type,'const ','') - if _enum_is_functions[t] then - return nil - end local m,t = applytypedef('', t) local b = _basic[t] if b then @@ -385,7 +387,7 @@ end _push_functions = {} _is_functions = {} -_enum_is_functions = {} +_enums = {} _to_functions = {} _base_push_functions = {} @@ -414,5 +416,8 @@ function get_to_function(t) end function get_is_function(t) - return _enum_is_functions[t] or _is_functions[t] or search_base(t, _base_is_functions) or "tolua_isusertype" + if _enums[t] then + return "tolua_is" .. t + end + return _is_functions[t] or search_base(t, _base_is_functions) or "tolua_isusertype" end |