Improve cxx port.

Author: viferga

source/ports/cxx_port/include/metacall/metacall.hpp

@@ -336,7 +336,7 @@ inline std::nullptr_t value<std::nullptr_t>::to_value() const
 	return nullptr;
 }
 
-// TODO: Array, Map, Future, Function, Class, Object, Exception, Throwable...
+// TODO: Future, Function, Class, Object, Exception, Throwable...
 
 template <typename K, typename V>
 class METACALL_API map : public value_base
@@ -386,6 +386,17 @@ class METACALL_API map : public value_base
 		rehash();
 	}
 
+	V operator[](const K &key) const
+	{
+		return m.at(key).second.to_value();
+	}
+
+	static enum metacall_value_id id()
+	{
+		return METACALL_MAP;
+	}
+
+protected:
 	void rehash()
 	{
 		void *ptr = value_ptr.get();
@@ -406,31 +417,7 @@ class METACALL_API map : public value_base
 		}
 	}
 
-	V operator[](const K &key) const
-	{
-		return m.at(key).second.to_value();
-	}
-
 private:
-	/*
-	// Case 1: value is value_base (e.g. nested metacall map value)
-	template <typename T>
-	static typename std::enable_if<std::is_base_of<value_base, T>::value, value<T>>::type
-	wrap_value(const T &v)
-	{
-		return const_cast<T &>(v);
-	}
-
-	// Case 2: value is a plain type
-	template <typename T>
-	static typename std::enable_if<!std::is_base_of<value_base, T>::value, value<T>>::type
-	wrap_value(const T &v)
-	{
-		value<T> val(v);
-		return val;
-	}
-	*/
-
 	std::unordered_map<K, pair_value_type> m;
 };
 

source/tests/metacall_cxx_port_test/source/metacall_cxx_port_test.cpp

@@ -46,22 +46,23 @@ void *cxx_map_test(size_t argc, void *args[], void *data)
 	return metacall_value_create_null();
 }
 
+// TODO:
+/*
 void *cxx_recursive_map_test(size_t argc, void *args[], void *data)
 {
-	map<std::string, float> m(args[0]);
+	map<std::string, map<std::string, float>> m(args[0]);
 
 	(void)argc;
 	(void)data;
 
-	EXPECT_EQ((float)m["hello"], (float)3.0f);
-	EXPECT_EQ((float)m["world"], (float)4.0f);
+	EXPECT_EQ((float)m["hello"]["world"], (float)4.0f);
 
-	printf("hello => %f\n", m["hello"]);
-	printf("world => %f\n", m["world"]);
+	printf("hello => %f\n", m["hello"]["world"]);
 	fflush(stdout);
 
 	return metacall_value_create_null();
 }
+*/
 
 TEST_F(metacall_cxx_port_test, DefaultConstructor)
 {
@@ -88,10 +89,11 @@ TEST_F(metacall_cxx_port_test, DefaultConstructor)
 		metacall_value_destroy(ret);
 	}
 
+	// TODO:
 	/*
 	{
 		map<std::string, map<std::string, float>> m = {
-			{ "hello", { "world", 4.0f } },
+			{ "hello", { "world", 4.0f } }
 		};
 
 		void *args[] = {