libscript: Remove MCScriptExecuteContext::GetArgumentList()

peter-b · peter-b · commit dfeed19a7fba · 2016-10-25T15:56:08.000+01:00
The bytecode argument array is now always accessed as a span.
diff --git a/libscript/src/script-execute.hpp b/libscript/src/script-execute.hpp
@@ -330,29 +330,20 @@ MCScriptExecuteContext::GetNextAddress(void) const
 inline uindex_t
 MCScriptExecuteContext::GetArgumentCount(void) const
 {
-	MCAssert(m_operation_ready);
-	return m_argument_count;
+	return GetArguments().size();
 }
 
 inline uindex_t
 MCScriptExecuteContext::GetArgument(uindex_t p_index) const
 {
-	MCAssert(m_operation_ready);
-	return m_arguments[p_index];
-}
-
-inline const uindex_t *
-MCScriptExecuteContext::GetArgumentList(void) const
-{
-	MCAssert(m_operation_ready);
-	return m_arguments;
+	return GetArguments()[p_index];
 }
 
 inline MCSpan<const uindex_t>
 MCScriptExecuteContext::GetArguments() const
 {
 	MCAssert(m_operation_ready);
-	return MCMakeSpan(GetArgumentList(), GetArgumentCount());
+	return MCMakeSpan(m_arguments, m_argument_count);
 }
 
 inline index_t

Original file line number	Diff line number	Diff line change
`@@ -330,29 +330,20 @@ MCScriptExecuteContext::GetNextAddress(void) const`
`330`	`330`	`inline uindex_t`
`331`	`331`	`MCScriptExecuteContext::GetArgumentCount(void) const`
`332`	`332`	`{`
`333`		`- MCAssert(m_operation_ready);`
`334`		`- return m_argument_count;`
	`333`	`+ return GetArguments().size();`
`335`	`334`	`}`
`336`	`335`
`337`	`336`	`inline uindex_t`
`338`	`337`	`MCScriptExecuteContext::GetArgument(uindex_t p_index) const`
`339`	`338`	`{`
`340`		`- MCAssert(m_operation_ready);`
`341`		`- return m_arguments[p_index];`
`342`		`-}`
`343`		`-`
`344`		`-inline const uindex_t *`
`345`		`-MCScriptExecuteContext::GetArgumentList(void) const`
`346`		`-{`
`347`		`- MCAssert(m_operation_ready);`
`348`		`- return m_arguments;`
	`339`	`+ return GetArguments()[p_index];`
`349`	`340`	`}`
`350`	`341`
`351`	`342`	`inline MCSpan<const uindex_t>`
`352`	`343`	`MCScriptExecuteContext::GetArguments() const`
`353`	`344`	`{`
`354`	`345`	`MCAssert(m_operation_ready);`
`355`		`- return MCMakeSpan(GetArgumentList(), GetArgumentCount());`
	`346`	`+ return MCMakeSpan(m_arguments, m_argument_count);`
`356`	`347`	`}`
`357`	`348`
`358`	`349`	`inline index_t`