Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 sandbox/ConsoleApp1/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
var count = await state.RootAccess.RunAsync(closure);

Console.WriteLine("Result " + new string('-', 50));
using var results = state.RootAccess.ReadReturnValues(count);
using var results = state.RootAccess.ReadTopValues(count);
for (int i = 0; i < count; i++)
{
Console.WriteLine(results[i]);
Expand Down
4 changes: 2 additions & 2 deletions sandbox/ConsoleApp2/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
var access = threadLease.Thread.RootAccess;
{
var count = await access.RunAsync(closure, 0);
var results = access.ReadReturnValues(count);
var results = access.ReadTopValues(count);
for (int i = 0; i < results.Length; i++)
{
Console.WriteLine(results[i]);
Expand All @@ -21,7 +21,7 @@
results.Dispose();
access.Push("hello", "world", 1, 2, 3);
count = await access.RunAsync(f, 5);
results = access.ReadReturnValues(count);
results = access.ReadTopValues(count);
for (int i = 0; i < results.Length; i++)
{
Console.WriteLine(results[i]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

namespace Lua;

public readonly struct LuaReturnValuesReader : IDisposable
public readonly struct LuaTopValuesReader : IDisposable
{
readonly LuaStack stack;
readonly int returnBase;

internal LuaReturnValuesReader(LuaStack stack, int returnBase)
internal LuaTopValuesReader(LuaStack stack, int returnBase)
{
this.stack = stack;
this.returnBase = returnBase;
Expand Down
14 changes: 7 additions & 7 deletions src/Lua/Runtime/LuaThreadAccessExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static async ValueTask<int> DoFileAsync(this LuaThreadAccess access, stri
access.ThrowIfInvalid();
var closure = await access.State.LoadFileAsync(path, "bt", null, cancellationToken);
var count = await access.RunAsync(closure, 0, cancellationToken);
using var results = access.ReadReturnValues(count);
using var results = access.ReadTopValues(count);
results.AsSpan()[..Math.Min(buffer.Length, results.Length)].CopyTo(buffer.Span);
return results.Count;
}
Expand All @@ -48,15 +48,15 @@ public static async ValueTask<LuaValue[]> DoFileAsync(this LuaThreadAccess acces
{
var closure = await access.State.LoadFileAsync(path, "bt", null, cancellationToken);
var count = await access.RunAsync(closure, 0, cancellationToken);
using var results = access.ReadReturnValues(count);
using var results = access.ReadTopValues(count);
return results.AsSpan().ToArray();
}

public static async ValueTask<int> ExecuteAsync(this LuaThreadAccess access, LuaClosure closure, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
{
access.ThrowIfInvalid();
var count = await access.RunAsync(closure, 0, cancellationToken);
using var results = access.ReadReturnValues(count);
using var results = access.ReadTopValues(count);
results.AsSpan()[..Math.Min(buffer.Length, results.Length)].CopyTo(buffer.Span);
return results.Count;
}
Expand All @@ -65,7 +65,7 @@ public static async ValueTask<LuaValue[]> ExecuteAsync(this LuaThreadAccess acce
{
access.ThrowIfInvalid();
var count = await access.RunAsync(closure, 0, cancellationToken);
using var results = access.ReadReturnValues(count);
using var results = access.ReadTopValues(count);
return results.AsSpan().ToArray();
}

Expand Down Expand Up @@ -93,11 +93,11 @@ public static LuaValue Pop(this LuaThreadAccess access)
return access.Stack.Pop();
}

public static LuaReturnValuesReader ReadReturnValues(this LuaThreadAccess access, int argumentCount)
public static LuaTopValuesReader ReadTopValues(this LuaThreadAccess access, int argumentCount)
{
access.ThrowIfInvalid();
var stack = access.Stack;
return new LuaReturnValuesReader(stack, stack.Count - argumentCount);
return new LuaTopValuesReader(stack, stack.Count - argumentCount);
}

public static ValueTask<LuaValue> Add(this LuaThreadAccess access, LuaValue x, LuaValue y, CancellationToken cancellationToken = default)
Expand Down Expand Up @@ -313,7 +313,7 @@ static async ValueTask<LuaValue[]> Impl(LuaThreadAccess access, int funcIndex, C
{
await LuaVirtualMachine.Call(access.Thread, funcIndex, funcIndex, cancellationToken);
var count = access.Stack.Count - funcIndex;
using var results = access.ReadReturnValues(count);
using var results = access.ReadTopValues(count);
return results.AsSpan().ToArray();
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Lua/Standard/StringLibrary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ public async ValueTask<int> GSub(LuaFunctionExecutionContext context, Cancellati
// No captures, pass whole match
stack.Push(s.AsSpan(sIdx, res - sIdx).ToString());
var retCount = await context.Access.RunAsync(func, 1, cancellationToken);
using var results = context.Access.ReadReturnValues(retCount);
using var results = context.Access.ReadTopValues(retCount);
result = results.Count > 0 ? results[0] : LuaValue.Nil;
}
else
Expand All @@ -593,7 +593,7 @@ public async ValueTask<int> GSub(LuaFunctionExecutionContext context, Cancellati
}

var retCount = await context.Access.RunAsync(func, matchState.Level, cancellationToken);
using var results = context.Access.ReadReturnValues(retCount);
using var results = context.Access.ReadTopValues(retCount);
result = results.Count > 0 ? results[0] : LuaValue.Nil;
}
}
Expand Down