mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
bd4492b85b
sol::object had a few reference leaks in the way it retrieved values: it now does it properly without leaving the stack at +1 item
sol::stack was drastically cleaned up, with the following key change:
* sol::stack::push now returns an integer of the number of things its pushed (usually 1, but can be more) (Thanks, @PrincessNyanara!)
* sol::stack::call now calls functions flexibly, and getting is done more reliably
* due to the innovation of stack::call and using absolute indices, we no longer have to use reverse_call style programming to deal with lua
* sol::reference::get_type is now const-correct
* sol::state and sol::table now have a cleaned up `get` implementation since it is no longer held back by the ugliness of VC++'s incapability to handle templates
* the name `sol::userdata` now belongs to a type that actually encapsualtes a void* with a pusher/getter than gets a userdata void* value (TODO: give it a template to make it static_cast to that type on get?)
* lightuserdata_t -> light_userdata, upvalue_t -> upvalue as type names (mostly details)
* pushers for various types were updated to return integers
96 lines
2.6 KiB
C++
96 lines
2.6 KiB
C++
// The MIT License (MIT)
|
|
|
|
// Copyright (c) 2013 Danny Y., Rapptz
|
|
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
// this software and associated documentation files (the "Software"), to deal in
|
|
// the Software without restriction, including without limitation the rights to
|
|
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
|
// the Software, and to permit persons to whom the Software is furnished to do so,
|
|
// subject to the following conditions:
|
|
|
|
// The above copyright notice and this permission notice shall be included in all
|
|
// copies or substantial portions of the Software.
|
|
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
|
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
|
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
#ifndef SOL_REFERENCE_HPP
|
|
#define SOL_REFERENCE_HPP
|
|
|
|
#include "types.hpp"
|
|
|
|
namespace sol {
|
|
class reference {
|
|
private:
|
|
lua_State* L = nullptr; // non-owning
|
|
int ref = LUA_NOREF;
|
|
|
|
int copy() const {
|
|
push();
|
|
return luaL_ref(L, LUA_REGISTRYINDEX);
|
|
}
|
|
public:
|
|
reference() noexcept = default;
|
|
|
|
reference(lua_State* L, int index): L(L) {
|
|
lua_pushvalue(L, index);
|
|
ref = luaL_ref(L, LUA_REGISTRYINDEX);
|
|
}
|
|
|
|
virtual ~reference() {
|
|
luaL_unref(L, LUA_REGISTRYINDEX, ref);
|
|
}
|
|
|
|
void push() const noexcept {
|
|
lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
|
|
}
|
|
|
|
reference(reference&& o) noexcept {
|
|
L = o.L;
|
|
ref = o.ref;
|
|
|
|
o.L = nullptr;
|
|
o.ref = LUA_NOREF;
|
|
}
|
|
|
|
reference& operator=(reference&& o) noexcept {
|
|
L = o.L;
|
|
ref = o.ref;
|
|
|
|
o.L = nullptr;
|
|
o.ref = LUA_NOREF;
|
|
|
|
return *this;
|
|
}
|
|
|
|
reference(const reference& o) noexcept {
|
|
L = o.L;
|
|
ref = o.copy();
|
|
}
|
|
|
|
reference& operator=(const reference& o) noexcept {
|
|
L = o.L;
|
|
ref = o.copy();
|
|
return *this;
|
|
}
|
|
|
|
type get_type() const {
|
|
push();
|
|
int result = lua_type(L, -1);
|
|
lua_pop(L, 1);
|
|
return static_cast<type>(result);
|
|
}
|
|
|
|
lua_State* state() const noexcept {
|
|
return L;
|
|
}
|
|
};
|
|
} // sol
|
|
|
|
#endif // SOL_REFERENCE_HPP
|