Changeset 85 for trunk/src/lua/lua_raw.cc

Timestamp:

06/02/13 18:25:29 (12 years ago)

Author:

epyon

Message:

• lua_raw - several utility functions added
• lua_aux - aux implementations use lua_raw functions
• lua_glm, lua_aux - registration through nlua_register

File:

• trunk/src/lua/lua_raw.cc (modified) (3 diffs)

trunk/src/lua/lua_raw.cc

@@ -27 +27 @@
 }
 
+void nlua_pushreversed( lua_State *L, int index )
+{
+        index = lua_absindex( L, index );
+        int len = lua_rawlen( L, index );
+        int i   = len;
+        lua_createtable( L, len, 0 );
+        while ( i != 0 )
+        {
+                lua_rawgeti( L, index, i );
+                lua_rawseti( L, -2, len-i+1 );
+                i--;
+        }
+}
+
+
 void nlua_shallowcopy( lua_State *L, int index )
 {
-        index = lua_absindex(L,index);
-        lua_newtable(L);
-        lua_pushnil(L);
+        index = lua_absindex( L, index );
+        lua_createtable( L, 0, 0 );
+        lua_pushnil( L );
 
         while ( lua_next( L, index ) != 0 )
         {
-                lua_pushvalue(L, -2);
-                lua_insert(L, -2);
-                lua_settable(L, -4);
+                lua_pushvalue( L, -2 );
+                lua_insert( L, -2 );
+                lua_settable( L, -4 );
         }
+}
+
+void nlua_shallowicopy( lua_State *L, int index )
+{
+        index = lua_absindex( L, index );
+        lua_createtable( L, 0, 0 );
+        int i = 0;
+        for(;;) 
+        {
+                i++;
+                lua_rawgeti( L, 1, i );
+                if ( lua_isnil( L, -1 ) ) 
+                {
+                        lua_pop( L, 1 );
+                        break;
+                }
+                lua_rawseti( L, 2, i );
+        };
 }
 
 void nlua_shallowmerge( lua_State *L, int index )
 {
-        index = lua_absindex(L,index);
-        lua_pushnil(L);
+        index = lua_absindex( L, index );
+        lua_pushnil( L );
 
-        while( lua_next(L, index) != 0 )
+        while( lua_next( L, index ) != 0 )
         {
-                lua_pushvalue(L, -2);
-                lua_insert(L, -2);
-                lua_rawset(L, -4);
+                lua_pushvalue( L, -2 );
+                lua_insert( L, -2 );
+                lua_rawset( L, -4 );
         }
 }
@@ -56 +89 @@
 void nlua_deepcopy( lua_State *L, int index )
 {
-        index = lua_absindex(L,index);
-        lua_newtable(L);
-        lua_pushnil(L);
+        index = lua_absindex( L, index );
+        lua_createtable( L, 0, 0 );
+        lua_pushnil( L );
 
         while ( lua_next( L, index ) != 0 )
@@ -68 +101 @@
                         lua_pop( L, 1 );
                 }
-                lua_pushvalue(L, -2);
-                lua_insert(L, -2);
-                lua_settable(L, -4);
+                lua_pushvalue( L, -2 );
+                lua_insert( L, -2 );
+                lua_settable( L, -4 );
         }
 }
 
+void nlua_toset( lua_State *L, int index )
+{
+        index = lua_absindex( L, index );
+        lua_createtable( L, 0, 0 );
+        int i = 0;
+        for(;;) 
+        {
+                i++;
+                lua_rawgeti( L, index, i );
+                if ( lua_isnil( L, -1 ) ) 
+                {
+                        lua_pop( L, 1 );
+                        break;
+                }
+                lua_pushboolean( L, true );
+                lua_rawset( L, -3 );
+        };
+}
+
+void nlua_tokeyset( lua_State *L, int index )
+{
+        index = lua_absindex( L, index );
+        lua_createtable( L, 0, 0 );
+        lua_pushnil( L );
+        while ( lua_next( L, index ) != 0 )
+        {
+                lua_pushvalue( L, -2 );
+                lua_pushboolean( L, true );
+                lua_settable( L, -5 );
+                lua_pop( L, 1 );
+        }
+}
+
+void nlua_register( lua_State *L, const char* fname, lua_CFunction func, int index )
+{
+        index = lua_absindex( L, index );
+        lua_pushstring( L, fname );
+        lua_pushcfunction( L, func );
+        lua_rawset( L, index );
+}
+
+void nlua_register( lua_State *L, const luaL_Reg *l, int index )
+{
+        index = lua_absindex( L, index );
+        for (; l->name != NULL; l++) 
+        {
+                lua_pushstring( L, l->name );
+                lua_pushcfunction( L, l->func );
+                lua_rawset( L, index );
+        }
+}
+
+void nlua_register( lua_State *L, const char* lname, const char* fname, lua_CFunction func )
+{
+        lua_getglobal( L, lname );
+        if ( !lua_istable( L, -1 ) )
+        {
+                lua_pop( L, 1 );
+                lua_createtable( L, 0, 0 );
+                nlua_register( L, fname, func, -1 );
+                lua_setglobal( L, lname );
+                return;
+        }
+        nlua_register( L, fname, func, -1 );
+        lua_pop( L, 1 );
+}
+
+void nlua_register( lua_State *L, const char* lname, const luaL_Reg *l )
+{
+        lua_getglobal( L, lname );
+        if ( !lua_istable( L, -1 ) )
+        {
+                lua_pop( L, 1 );
+                lua_createtable( L, 0, 0 );
+                nlua_register( L, l, -1 );
+                lua_setglobal( L, lname );
+                return;
+        }
+        nlua_register( L, l, -1 );
+        lua_pop( L, 1 );
+}