[[ Foundation ]] Add new forms of MCError construction

runrevmark · runrevmark · commit 748ab6a1c6bb · 2016-09-07T12:23:16.000+01:00
This patch adds new constructors for MCError, allowing varargs or va_list forms.
diff --git a/libfoundation/include/foundation.h b/libfoundation/include/foundation.h
@@ -2813,9 +2813,23 @@ MC_DLLEXPORT extern MCTypeInfoRef kMCUnboundTypeErrorTypeInfo;
 MC_DLLEXPORT extern MCTypeInfoRef kMCUnimplementedErrorTypeInfo;
 
 MC_DLLEXPORT bool MCErrorCreate(MCTypeInfoRef typeinfo, MCArrayRef info, MCErrorRef& r_error);
+MC_DLLEXPORT bool MCErrorCreateS(MCErrorRef& r_error,
+								 MCTypeInfoRef typeinfo,
+								 ...);
+MC_DLLEXPORT bool MCErrorCreateV(MCErrorRef& r_error,
+								 MCTypeInfoRef typeinfo,
+								 va_list args);
 
 MC_DLLEXPORT bool MCErrorCreateWithMessage(MCTypeInfoRef typeinfo, MCStringRef message, MCArrayRef info, MCErrorRef & r_error);
-
+MC_DLLEXPORT bool MCErrorCreateWithMessageS(MCErrorRef& r_error,
+											MCTypeInfoRef typeinfo,
+											MCStringRef message,
+											...);
+MC_DLLEXPORT bool MCErrorCreateWithMessageV(MCErrorRef& r_error,
+											MCTypeInfoRef typeinfo,
+											MCStringRef message,
+											va_list args);
+	
 MC_DLLEXPORT bool MCErrorUnwind(MCErrorRef error, MCValueRef target, uindex_t row, uindex_t column);
 
 MC_DLLEXPORT MCNameRef MCErrorGetDomain(MCErrorRef error);
diff --git a/libfoundation/src/foundation-error.cpp b/libfoundation/src/foundation-error.cpp
@@ -154,6 +154,79 @@ MCErrorCreateWithMessage (MCTypeInfoRef p_typeinfo,
     return true;
 }
 
+MC_DLLEXPORT_DEF
+bool MCErrorCreateWithMessageV(MCErrorRef& r_error,
+							   MCTypeInfoRef p_error_type,
+							   MCStringRef p_message,
+							   va_list p_args)
+{
+	__MCAssertIsErrorTypeInfo(p_error_type);
+	__MCAssertIsString(p_message);
+	MCAutoArrayRef t_info;
+	if (!MCArrayCreateMutable(&t_info))
+		return false;
+	
+	for(;;)
+	{
+		const char *t_key;
+		t_key = va_arg(p_args, const char *);
+		if (t_key == nil)
+			break;
+		
+		MCValueRef t_value;
+		t_value = va_arg(p_args, MCValueRef);
+		
+		// If a value is nil, then it means don't include it.
+		if (t_value == nil)
+			continue;
+		
+		MCNewAutoNameRef t_name;
+		if (!MCNameCreateWithNativeChars((const char_t *)t_key,
+										 strlen(t_key),
+										 &t_name))
+			return false;
+		
+		if (!MCArrayStoreValue(*t_info,
+							   true,
+							   *t_name,
+							   t_value))
+		{
+			return false;
+		}
+	}
+	
+	if (!MCErrorCreateWithMessage(p_error_type,
+								  p_message,
+								  *t_info,
+								  r_error))
+	{
+		return false;
+	}
+	
+	return true;
+}
+
+MC_DLLEXPORT_DEF
+bool MCErrorCreateWithMessageS(MCErrorRef& r_error,
+							   MCTypeInfoRef p_error_type,
+							   MCStringRef p_message,
+							   ...)
+{
+	va_list t_args;
+	va_start(t_args, p_message);
+	
+	bool t_result;
+	t_result = MCErrorCreateWithMessageV(r_error,
+										 p_error_type,
+										 p_message,
+										 t_args);
+	
+	va_end(t_args);
+	
+	return t_result;
+	
+}
+
 MC_DLLEXPORT_DEF
 bool MCErrorCreate(MCTypeInfoRef p_typeinfo, MCArrayRef p_info, MCErrorRef& r_error)
 {
@@ -163,6 +236,35 @@ bool MCErrorCreate(MCTypeInfoRef p_typeinfo, MCArrayRef p_info, MCErrorRef& r_er
 	                                 r_error);
 }
 
+MC_DLLEXPORT_DEF
+bool MCErrorCreateV(MCErrorRef& r_error,
+					MCTypeInfoRef p_typeinfo,
+					va_list p_args)
+{
+	return MCErrorCreateWithMessageV(r_error,
+									 p_typeinfo,
+									 MCErrorTypeInfoGetMessage (p_typeinfo),
+									 p_args);
+}
+
+MC_DLLEXPORT_DEF
+bool MCErrorCreateS(MCErrorRef& r_error,
+					MCTypeInfoRef p_typeinfo,
+					...)
+{
+	va_list t_args;
+	va_start(t_args, p_typeinfo);
+	
+	bool t_result;
+	t_result = MCErrorCreateV(r_error,
+							  p_typeinfo,
+							  t_args);
+	
+	va_end(t_args);
+	
+	return t_result;
+}
+
 MC_DLLEXPORT_DEF
 bool MCErrorUnwind(MCErrorRef p_error, MCValueRef p_target, uindex_t p_row, uindex_t p_column)
 {
@@ -325,38 +427,16 @@ MCErrorCreateAndThrowWithMessageV (MCTypeInfoRef p_error_type,
                                    MCStringRef p_message,
                                    va_list p_args)
 {
-	__MCAssertIsErrorTypeInfo(p_error_type);
-	__MCAssertIsString(p_message);
-    MCAutoArrayRef t_info;
-    if (!MCArrayCreateMutable(&t_info))
-        return false;
-    
-    for(;;)
-    {
-        const char *t_key;
-        t_key = va_arg(p_args, const char *);
-        if (t_key == nil)
-            break;
-        
-        MCValueRef t_value;
-        t_value = va_arg(p_args, MCValueRef);
-        
-        // If a value is nil, then it means don't include it.
-        if (t_value == nil)
-            continue;
-        
-        MCNewAutoNameRef t_name;
-        if (!MCNameCreateWithNativeChars((const char_t *)t_key, strlen(t_key), &t_name))
-            return false;
-        
-        if (!MCArrayStoreValue(*t_info, true, *t_name, t_value))
-            return false;
-    }
-    
-    MCAutoErrorRef t_error;
-    if (!MCErrorCreateWithMessage(p_error_type, p_message, *t_info, &t_error))
-        return false;
-    
+	
+	MCAutoErrorRef t_error;
+	if (!MCErrorCreateWithMessageV(&t_error,
+								   p_error_type,
+								   p_message,
+								   p_args))
+	{
+		return false;
+	}
+	
     return MCErrorThrow(*t_error);
 }
 
