Browse Source

rename: TopLevelAccess to RootAccess

Akeit0 6 months ago
parent
commit
14fed24a16

+ 1 - 1
sandbox/Benchmark/InterpreterSteps.cs

@@ -46,6 +46,6 @@ public class InterpreterSteps
     [Benchmark]
     [Benchmark]
     public async ValueTask RunAsync()
     public async ValueTask RunAsync()
     {
     {
-        await state.TopLevelAccess.Call(closure, []);
+        await state.RootAccess.Call(closure, []);
     }
     }
 }
 }

+ 2 - 2
sandbox/ConsoleApp1/Program.cs

@@ -31,10 +31,10 @@ try
 
 
     Console.WriteLine("Output " + new string('-', 50));
     Console.WriteLine("Output " + new string('-', 50));
 
 
-    var count = await state.TopLevelAccess.RunAsync(closure);
+    var count = await state.RootAccess.RunAsync(closure);
 
 
     Console.WriteLine("Result " + new string('-', 50));
     Console.WriteLine("Result " + new string('-', 50));
-    using var results = state.TopLevelAccess.ReadReturnValues(count);
+    using var results = state.RootAccess.ReadReturnValues(count);
     for (int i = 0; i < count; i++)
     for (int i = 0; i < count; i++)
     {
     {
         Console.WriteLine(results[i]);
         Console.WriteLine(results[i]);

+ 1 - 1
sandbox/ConsoleApp2/Program.cs

@@ -8,7 +8,7 @@ state.OpenStandardLibraries();
 {
 {
     var closure = state.Load("return function (a,b,...)  print('a : '..a..' b :'..'args : ',...) end", "@simple");
     var closure = state.Load("return function (a,b,...)  print('a : '..a..' b :'..'args : ',...) end", "@simple");
     using var threadLease = state.MainThread.RentUseThread();
     using var threadLease = state.MainThread.RentUseThread();
-    var access = threadLease.Thread.TopLevelAccess;
+    var access = threadLease.Thread.RootAccess;
     {
     {
         var count = await access.RunAsync(closure, 0);
         var count = await access.RunAsync(closure, 0);
         var results = access.ReadReturnValues(count);
         var results = access.ReadReturnValues(count);

+ 1 - 1
sandbox/JitTest/Program.cs

@@ -22,7 +22,7 @@ var closure = luaState.Load(File.ReadAllBytes(GetAbsolutePath("test.lua")),"test
 
 
 for (int i = 0; i < 1000; i++)
 for (int i = 0; i < 1000; i++)
 {
 {
-   await luaState.TopLevelAccess.RunAsync(closure);
+   await luaState.RootAccess.RunAsync(closure);
    luaState.MainThread.Stack.Clear();
    luaState.MainThread.Stack.Clear();
 }
 }
 
 

+ 1 - 1
src/Lua/LuaState.cs

@@ -36,7 +36,7 @@ public sealed class LuaState
     public LuaTable PreloadModules => registry[ModuleLibrary.PreloadKeyForRegistry].Read<LuaTable>();
     public LuaTable PreloadModules => registry[ModuleLibrary.PreloadKeyForRegistry].Read<LuaTable>();
     public LuaMainThread MainThread => mainThread;
     public LuaMainThread MainThread => mainThread;
 
 
-    public LuaThreadAccess TopLevelAccess => new(mainThread, 0);
+    public LuaThreadAccess RootAccess => new(mainThread, 0);
     
     
     public  ILuaPlatform Platform { get; }
     public  ILuaPlatform Platform { get; }
 
 

+ 6 - 6
src/Lua/LuaStateExtensions.cs

@@ -7,32 +7,32 @@ public static class LuaStateExtensions
 {
 {
     public static ValueTask<int> DoStringAsync(this LuaState state, string source, Memory<LuaValue> buffer, string? chunkName = null, CancellationToken cancellationToken = default)
     public static ValueTask<int> DoStringAsync(this LuaState state, string source, Memory<LuaValue> buffer, string? chunkName = null, CancellationToken cancellationToken = default)
     {
     {
-        return state.TopLevelAccess.DoStringAsync(source, buffer, chunkName, cancellationToken);
+        return state.RootAccess.DoStringAsync(source, buffer, chunkName, cancellationToken);
     }
     }
 
 
     public static ValueTask<LuaValue[]> DoStringAsync(this LuaState state, string source, string? chunkName = null, CancellationToken cancellationToken = default)
     public static ValueTask<LuaValue[]> DoStringAsync(this LuaState state, string source, string? chunkName = null, CancellationToken cancellationToken = default)
     {
     {
-        return state.TopLevelAccess.DoStringAsync(source, chunkName, cancellationToken);
+        return state.RootAccess.DoStringAsync(source, chunkName, cancellationToken);
     }
     }
 
 
     public static ValueTask<int> DoBytesAsync(this LuaState state, ReadOnlySpan<byte> source, Memory<LuaValue> buffer, string chunkName, CancellationToken cancellationToken = default)
     public static ValueTask<int> DoBytesAsync(this LuaState state, ReadOnlySpan<byte> source, Memory<LuaValue> buffer, string chunkName, CancellationToken cancellationToken = default)
     {
     {
-        return state.TopLevelAccess.DoBytesAsync(source, buffer, chunkName, cancellationToken);
+        return state.RootAccess.DoBytesAsync(source, buffer, chunkName, cancellationToken);
     }
     }
 
 
     public static ValueTask<LuaValue[]> DoBytesAsync(this LuaState state, ReadOnlySpan<byte> source, string chunkName, CancellationToken cancellationToken = default)
     public static ValueTask<LuaValue[]> DoBytesAsync(this LuaState state, ReadOnlySpan<byte> source, string chunkName, CancellationToken cancellationToken = default)
     {
     {
-        return state.TopLevelAccess.DoBytesAsync(source, chunkName, cancellationToken);
+        return state.RootAccess.DoBytesAsync(source, chunkName, cancellationToken);
     }
     }
 
 
     public static ValueTask<int> DoFileAsync(this LuaState state, string path, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
     public static ValueTask<int> DoFileAsync(this LuaState state, string path, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
     {
     {
-        return state.TopLevelAccess.DoFileAsync(path, buffer, cancellationToken);
+        return state.RootAccess.DoFileAsync(path, buffer, cancellationToken);
     }
     }
 
 
     public static ValueTask<LuaValue[]> DoFileAsync(this LuaState state, string path, CancellationToken cancellationToken = default)
     public static ValueTask<LuaValue[]> DoFileAsync(this LuaState state, string path, CancellationToken cancellationToken = default)
     {
     {
-        return state.TopLevelAccess.DoFileAsync(path, cancellationToken);
+        return state.RootAccess.DoFileAsync(path, cancellationToken);
     }
     }
 
 
     public static async ValueTask<LuaClosure> LoadFileAsync(this LuaState state, string fileName, string mode, LuaTable? environment, CancellationToken cancellationToken)
     public static async ValueTask<LuaClosure> LoadFileAsync(this LuaState state, string fileName, string mode, LuaTable? environment, CancellationToken cancellationToken)

+ 1 - 1
src/Lua/LuaThread.cs

@@ -93,7 +93,7 @@ public abstract class LuaThread
     public int CallStackFrameCount => CoreData == null ? 0 : CoreData!.CallStack.Count;
     public int CallStackFrameCount => CoreData == null ? 0 : CoreData!.CallStack.Count;
 
 
     internal LuaThreadAccess CurrentAccess => new(this, CurrentVersion);
     internal LuaThreadAccess CurrentAccess => new(this, CurrentVersion);
-    public LuaThreadAccess TopLevelAccess => new(this, 0);
+    public LuaThreadAccess RootAccess => new(this, 0);
 
 
     public ref readonly CallStackFrame GetCurrentFrame()
     public ref readonly CallStackFrame GetCurrentFrame()
     {
     {

+ 8 - 8
tests/Lua.Tests/LuaApiTests.cs

@@ -34,7 +34,7 @@ public class LuaApiTests
                      setmetatable(a, metatable)
                      setmetatable(a, metatable)
                      return a, b
                      return a, b
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0].Read<LuaTable>();
         var a = result[0].Read<LuaTable>();
         var b = result[1].Read<LuaTable>();
         var b = result[1].Read<LuaTable>();
@@ -68,7 +68,7 @@ public class LuaApiTests
                      setmetatable(a, metatable)
                      setmetatable(a, metatable)
                      return a
                      return a
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
 
 
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0].Read<LuaTable>();
         var a = result[0].Read<LuaTable>();
@@ -106,7 +106,7 @@ public class LuaApiTests
                      setmetatable(a, metatable)
                      setmetatable(a, metatable)
                      return a, b, c
                      return a, b, c
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0].Read<LuaTable>();
         var a = result[0].Read<LuaTable>();
         var b = result[1].Read<LuaTable>();
         var b = result[1].Read<LuaTable>();
@@ -129,7 +129,7 @@ public class LuaApiTests
                      setmetatable(a, metatable)
                      setmetatable(a, metatable)
                      return a
                      return a
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0].Read<LuaTable>();
         var a = result[0].Read<LuaTable>();
         Assert.That(await access.GetTable(a, "x"), Is.EqualTo(new LuaValue(1)));
         Assert.That(await access.GetTable(a, "x"), Is.EqualTo(new LuaValue(1)));
@@ -150,7 +150,7 @@ public class LuaApiTests
                      setmetatable(a, metatable)
                      setmetatable(a, metatable)
                      return a
                      return a
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0].Read<LuaTable>();
         var a = result[0].Read<LuaTable>();
         await access.SetTable(a, "a", "b");
         await access.SetTable(a, "a", "b");
@@ -183,7 +183,7 @@ setmetatable(c, metatable)
 
 
 return a,b,c
 return a,b,c
 ";
 ";
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         Assert.That(result, Has.Length.EqualTo(3));
         Assert.That(result, Has.Length.EqualTo(3));
 
 
@@ -229,7 +229,7 @@ return a,b,c
                      local c ={name ="c"}
                      local c ={name ="c"}
                      return a,b,c
                      return a,b,c
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0];
         var a = result[0];
         var b = result[1];
         var b = result[1];
@@ -272,7 +272,7 @@ return a,b,c
                      local c ={name ="c"}
                      local c ={name ="c"}
                      return a,b,c
                      return a,b,c
                      """;
                      """;
-        var access = state.TopLevelAccess;
+        var access = state.RootAccess;
         var result = await access.DoStringAsync(source);
         var result = await access.DoStringAsync(source);
         var a = result[0];
         var a = result[0];
         var b = result[1];
         var b = result[1];