🛠️ miscellaneous fixes

Author: ThePhD

README.md

@@ -124,32 +124,32 @@ You will need any flavor of python3 and an available compiler. The testing suite
 "A Sun For the Moon - A Zero-Overhead Lua Abstraction using C++"  
 ThePhD
 Lua Workshop 2016 - Mashape, San Francisco, CA  
-[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2016.10.14%20-%20ThePhD%20-%20No%20Overhead%20C%20Abstraction.pdf)
+[Deck](https://github.com/ThePhD/sol2/blob/develop/documentation/presentation/2016.10.14%20-%20ThePhD%20-%20No%20Overhead%20C%20Abstraction.pdf)
 
 "Wrapping Lua C in C++ - Efficiently, Nicely, and with a Touch of Magic"  
 ThePhD
 Boston C++ Meetup November 2017 - CiC (Milk Street), Boston, MA  
-[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2017.11.08%20-%20ThePhD%20-%20Wrapping%20Lua%20C%20in%20C%2B%2B.pdf)
+[Deck](https://github.com/ThePhD/sol2/blob/develop/documentation/presentation/2017.11.08%20-%20ThePhD%20-%20Wrapping%20Lua%20C%20in%20C%2B%2B.pdf)
 
 "Biting the CMake Bullet"  
 ThePhD
 Boston C++ Meetup February 2018 - CiC (Main Street), Cambridge, MA  
-[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2018.02.06%20-%20ThePhD%20-%20Biting%20the%20CMake%20Bullet.pdf)
+[Deck](https://github.com/ThePhD/sol2/blob/develop/documentation/presentation/2018.02.06%20-%20ThePhD%20-%20Biting%20the%20CMake%20Bullet.pdf)
 
 "Compile Fast, Run Faster, Scale Forever: A look into the sol2 Library"  
 ThePhD
 C++Now 2018 - Hudson Commons, Aspen Physics Center, Aspen, Colorado  
-[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2018.05.10%20-%20ThePhD%20-%20Compile%20Fast%2C%20Run%20Faster%2C%20Scale%20Forever.pdf)
+[Deck](https://github.com/ThePhD/sol2/blob/develop/documentation/presentation/2018.05.10%20-%20ThePhD%20-%20Compile%20Fast%2C%20Run%20Faster%2C%20Scale%20Forever.pdf)
 
 "Scripting at the Speed of Thought: Using Lua in C++ with sol2"  
 ThePhD
 CppCon 2018 - 404 Keystone, Meydenbauer Center, Aspen, Colorado  
-[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2018.09.28%20-%20ThePhD%20-%20Scripting%20at%20the%20Speed%20of%20Thought.pdf)
+[Deck](https://github.com/ThePhD/sol2/blob/develop/documentation/presentation/2018.09.28%20-%20ThePhD%20-%20Scripting%20at%20the%20Speed%20of%20Thought.pdf)
 
 "The Plan for Tomorrow: Compile-Time Extension Points in C++"
 ThePhD
 C++Now 2019 - Flug Auditorium, Aspen Physics Center, Aspen, Colorado
-[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2019.05.10%20-%20ThePhD%20-%20The%20Plan%20for%20Tomorrow%20-%20Compile-Time%20Extension%20Points%20in%20C%2b%2b.pdf)
+[Deck](https://github.com/ThePhD/sol2/blob/develop/documentation/presentation/2019.05.10%20-%20ThePhD%20-%20The%20Plan%20for%20Tomorrow%20-%20Compile-Time%20Extension%20Points%20in%20C%2b%2b.pdf)
 
 
 

cmake/Packages/FindLuaBuild/LuaVanilla.cmake

@@ -170,6 +170,7 @@ if (LUA_LOCAL_DIR)
 	add_custom_target(LUA_VANILLA
 		DEPENDS "${LUA_VANILLA_LIB_SOURCES}" "${LUA_VANILLA_LUA_SOURCES}")
 	set(LUA_VANILLA_INCLUDE_DIRS ${LUA_VANILLA_INCLUDE_DIRS} "${LUA_VANILLA_SOURCE_DIR}/include")
+	set(LUA_VANILLA_INCLUDE_DIRS ${LUA_VANILLA_INCLUDE_DIRS} "${LUA_VANILLA_SOURCE_DIR}/src")
 else()
 	include(FetchContent)
 	FetchContent_Declare(

include/sol/optional_implementation.hpp

@@ -2186,12 +2186,9 @@ namespace sol {
 		/// one.
 		///
 		/// \group emplace
-		template <class... Args>
-		T& emplace(Args&&... args) noexcept {
-			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
+		T& emplace(T& arg) noexcept {
 			*this = nullopt;
-			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
+			m_value = &arg;
 			return **this;
 		}
 

include/sol/protected_function_result.hpp

@@ -56,7 +56,7 @@ namespace sol {
 
 		protected_function_result() noexcept : protected_function_result(nullptr) {}
 		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
-		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
+		: L( Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
 		}
 
 		// We do not want anyone to copy these around willy-nilly

include/sol/variadic_results.hpp

@@ -61,6 +61,8 @@ namespace sol {
 
 		basic_variadic_results(const basic_variadic_results&) = default;
 		basic_variadic_results(basic_variadic_results&&) = default;
+		basic_variadic_results& operator=(const basic_variadic_results&) = default;
+		basic_variadic_results& operator=(basic_variadic_results&&) = default;
 	};
 
 	struct variadic_results : public basic_variadic_results<> {

meson.build

@@ -7,7 +7,15 @@ else
 	lua_cpp = 'false'
 endif
 
-lua_dep = dependency('lua', fallback: [ 'lua', 'lua_dep' ], default_options: [ 'lua_cpp=' + lua_cpp ])
+if get_option('use_luajit')
+	luadep_name = 'luajit'
+	luadep_options = []
+	lua_cpp = 'false'
+else
+	luadep_name = 'lua'
+	luadep_options = [ 'lua_cpp=' + lua_cpp ]
+endif
+lua_dep = dependency(luadep_name, fallback: [ luadep_name, luadep_name + '_dep' ], default_options: luadep_options)
 
 # Set compiler flags if we're compiling lua as C++.
 compile_args = []

meson_options.txt

@@ -1,2 +1,3 @@
 option('single', type: 'boolean', value: false, description: 'Generate the sol2 single header and expose the corresponding build targets')
-option('lua_cpp', type: 'boolean', value: false, description: 'Compile lua as C++ code')
+option('lua_cpp', type: 'boolean', value: false, description: 'Compile lua as C++ code')
+option('use_luajit', type: 'boolean', value: false, description: 'Search for luajit dep, implies lua_cpp=false')

tests/coroutines/source/array_proxy_lifetime.cpp

@@ -48,8 +48,8 @@ inline namespace sol2_regression_test_coroutines_array_proxy_lifetime {
 			using iterator_category = std::random_access_iterator_tag;
 			using difference_type = std::ptrdiff_t;
 			using value_type = std::weak_ptr<A>;
-			using pointer = std::weak_ptr<A>*;   // or also value_type*
-			using reference = std::weak_ptr<A>&; // or also value_type&
+			using pointer = std::weak_ptr<A>*;
+			using reference = std::weak_ptr<A>&;
 
 			const ArrayProxy& a;
 			size_t index;
@@ -59,7 +59,7 @@ inline namespace sol2_regression_test_coroutines_array_proxy_lifetime {
 
 			value_type operator*() const {
 				size_t size = a.mpParent.children.size();
-				if (index >= 0 && index < size) {
+				if (index < size) {
 					return a.mpParent.children[index];
 				}
 				return std::weak_ptr<A>();