libscript: Spanify MCScriptExecuteContext::PushFrame()

peter-b · peter-b · commit d5c710cf34ff · 2016-10-25T15:56:07.000+01:00
diff --git a/libscript/src/script-bytecode.hpp b/libscript/src/script-bytecode.hpp
@@ -322,8 +322,7 @@ struct MCScriptBytecodeOp_Invoke
 				ctxt.PushFrame(t_resolved_instance,
 							   static_cast<MCScriptHandlerDefinition *>(t_resolved_definition),
 							   t_result_reg,
-							   t_argument_regs,
-							   t_argument_count);
+				               MCMakeSpan(t_argument_regs, t_argument_count));
 			}
 			break;
 				
@@ -544,8 +543,7 @@ struct MCScriptBytecodeOp_InvokeIndirect
 				ctxt.PushFrame(t_handler_instance,
 							   static_cast<MCScriptHandlerDefinition *>(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.hpp b/libscript/src/script-execute.hpp
@@ -133,8 +133,7 @@ class MCScriptExecuteContext
 	void PushFrame(MCScriptInstanceRef instance,
 				   MCScriptHandlerDefinition *handler,
 				   uindex_t result_reg,
-				   const uindex_t *argument_regs,
-				   uindex_t argument_count);
+	               MCSpan<const uindex_t> argument_regs);
 	
 	// Pop the current activation frame and set the return value to the contents
 	// of the given register. If result_reg is UINDEX_MAX, then it means there is
@@ -687,8 +686,7 @@ inline void
 MCScriptExecuteContext::PushFrame(MCScriptInstanceRef p_instance,
                                   MCScriptHandlerDefinition *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)
 	{
@@ -726,11 +724,11 @@ MCScriptExecuteContext::PushFrame(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;
     }
     
@@ -802,16 +800,16 @@ MCScriptExecuteContext::PushFrame(MCScriptInstanceRef p_instance,
     // caller registers that were passed so we can copy back at the end.
     if (t_needs_mapping)
     {
-        if (!MCMemoryNewArray(p_argument_count,
+	    if (!MCMemoryNewArray(p_argument_regs.size(),
                               t_new_frame->mapping))
         {
             Rethrow();
             return;
         }
         
         MCMemoryCopy(t_new_frame->mapping,
-                     p_argument_regs,
-                     p_argument_count * sizeof(p_argument_regs[0]));
+                     p_argument_regs.data(),
+                     p_argument_regs.sizeBytes());
     }
     
     // Finally, make the new frame the current frame and set the
