Revert "Build System Updated"

2026-09-05 11:26:35 +00:00 · 2019-10-12 21:07:06 -07:00
parent 579471afcc
commit b9f57f1f28
193 changed files with 14124 additions and 10507 deletions
@@ -20,111 +20,124 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 // OR OTHER DEALINGS IN THE SOFTWARE.

+
 #ifndef LUABIND_CONTAINER_POLICY_HPP_INCLUDED
 #define LUABIND_CONTAINER_POLICY_HPP_INCLUDED

 #include <luabind/config.hpp>
 #include <luabind/detail/policy.hpp>
-#include <luabind/detail/decorate_type.hpp>  // for decorated_type
-#include <luabind/detail/primitives.hpp>  // for null_type (ptr only), etc
+#include <boost/mpl/apply_wrap.hpp>

-namespace luabind {
-	namespace detail {
+namespace luabind { namespace detail {

-		template<class Policies>
-		struct container_converter_lua_to_cpp
+	namespace mpl = boost::mpl;
+
+	template<class Policies>
+	struct container_converter_lua_to_cpp
+	{
+        int const consumed_args(...)
+        {
+            return 1;
+        }
+
+        template<class T>
+		T apply(lua_State* L, by_const_reference<T>, int index)
 		{
-			enum { consumed_args = 1 };
+			typedef typename T::value_type value_type;

-			template<class T>
-			T to_cpp(lua_State* L, by_const_reference<T>, int index)
+			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
+			typename mpl::apply_wrap2<converter_policy,value_type,lua_to_cpp>::type converter;
+
+			T container;
+
+			lua_pushnil(L);
+			while (lua_next(L, index))
 			{
-				using value_type = typename T::value_type;
-				specialized_converter_policy_n<1, Policies, value_type, lua_to_cpp> converter;
-
-				T container;
-
-				lua_pushnil(L);
-				while(lua_next(L, index - 1))
-				{
-					container.push_back(converter.apply(L, decorated_type<value_type>(), -1));
-					lua_pop(L, 1); // pop value
-				}
-
-				return container;
+				container.push_back(converter.apply(L, LUABIND_DECORATE_TYPE(value_type), -1));
+				lua_pop(L, 1); // pop value
 			}

-			template<class T>
-			T to_cpp(lua_State* L, by_value<T>, int index)
-			{
-				return to_cpp(L, by_const_reference<T>(), index);
-			}
+			return container;
+		}

-			template<class T>
-			static int match(lua_State* L, by_const_reference<T>, int index)
-			{
-				if(lua_istable(L, index)) return 0; else return no_match;
-			}
-
-			template<class T>
-			static int match(lua_State* L, by_value<T>, int index)
-			{
-				return match(L, by_const_reference<T>(), index);
-			}
-
-			template<class T>
-			void converter_postcall(lua_State*, T, int) {}
-		};
-
-		template<class Policies>
-		struct container_converter_cpp_to_lua
+		template<class T>
+		T apply(lua_State* L, by_value<T>, int index)
 		{
-			template<class T>
-			void to_lua(lua_State* L, const T& container)
-			{
-				using value_type = typename T::value_type;
-				specialized_converter_policy_n<1, Policies, value_type, lua_to_cpp> converter;
+			return apply(L, by_const_reference<T>(), index);
+		}

-				lua_newtable(L);
-
-				int index = 1;
-
-				for(const auto& element : container)
-				{
-					converter.apply(L, element);
-					lua_rawseti(L, -2, index);
-					++index;
-				}
-			}
-		};
-
-		template<class Policies = no_policies>
-		struct container_policy
+		template<class T>
+		static int match(lua_State* L, by_const_reference<T>, int index)
 		{
-			struct only_accepts_nonconst_pointers {};
+			if (lua_istable(L, index)) return 0; else return -1;
+		}

-			template<class T, class Direction>
-			struct specialize;
+		template<class T>
+		void converter_postcall(lua_State*, T, int) {}
+	};

-			template<class T>
-			struct specialize<T, lua_to_cpp> {
-				using type = container_converter_lua_to_cpp<Policies>;
-			};
+	template<class Policies>
+	struct container_converter_cpp_to_lua
+	{
+		template<class T>
+		void apply(lua_State* L, const T& container)
+		{
+			typedef typename T::value_type value_type;

-			template<class T>
-			struct specialize<T, cpp_to_lua> {
-				using type = container_converter_cpp_to_lua<Policies>;
-			};
+			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
+			typename mpl::apply_wrap2<converter_policy,value_type,lua_to_cpp>::type converter;
+
+			lua_newtable(L);
+
+			int index = 1;
+
+			for (typename T::const_iterator i = container.begin(); i != container.end(); ++i)
+			{
+				converter.apply(L, *i);
+				lua_rawseti(L, -2, index);
+				++index;
+			}
+		}
+	};
+
+	template<int N, class Policies>
+//	struct container_policy : converter_policy_tag
+	struct container_policy : conversion_policy<N>
+	{
+//		BOOST_STATIC_CONSTANT(int, index = N);
+
+		static void precall(lua_State*, const index_map&) {}
+		static void postcall(lua_State*, const index_map&) {}
+
+		struct only_accepts_nonconst_pointers {};
+
+		template<class T, class Direction>
+		struct apply
+		{
+			typedef typename boost::mpl::if_<boost::is_same<lua_to_cpp, Direction>
+				, container_converter_lua_to_cpp<Policies>
+				, container_converter_cpp_to_lua<Policies>
+			>::type type;
 		};
+	};

-	}
-}
+}}

 namespace luabind
 {
-	template<unsigned int N, typename ElementPolicies = no_policies >
-	using container_policy = meta::type_list<converter_policy_injector<N, detail::container_policy<ElementPolicies>>>;
+	template<int N>
+	detail::policy_cons<detail::container_policy<N, detail::null_type>, detail::null_type> 
+	container(LUABIND_PLACEHOLDER_ARG(N)) 
+	{ 
+		return detail::policy_cons<detail::container_policy<N, detail::null_type>, detail::null_type>(); 
+	}
+
+	template<int N, class Policies>
+	detail::policy_cons<detail::container_policy<N, Policies>, detail::null_type> 
+	container(LUABIND_PLACEHOLDER_ARG(N), const Policies&) 
+	{ 
+		return detail::policy_cons<detail::container_policy<N, Policies>, detail::null_type>(); 
+	}
 }

 #endif // LUABIND_CONTAINER_POLICY_HPP_INCLUDED
-