Changeset 198 for trunk/src/lib
- Timestamp:
- 08/11/13 17:19:03 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/lua.cc
r173 r198 66 66 67 67 // only loaded in 5.1 mode to implement lua_compare 68 int (*lua_equal) (lua_State *L, int idx1, int idx2) = nullptr;69 int (*lua_lessthan) (lua_State *L, int idx1, int idx2) = nullptr;68 static int (*lua_equal) (lua_State *L, int idx1, int idx2) = nullptr; 69 static int (*lua_lessthan) (lua_State *L, int idx1, int idx2) = nullptr; 70 70 71 71 … … 75 75 76 76 # define NV_LUA_COMPAT_FUN( rt, fn, fp, rt2, fn2, fp2,arg,ret ) \ 77 rt call_##fn2##_compat fp { ret fn2##_compat arg; }77 static rt call_##fn2##_compat fp { ret fn2##_compat arg; } 78 78 # include <nv/lib/detail/lua_functions_compat.inc> 79 79 # undef NV_LUA_COMPAT_FUN … … 85 85 # define LUA_GLOBALSINDEX_52 2 86 86 # define LUA_REGISTRYINDEX_51 (-10000) 87 # define lua_upvalueindex_51(i) (LUA_GLOBALSINDEX_51-(i)) 88 # define lua_upvalueindex_52(i) (LUA_REGISTRYINDEX_52-(i)) 89 90 int lua_absindex_51 (lua_State *L, int idx) { return (idx > 0 ? idx : idx + lua_gettop(L) + 1); }; 91 void lua_getglobal_51 (lua_State *L, const char *var) { lua_getfield(L, LUA_GLOBALSINDEX_51, var ); }; 92 void lua_setglobal_51 (lua_State *L, const char *var) { lua_setfield(L, LUA_GLOBALSINDEX_51, var ); }; 93 void luaL_requiref_51 (lua_State *L, const char *modname, lua_CFunction openf, int glb) 87 88 static int lua_absindex_51 (lua_State *L, int idx) { return (idx > 0 ? idx : idx + lua_gettop(L) + 1); }; 89 static void lua_getglobal_51 (lua_State *L, const char *var) { lua_getfield(L, LUA_GLOBALSINDEX_51, var ); }; 90 static void lua_setglobal_51 (lua_State *L, const char *var) { lua_setfield(L, LUA_GLOBALSINDEX_51, var ); }; 91 static void luaL_requiref_51 (lua_State *L, const char *modname, lua_CFunction openf, int glb) 94 92 { 95 93 lua_pushcfunction(L, openf); … … 105 103 } 106 104 107 void luaL_setmetatable_51 (lua_State *L, const char *tname)105 static void luaL_setmetatable_51 (lua_State *L, const char *tname) 108 106 { 109 107 luaL_getmetatable(L, tname); … … 111 109 } 112 110 113 void *luaL_testudata_51 (lua_State *L, int ud, const char *tname)111 static void *luaL_testudata_51 (lua_State *L, int ud, const char *tname) 114 112 { 115 113 void *p = lua_touserdata(L, ud); … … 128 126 } 129 127 130 const lua_Number *lua_version_51 (lua_State*)128 static const lua_Number *lua_version_51 (lua_State*) 131 129 { 132 130 static const lua_Number version = (lua_Number)LUA_VERSION_NUM; … … 134 132 } 135 133 136 void lua_copy_51 (lua_State *L, int fromidx, int toidx)134 static void lua_copy_51 (lua_State *L, int fromidx, int toidx) 137 135 { 138 136 toidx = lua_absindex( L, toidx ); … … 141 139 } 142 140 143 int lua_compare_51(lua_State *L, int idx1, int idx2, int op)141 static int lua_compare_51(lua_State *L, int idx1, int idx2, int op) 144 142 { 145 143 switch (op) … … 153 151 } 154 152 155 void lua_rawgetp_51(lua_State *L, int idx, const void *p)153 static void lua_rawgetp_51(lua_State *L, int idx, const void *p) 156 154 { 157 155 idx = lua_absindex( L, idx ); … … 161 159 } 162 160 163 void lua_rawsetp_51(lua_State *L, int idx, const void *p)161 static void lua_rawsetp_51(lua_State *L, int idx, const void *p) 164 162 { 165 163 idx = lua_absindex( L, idx ); … … 170 168 } 171 169 172 int luaL_getsubtable_51(lua_State *L, int idx, const char *fname)170 static int luaL_getsubtable_51(lua_State *L, int idx, const char *fname) 173 171 { 174 172 lua_getfield(L, idx, fname); … … 184 182 } 185 183 186 void luaL_setfuncs_51(lua_State *L, const luaL_Reg *l, int nup)184 static void luaL_setfuncs_51(lua_State *L, const luaL_Reg *l, int nup) 187 185 { 188 186 luaL_checkstack(L, nup, "too many upvalues"); … … 199 197 } 200 198 201 void lua_pushglobaltable_51(lua_State* L)199 static void lua_pushglobaltable_51(lua_State* L) 202 200 { 203 201 lua_pushvalue( L, LUA_GLOBALSINDEX_51 ); 204 202 } 205 203 206 void lua_pushglobaltable_52(lua_State* L)204 static void lua_pushglobaltable_52(lua_State* L) 207 205 { 208 206 lua_rawgeti( L, LUA_REGISTRYINDEX_52, LUA_GLOBALSINDEX_52 );
Note: See TracChangeset
for help on using the changeset viewer.