libscript: Spanify MCScriptExecuteContext::InvokeForeign()

peter-b · peter-b · commit 48759e896aba · 2016-10-25T15:56:07.000+01:00
diff --git a/libscript/src/script-bytecode.hpp b/libscript/src/script-bytecode.hpp
@@ -331,8 +331,7 @@ struct MCScriptBytecodeOp_Invoke
 				ctxt.InvokeForeign(t_resolved_instance,
 								   static_cast<MCScriptForeignHandlerDefinition *>(t_resolved_definition),
 								   t_result_reg,
-								   t_argument_regs,
-								   t_argument_count);
+				                   MCMakeSpan(t_argument_regs, t_argument_count));
 			}
 			break;
 				
@@ -552,8 +551,7 @@ struct MCScriptBytecodeOp_InvokeIndirect
 				ctxt.InvokeForeign(t_handler_instance,
 								   static_cast<MCScriptForeignHandlerDefinition *>(t_handler_def),
 								   p_result_reg,
-								   p_argument_regs,
-								   p_argument_count);
+				                   MCMakeSpan(p_argument_regs, p_argument_count));
 			}
 			break;
 				
diff --git a/libscript/src/script-execute.cpp b/libscript/src/script-execute.cpp
@@ -220,8 +220,7 @@ void
 MCScriptExecuteContext::InvokeForeign(MCScriptInstanceRef p_instance,
 									  MCScriptForeignHandlerDefinition *p_handler_def,
 									  uindex_t p_result_reg,
-									  const uindex_t *p_argument_regs,
-									  uindex_t p_argument_count)
+                                      MCSpan<const uindex_t> p_argument_regs)
 {
 	if (m_error)
 	{
@@ -244,11 +243,11 @@ MCScriptExecuteContext::InvokeForeign(MCScriptInstanceRef p_instance,
 								  p_handler_def);
 	
 	// Check the parameter count.
-	if (MCHandlerTypeInfoGetParameterCount(t_signature) != p_argument_count)
+	if (MCHandlerTypeInfoGetParameterCount(t_signature) != p_argument_regs.size())
 	{
 		ThrowWrongNumberOfArguments(p_instance,
 									p_handler_def,
-									p_argument_count);
+		                            p_argument_regs.size());
 		return;
 	}
 	
diff --git a/libscript/src/script-execute.hpp b/libscript/src/script-execute.hpp
@@ -145,8 +145,7 @@ class MCScriptExecuteContext
 	void InvokeForeign(MCScriptInstanceRef instance,
 					   MCScriptForeignHandlerDefinition *handler,
 					   uindex_t result_reg,
-					   const uindex_t *argument_regs,
-					   uindex_t argument_count);
+	                   MCSpan<const uindex_t> argument_regs);
 	
 	// Enter the LCB VM to execute the specified handler in the given instance.
 	void Enter(MCScriptInstanceRef instance,

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,7 @@ void`
`220`	`220`	`MCScriptExecuteContext::InvokeForeign(MCScriptInstanceRef p_instance,`
`221`	`221`	`MCScriptForeignHandlerDefinition *p_handler_def,`
`222`	`222`	`uindex_t p_result_reg,`
`223`		`- const uindex_t *p_argument_regs,`
`224`		`- uindex_t p_argument_count)`
	`223`	`+ MCSpan<const uindex_t> p_argument_regs)`
`225`	`224`	`{`
`226`	`225`	`if (m_error)`
`227`	`226`	`{`
`@@ -244,11 +243,11 @@ MCScriptExecuteContext::InvokeForeign(MCScriptInstanceRef p_instance,`
`244`	`243`	`p_handler_def);`
`245`	`244`
`246`	`245`	`// Check the parameter count.`
`247`		`- if (MCHandlerTypeInfoGetParameterCount(t_signature) != p_argument_count)`
	`246`	`+ if (MCHandlerTypeInfoGetParameterCount(t_signature) != p_argument_regs.size())`
`248`	`247`	`{`
`249`	`248`	`ThrowWrongNumberOfArguments(p_instance,`
`250`	`249`	`p_handler_def,`
`251`		`- p_argument_count);`
	`250`	`+ p_argument_regs.size());`
`252`	`251`	`return;`
`253`	`252`	`}`
`254`	`253`