Skip to content

Respect the function owner when calling a function from Lua #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micheljung wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Respect the function owner when calling a function from Lua #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ba9e17
Add .editorconfig
micheljung Jul 21, 2025
9647047
Respect the function owner when calling a function from Lua
micheljung Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[{*.h,*.c,*.cpp,*.cs}]
charset = utf-8
end_of_line = lf
indent_size = 4
tab_width = 4
indent_style = tab
insert_final_newline = true
max_line_length = 140
56 changes: 38 additions & 18 deletions Source/LuaMachine/Private/LuaState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,19 @@ void ULuaState::FromLuaValue(FLuaValue& LuaValue, UObject* CallContext, lua_Stat
}
if (CallContext)
{
UObject* FunctionOwner = CallContext;
if (ULuaComponent* LuaComponent = Cast<ULuaComponent>(CallContext))
const UObject* FunctionOwner;
if (LuaValue.Object != nullptr)
{
FunctionOwner = LuaValue.Object;
}
else if (const ULuaComponent* LuaComponent = Cast<ULuaComponent>(CallContext))
{
FunctionOwner = LuaComponent->GetOwner();
}
else
{
FunctionOwner = CallContext;
}

if (FunctionOwner)
{
Expand Down Expand Up @@ -1344,9 +1352,11 @@ int ULuaState::MetaTableFunction__call(lua_State* L)
bool bImplicitSelf = false;
int StackPointer = 2;

UFunction* Function = LuaCallContext->Function.Get();
if (ULuaComponent* LuaComponent = Cast<ULuaComponent>(CallScope))
{
CallScope = LuaComponent->GetOwner();
UClass* DeclaringClass = Cast<UClass>(Function->GetOuter());
CallScope = DeclaringClass->IsChildOf(ULuaComponent::StaticClass()) ? LuaCallContext->Context.Get() : LuaComponent->GetOwner();
if (NArgs > 0)
{
FLuaValue LuaFirstArgument = LuaState->ToLuaValue(StackPointer, L);
Expand All @@ -1369,13 +1379,13 @@ int ULuaState::MetaTableFunction__call(lua_State* L)
}

FScopeCycleCounterUObject ObjectScope(CallScope);
FScopeCycleCounterUObject FunctionScope(LuaCallContext->Function.Get());
FScopeCycleCounterUObject FunctionScope(Function);

void* Parameters = FMemory_Alloca(LuaCallContext->Function->ParmsSize);
FMemory::Memzero(Parameters, LuaCallContext->Function->ParmsSize);

#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> It(LuaCallContext->Function.Get()); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
for (TFieldIterator<FProperty> It(Function); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
{
FProperty* Prop = *It;
#else
Expand All @@ -1397,7 +1407,7 @@ int ULuaState::MetaTableFunction__call(lua_State* L)

// arguments
#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> FArgs(LuaCallContext->Function.Get()); FArgs && ((FArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++FArgs)
for (TFieldIterator<FProperty> FArgs(Function); FArgs && ((FArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++FArgs)
{
FProperty* Prop = *FArgs;
FStructProperty* LuaProp = CastField<FStructProperty>(Prop);
Expand Down Expand Up @@ -1454,7 +1464,7 @@ int ULuaState::MetaTableFunction__call(lua_State* L)
}

LuaState->InceptionLevel++;
CallScope->ProcessEvent(LuaCallContext->Function.Get(), Parameters);
CallScope->ProcessEvent(Function, Parameters);
check(LuaState->InceptionLevel > 0);
LuaState->InceptionLevel--;

Expand Down Expand Up @@ -1487,7 +1497,7 @@ int ULuaState::MetaTableFunction__call(lua_State* L)

// get return value
#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> FArgs(LuaCallContext->Function.Get()); FArgs; ++FArgs)
for (TFieldIterator<FProperty> FArgs(Function); FArgs; ++FArgs)
{
FProperty* Prop = *FArgs;
#else
Expand Down Expand Up @@ -1550,7 +1560,7 @@ int ULuaState::MetaTableFunction__call(lua_State* L)
}

#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> It(LuaCallContext->Function.Get()); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
for (TFieldIterator<FProperty> It(Function); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
#else
for (TFieldIterator<UProperty> It(LuaCallContext->Function.Get()); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
#endif
Expand Down Expand Up @@ -1582,9 +1592,11 @@ int ULuaState::MetaTableFunction__rawcall(lua_State * L)
bool bImplicitSelf = false;
int StackPointer = 2;

UFunction* Function = LuaCallContext->Function.Get();
if (ULuaComponent* LuaComponent = Cast<ULuaComponent>(CallScope))
{
CallScope = LuaComponent->GetOwner();
UClass* DeclaringClass = Cast<UClass>(Function->GetOuter());
CallScope = DeclaringClass->IsChildOf(ULuaComponent::StaticClass()) ? LuaCallContext->Context.Get() : LuaComponent->GetOwner();
if (NArgs > 0)
{
FLuaValue LuaFirstArgument = LuaState->ToLuaValue(StackPointer, L);
Expand All @@ -1607,13 +1619,13 @@ int ULuaState::MetaTableFunction__rawcall(lua_State * L)
}

FScopeCycleCounterUObject ObjectScope(CallScope);
FScopeCycleCounterUObject FunctionScope(LuaCallContext->Function.Get());
FScopeCycleCounterUObject FunctionScope(Function);

void* Parameters = FMemory_Alloca(LuaCallContext->Function->ParmsSize);
FMemory::Memzero(Parameters, LuaCallContext->Function->ParmsSize);

#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> It(LuaCallContext->Function.Get()); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
for (TFieldIterator<FProperty> It(Function); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
{
FProperty* Prop = *It;
#else
Expand All @@ -1635,7 +1647,7 @@ int ULuaState::MetaTableFunction__rawcall(lua_State * L)

// arguments
#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> FArgs(LuaCallContext->Function.Get()); FArgs && ((FArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++FArgs)
for (TFieldIterator<FProperty> FArgs(Function); FArgs && ((FArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++FArgs)
{
FProperty* Prop = *FArgs;
#else
Expand All @@ -1648,7 +1660,7 @@ int ULuaState::MetaTableFunction__rawcall(lua_State * L)
}

LuaState->InceptionLevel++;
CallScope->ProcessEvent(LuaCallContext->Function.Get(), Parameters);
CallScope->ProcessEvent(Function, Parameters);
check(LuaState->InceptionLevel > 0);
LuaState->InceptionLevel--;

Expand Down Expand Up @@ -1681,7 +1693,7 @@ int ULuaState::MetaTableFunction__rawcall(lua_State * L)

// get return value
#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> FArgs(LuaCallContext->Function.Get()); FArgs; ++FArgs)
for (TFieldIterator<FProperty> FArgs(Function); FArgs; ++FArgs)
{
FProperty* Prop = *FArgs;
#else
Expand All @@ -1707,7 +1719,7 @@ int ULuaState::MetaTableFunction__rawcall(lua_State * L)
}

#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> It(LuaCallContext->Function.Get()); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
for (TFieldIterator<FProperty> It(Function); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
#else
for (TFieldIterator<UProperty> It(LuaCallContext->Function.Get()); (It && It->HasAnyPropertyFlags(CPF_Parm)); ++It)
#endif
Expand Down Expand Up @@ -2985,11 +2997,19 @@ void ULuaState::SetupAndAssignUserDataMetatable(UObject * Context, TMap<FString,
// first check for UFunction
if (Pair.Value.Type == ELuaValueType::UFunction)
{
UObject* FunctionOwner = Context;
if (ULuaComponent* LuaComponent = Cast<ULuaComponent>(Context))
const UObject* FunctionOwner;
if (Pair.Value.Object != nullptr)
{
FunctionOwner = Pair.Value.Object;
}
else if (const ULuaComponent* LuaComponent = Cast<ULuaComponent>(Context))
{
FunctionOwner = LuaComponent->GetOwner();
}
else
{
FunctionOwner = Context;
}

if (FunctionOwner)
{
Expand Down