C4AulFuncMap::GetFunc: Remove unused After parameter

legacyclonk · Jul 16, 2023 · ec522eb · ec522eb
1 parent 39cd868
commit ec522eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/src/C4Aul.cpp b/src/C4Aul.cpp
@@ -264,10 +264,6 @@ C4AulFunc *C4AulScript::GetOverloadedFunc(C4AulFunc *ByFunc)
 		if (SEqual(ByFunc->Name, f->Name)) break;
 		f = f->Prev;
 	}
-#ifndef NDEBUG
-	C4AulFunc *f2 = Engine ? Engine->GetFunc(ByFunc->Name, this, ByFunc) : nullptr;
-	assert(f == f2);
-#endif
 	// nothing found? then search owner, if existent
 	if (!f && Owner)
 	{
@@ -292,7 +288,7 @@ C4AulFunc *C4AulScript::GetFuncRecursive(const char *pIdtf)
 
 C4AulFunc *C4AulScript::GetFunc(const char *pIdtf)
 {
-	return Engine ? Engine->GetFunc(pIdtf, this, nullptr) : nullptr;
+	return Engine ? Engine->GetFunc(pIdtf, this) : nullptr;
 }
 
 C4AulScriptFunc *C4AulScript::GetSFuncWarn(const char *pIdtf, C4AulAccess AccNeeded, const char *WarnStr)
@@ -549,17 +545,11 @@ C4AulFunc *C4AulFuncMap::GetFirstFunc(const char *Name)
 	return Func;
 }
 
-C4AulFunc *C4AulFuncMap::GetFunc(const char *Name, const C4AulScript *Owner, const C4AulFunc *After)
+C4AulFunc *C4AulFuncMap::GetFunc(const char *Name, const C4AulScript *Owner)
 {
 	if (!Name) return nullptr;
 	C4AulFunc *Func = Funcs[Hash(Name) % Capacity];
-	if (After)
-	{
-		while (Func && Func != After)
-			Func = Func->MapNext;
-		if (Func)
-			Func = Func->MapNext;
-	}
+
 	while (Func && (Func->Owner != Owner || !SEqual(Name, Func->Name)))
 		Func = Func->MapNext;
 	return Func;

diff --git a/src/C4Aul.h b/src/C4Aul.h
@@ -374,7 +374,7 @@ class C4AulFuncMap
 public:
 	C4AulFuncMap();
 	~C4AulFuncMap();
-	C4AulFunc *GetFunc(const char *Name, const C4AulScript *Owner, const C4AulFunc *After);
+	C4AulFunc *GetFunc(const char *Name, const C4AulScript *Owner);
 	C4AulFunc *GetFirstFunc(const char *Name);
 
 private:
@@ -556,9 +556,9 @@ class C4AulScriptEngine : public C4AulScript
 		return FuncLookUp.GetFirstFunc(Name);
 	}
 
-	C4AulFunc *GetFunc(const char *Name, const C4AulScript *Owner, const C4AulFunc *After)
+	C4AulFunc *GetFunc(const char *Name, const C4AulScript *Owner)
 	{
-		return FuncLookUp.GetFunc(Name, Owner, After);
+		return FuncLookUp.GetFunc(Name, Owner);
 	}
 
 	// For the list of functions in the PropertyDlg

diff --git a/src/C4AulParse.cpp b/src/C4AulParse.cpp
@@ -3191,7 +3191,7 @@ bool C4AulParseState::Parse_Expression3()
 				// search a function with the given name
 				if (eCallType == AB_CALLGLOBAL)
 				{
-					pFunc = a->Engine->GetFunc(Idtf, a->Engine, nullptr);
+					pFunc = a->Engine->GetFunc(Idtf, a->Engine);
 					// allocate space for return value, otherwise the call-target-variable is used, which is not present here
 					AddBCC(AB_STACK, +1);
 				}