libscript: Spanify MCScriptExecuteContext::ThrowUnableToResolveMultiInvoke

peter-b · peter-b · commit da01ccf5d566 · 2016-10-25T15:56:07.000+01:00
diff --git a/libscript/src/script-bytecode.hpp b/libscript/src/script-bytecode.hpp
@@ -437,8 +437,7 @@ struct MCScriptBytecodeOp_Invoke
 		if (t_min_score_ambiguous || t_min_score_definition == NULL)
 		{
 			ctxt.ThrowUnableToResolveMultiInvoke(p_group,
-												 p_arguments,
-												 p_argument_count);
+			                                     MCMakeSpan(p_arguments, p_argument_count));
 			return;
 		}
 		
diff --git a/libscript/src/script-execute.hpp b/libscript/src/script-execute.hpp
@@ -202,8 +202,7 @@ class MCScriptExecuteContext
 	
 	// Raise an 'unable to resolve multi-invoke' error.
 	void ThrowUnableToResolveMultiInvoke(MCScriptDefinitionGroupDefinition *group,
-										 const uindex_t *arguments,
-										 uindex_t argument_count);
+	                                     MCSpan<const uindex_t> arguments);
 	
 	// Raise a 'value is not a handler' error.
 	void ThrowNotAHandlerValue(MCValueRef actual_value);
@@ -1237,14 +1236,13 @@ MCScriptExecuteContext::Rethrow(bool /*ignored*/)
 
 inline void
 MCScriptExecuteContext::ThrowUnableToResolveMultiInvoke(MCScriptDefinitionGroupDefinition *p_group,
-														const uindex_t *p_arguments,
-														uindex_t p_argument_count)
+                                                        MCSpan<const uindex_t> p_arguments)
 {
 	MCAutoProperListRef t_args;
 	if (!MCProperListCreateMutable(&t_args))
 		return;
 	
-	for(uindex_t i = 0; i < p_argument_count; i++)
+	for(uindex_t i = 0; i < p_arguments.size(); i++)
 	{
 		MCValueRef t_value;
 		t_value = FetchRegister(p_arguments[i]);

Original file line number	Diff line number	Diff line change
`@@ -437,8 +437,7 @@ struct MCScriptBytecodeOp_Invoke`
`437`	`437`	`if (t_min_score_ambiguous \|\| t_min_score_definition == NULL)`
`438`	`438`	`{`
`439`	`439`	`ctxt.ThrowUnableToResolveMultiInvoke(p_group,`
`440`		`- p_arguments,`
`441`		`- p_argument_count);`
	`440`	`+ MCMakeSpan(p_arguments, p_argument_count));`
`442`	`441`	`return;`
`443`	`442`	`}`
`444`	`443`