Changeset 86

Timestamp:

06/02/13 18:38:01 (12 years ago)

Author:

epyon

Message:

• lua::state constructors made explicit
• lua::state can implicitly cast to lua_State*

Location:

trunk

Files:

• nv/lua/lua_state.hh (modified) (3 diffs)
• src/lua/lua_state.cc (modified) (1 diff)
• tests/lualib_test/lualib_test.cc (modified) (3 diffs)

trunk/nv/lua/lua_state.hh

@@ -30 +30 @@
                 public:
                         stack_guard( state* L );
+                        stack_guard( state& L );
                         int get_level() const { return m_level; }
                         ~stack_guard();
@@ -61 +62 @@
                         friend class table_guard;
                 public:
-                        state( bool load_libs = false );
-                        state( lua_State* state );
+                        explicit state( bool load_libs = false );
+                        explicit state( lua_State* state );
                         bool do_string( const std::string& code, const std::string& name, int rvalues = 0 );
                         bool do_stream( std::istream& stream, const std::string& name );
@@ -71 +72 @@
                         reference register_object( object * o );
                         void unregister_object( object * o );
+                        operator lua_State*() { return L; }
                         ~state();
                 private:

trunk/src/lua/lua_state.cc

@@ -17 +17 @@
 lua::stack_guard::stack_guard( lua::state* L )
         : L(L), m_level( lua_gettop(L->L) )
+{
+
+}
+
+lua::stack_guard::stack_guard( lua::state& L )
+        : L(&L), m_level( lua_gettop((&L)->L) )
 {
 

trunk/tests/lualib_test/lualib_test.cc

@@ -28 +28 @@
         {
                 nv::lua::state state( true );
-                nlua_register_glm( state.get_raw() );
+                nlua_register_glm( state );
                 // run the Lua script
                 state.do_file( "init.lua" );
@@ -34 +34 @@
                 for (;;)
                 {
-                        nv::lua::stack_guard guard( &state );
+                        nv::lua::stack_guard guard( state );
                         int stack = guard.get_level();
                         std::string input;
@@ -56 +56 @@
                         if ( !result )
                         {
-                                std::string error = lua_tostring( state.get_raw(), -1 );
+                                std::string error = lua_tostring( state, -1 );
                                 std::cout << "ERROR : " << error << std::endl;
                                 continue;
                         }
 
-                        if (lua_gettop( state.get_raw() ) > stack)
+                        if (lua_gettop( state ) > stack)
                         {
-                                for ( int i = stack+1; i <= lua_gettop( state.get_raw() ); ++i )
+                                for ( int i = stack+1; i <= lua_gettop( state ); ++i )
                                 {
-                                        std::cout << nlua_typecontent( state.get_raw(), i ) << std::endl;
+                                        std::cout << nlua_typecontent( state, i ) << std::endl;
                                 }
                         }