[ci-skip] better docs

This commit is contained in:
ThePhD 2016-08-11 09:34:03 -04:00
parent 56f7d4234e
commit 7a53305a48
2 changed files with 7 additions and 3 deletions

View File

@ -25,7 +25,7 @@ members
template <typename T, typename... Args> template <typename T, typename... Args>
object(lua_State* L, in_place_type_t<T>, Args&&... args); object(lua_State* L, in_place_type_t<T>, Args&&... args);
There are 4 kinds of constructors here. One allows construction of a object from other reference types such as :doc:`sol::table<table>` and :doc:`sol::stack_reference<stack_reference>`. The secon creates an object which references the specific element at the given index in the specified ``lua_State*``. The more advanced ``in_place...`` constructors create a single object by pushing the specified type ``T`` onto the stack and then setting it as the object. It gets popped from the stack afterwards (unless this is an instance of ``sol::stack_object``, in which case it is left on the stack). There are 4 kinds of constructors here. One allows construction of a object from other reference types such as :doc:`sol::table<table>` and :doc:`sol::stack_reference<stack_reference>`. The secon creates an object which references the specific element at the given index in the specified ``lua_State*``. The more advanced ``in_place...`` constructors create a single object by pushing the specified type ``T`` onto the stack and then setting it as the object. It gets popped from the stack afterwards (unless this is an instance of ``sol::stack_object``, in which case it is left on the stack). An example of using this and :doc:`sol::make_object<make_reference>` can be found in the `any_return example`_
.. code-block:: cpp .. code-block:: cpp
:caption: function: type conversion :caption: function: type conversion
@ -64,3 +64,6 @@ These allow a person to compare an ``sol::object`` against :ref:`nil<nil>`, whic
} }
Use this to check objects. Use this to check objects.
.. _any_return example: https://github.com/ThePhD/sol2/blob/develop/examples/any_return.cpp

View File

@ -8,12 +8,13 @@
sol::object fancy_func(sol::object a, sol::object b, sol::this_state s) { sol::object fancy_func(sol::object a, sol::object b, sol::this_state s) {
sol::state_view lua(s); sol::state_view lua(s);
if (a.is<int>() && b.is<int>()) { if (a.is<int>() && b.is<int>()) {
return sol::make_object(lua, a.as<int>() + b.as<int>()); return sol::object(lua, sol::in_place, a.as<int>() + b.as<int>());
} }
else if (a.is<bool>()) { else if (a.is<bool>()) {
bool do_triple = a.as<bool>(); bool do_triple = a.as<bool>();
return sol::make_object(lua, b.as<double>() * (do_triple ? 3 : 1)); return sol::object(lua, sol::in_place<double>, b.as<double>() * (do_triple ? 3 : 1));
} }
// Can also use make_object
return sol::make_object(lua, sol::nil); return sol::make_object(lua, sol::nil);
} }