Add information about value types.

Author: viferga

source/cli/plugins/cli_core_plugin/source/cli_core_plugin.cpp

@@ -75,8 +75,8 @@ void *load(size_t argc, void *args[], void *data)
 		}
 		else
 		{
-			log_write("metacall", LOG_LEVEL_ERROR, "Calling load with wrong type of argument at argument position %" PRIuS ", expected metacall value id %" PRIuS " , got %" PRIuS,
-				i + 1, METACALL_STRING, metacall_value_id(script_val[i]));
+			log_write("metacall", LOG_LEVEL_ERROR, "Calling load with wrong type of argument at argument position %" PRIuS ", expected %s, got %s",
+				i + 1, metacall_value_id_name(METACALL_STRING), metacall_value_type_name(script_val[i]));
 			return metacall_value_create_int(1);
 		}
 	}
@@ -107,8 +107,8 @@ void *eval(size_t argc, void *args[], void *data)
 	}
 	else
 	{
-		log_write("metacall", LOG_LEVEL_ERROR, "Calling eval with wrong type of arguments, expected metacall value id %" PRIuS " , got %" PRIuS "  and %" PRIuS,
-			METACALL_STRING, metacall_value_id(args[0]), metacall_value_id(args[1]));
+		log_write("metacall", LOG_LEVEL_ERROR, "Calling eval with wrong type of arguments, expected two %s, got %s and %s",
+			metacall_value_id_name(METACALL_STRING), metacall_value_type_name(args[0]), metacall_value_type_name(args[1]));
 	}
 
 	return metacall_value_create_int(1);
@@ -127,7 +127,8 @@ void *await(size_t argc, void *args[], void *data)
 
 	if (metacall_value_id(args[0]) != METACALL_STRING)
 	{
-		log_write("metacall", LOG_LEVEL_ERROR, "Calling await with wrong type of arguments, expected metacall value id %" PRIuS " , got %" PRIuS, METACALL_STRING, metacall_value_id(args[0]));
+		log_write("metacall", LOG_LEVEL_ERROR, "Calling await with wrong type of arguments, expected %s, got %s",
+			metacall_value_id_name(METACALL_STRING), metacall_value_type_name(args[0]));
 		return metacall_value_create_int(1);
 	}
 
@@ -217,7 +218,8 @@ void *call(size_t argc, void *args[], void *data)
 
 	if (metacall_value_id(args[0]) != METACALL_STRING)
 	{
-		log_write("metacall", LOG_LEVEL_ERROR, "Calling call with wrong type of arguments, expected metacall value id %" PRIuS " , got %" PRIuS, METACALL_STRING, metacall_value_id(args[0]));
+		log_write("metacall", LOG_LEVEL_ERROR, "Calling call with wrong type of arguments, expected %s, got %s",
+			metacall_value_id_name(METACALL_STRING), metacall_value_type_name(args[0]));
 		return metacall_value_create_int(1);
 	}
 
@@ -268,8 +270,8 @@ void *clear(size_t argc, void *args[], void *data)
 
 	if (metacall_value_id(args[0]) != METACALL_STRING && metacall_value_id(args[1]) != METACALL_STRING)
 	{
-		log_write("metacall", LOG_LEVEL_ERROR, "Calling clear with wrong type of arguments, expected metacall value id %" PRIuS " , got %" PRIuS "  and %" PRIuS,
-			METACALL_STRING, metacall_value_id(args[0]), metacall_value_id(args[1]));
+		log_write("metacall", LOG_LEVEL_ERROR, "Calling clear with wrong type of arguments, expected two %s, got %s and %s",
+			metacall_value_id_name(METACALL_STRING), metacall_value_type_name(args[0]), metacall_value_type_name(args[1]));
 		return metacall_value_create_int(1);
 	}
 

source/metacall/include/metacall/metacall_value.h

@@ -357,6 +357,30 @@ METACALL_API size_t metacall_value_count(void *v);
 */
 METACALL_API enum metacall_value_id metacall_value_id(void *v);
 
+/**
+*  @brief
+*    Provide type id in a readable form (as string) of a type id
+*
+*  @param[in] id
+*    Value type identifier
+*
+*  @return
+*    Return string related to the type id
+*/
+METACALL_API const char *metacall_value_id_name(enum metacall_value_id id);
+
+/**
+*  @brief
+*    Provide type id in a readable form (as string) of value
+*
+*  @param[in] v
+*    Reference to the value
+*
+*  @return
+*    Return string related to the type id assigned to value
+*/
+METACALL_API const char *metacall_value_type_name(void *v);
+
 /**
 *  @brief
 *    Deep copies the value @v, the result copy resets

source/metacall/source/metacall_value.c

@@ -206,6 +206,18 @@ enum metacall_value_id metacall_value_id(void *v)
 	return METACALL_INVALID;
 }
 
+const char *metacall_value_id_name(enum metacall_value_id id)
+{
+	return type_id_name(id);
+}
+
+const char *metacall_value_type_name(void *v)
+{
+	type_id id = value_type_id(v);
+
+	return type_id_name(id);
+}
+
 void *metacall_value_copy(void *v)
 {
 	return value_type_copy(v);