Skip to content

Fix: metamethod call #29

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

Merged
merged 1 commit into from
Oct 13, 2024
Merged

Fix: metamethod call #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Lua/LuaFunctionExecutionContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public readonly record struct LuaFunctionExecutionContext
public required LuaState State { get; init; }
public required LuaThread Thread { get; init; }
public required int ArgumentCount { get; init; }
public int FrameBase { get; init; }
public required int FrameBase { get; init; }
public SourcePosition? SourcePosition { get; init; }
public string? RootChunkName { get; init; }
public string? ChunkName { get; init; }
Expand Down
41 changes: 41 additions & 0 deletions src/Lua/Runtime/LuaVirtualMachine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -183,7 +186,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -223,7 +229,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -263,7 +272,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -308,7 +320,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -348,7 +363,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -386,7 +404,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 1,
FrameBase = stack.Count - 1,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -431,7 +452,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 1,
FrameBase = stack.Count - 1,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -489,7 +513,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer.AsMemory(), cancellationToken);

stack.UnsafeGet(RA) = methodBuffer[0];
Expand Down Expand Up @@ -534,7 +561,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer, cancellationToken);

compareResult = methodBuffer[0].ToBoolean();
Expand Down Expand Up @@ -584,7 +614,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer, cancellationToken);

compareResult = methodBuffer[0].ToBoolean();
Expand Down Expand Up @@ -638,7 +671,10 @@ await func.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 2,
FrameBase = stack.Count - 2,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer, cancellationToken);

compareResult = methodBuffer[0].ToBoolean();
Expand Down Expand Up @@ -949,6 +985,8 @@ await indexTable.InvokeAsync(new()
ArgumentCount = 2,
SourcePosition = chunk.SourcePositions[pc],
FrameBase = stack.Count - 2,
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer, cancellationToken);

return methodBuffer[0];
Expand Down Expand Up @@ -1007,7 +1045,10 @@ await indexTable.InvokeAsync(new()
State = state,
Thread = thread,
ArgumentCount = 3,
FrameBase = stack.Count - 3,
SourcePosition = chunk.SourcePositions[pc],
ChunkName = chunk.Name,
RootChunkName = chunk.GetRoot().Name,
}, methodBuffer, cancellationToken);
}
finally
Expand Down