Browse Source

change: rename ReadReturnValues to ReadTopValues and update references

Akeit0 5 months ago
parent
commit
f1ae1f8118

+ 1 - 1
sandbox/ConsoleApp1/Program.cs

@@ -34,7 +34,7 @@ try
     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]);

+ 2 - 2
sandbox/ConsoleApp2/Program.cs

@@ -11,7 +11,7 @@ state.OpenStandardLibraries();
     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]);
@@ -21,7 +21,7 @@ state.OpenStandardLibraries();
         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]);

+ 2 - 2
src/Lua/LuaReturnValuesReader.cs → src/Lua/LuaTopValuesReader.cs

@@ -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;

+ 7 - 7
src/Lua/Runtime/LuaThreadAccessExtensions.cs

@@ -39,7 +39,7 @@ public static class LuaThreadAccessAccessExtensions
         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;
     }
@@ -48,7 +48,7 @@ public static class LuaThreadAccessAccessExtensions
     {
         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();
     }
 
@@ -56,7 +56,7 @@ public static class LuaThreadAccessAccessExtensions
     {
         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;
     }
@@ -65,7 +65,7 @@ public static class LuaThreadAccessAccessExtensions
     {
         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();
     }
 
@@ -93,11 +93,11 @@ public static class LuaThreadAccessAccessExtensions
         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)
@@ -313,7 +313,7 @@ public static class LuaThreadAccessAccessExtensions
         {
             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();
         }
     }

+ 2 - 2
src/Lua/Standard/StringLibrary.cs

@@ -573,7 +573,7 @@ public sealed class StringLibrary
                         // 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
@@ -593,7 +593,7 @@ public sealed class StringLibrary
                         }
 
                         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;
                     }
                 }