2
0
Эх сурвалжийг харах

Rename: LuaThread.Resume/Yield -> ResumeAsync/YieldAsync

AnnulusGames 1 жил өмнө
parent
commit
e64adbc12d

+ 3 - 3
src/Lua/LuaCoroutine.cs

@@ -44,7 +44,7 @@ public sealed class LuaCoroutine : LuaThread, IValueTaskSource<LuaCoroutine.Yiel
     public bool IsProtectedMode { get; }
     public bool IsProtectedMode { get; }
     public LuaFunction Function { get; }
     public LuaFunction Function { get; }
 
 
-    public override async ValueTask<int> Resume(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
+    public override async ValueTask<int> ResumeAsync(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
     {
     {
         var baseThread = context.Thread;
         var baseThread = context.Thread;
         baseThread.UnsafeSetStatus(LuaThreadStatus.Normal);
         baseThread.UnsafeSetStatus(LuaThreadStatus.Normal);
@@ -122,7 +122,7 @@ public sealed class LuaCoroutine : LuaThread, IValueTaskSource<LuaCoroutine.Yiel
                 {
                 {
                     int frameBase;
                     int frameBase;
                     var variableArgumentCount = Function.GetVariableArgumentCount(context.ArgumentCount - 1);
                     var variableArgumentCount = Function.GetVariableArgumentCount(context.ArgumentCount - 1);
-                    
+
                     if (variableArgumentCount > 0)
                     if (variableArgumentCount > 0)
                     {
                     {
                         var fixedArgumentCount = context.ArgumentCount - 1 - variableArgumentCount;
                         var fixedArgumentCount = context.ArgumentCount - 1 - variableArgumentCount;
@@ -218,7 +218,7 @@ public sealed class LuaCoroutine : LuaThread, IValueTaskSource<LuaCoroutine.Yiel
         }
         }
     }
     }
 
 
-    public override async ValueTask<int> Yield(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
+    public override async ValueTask<int> YieldAsync(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
     {
     {
         if (Volatile.Read(ref status) != (byte)LuaThreadStatus.Running)
         if (Volatile.Read(ref status) != (byte)LuaThreadStatus.Running)
         {
         {

+ 2 - 2
src/Lua/LuaMainThread.cs

@@ -12,14 +12,14 @@ public sealed class LuaMainThread : LuaThread
         // Do nothing
         // Do nothing
     }
     }
 
 
-    public override ValueTask<int> Resume(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
+    public override ValueTask<int> ResumeAsync(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
     {
     {
         buffer.Span[0] = false;
         buffer.Span[0] = false;
         buffer.Span[1] = "cannot resume non-suspended coroutine";
         buffer.Span[1] = "cannot resume non-suspended coroutine";
         return new(2);
         return new(2);
     }
     }
 
 
-    public override ValueTask<int> Yield(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
+    public override ValueTask<int> YieldAsync(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default)
     {
     {
         throw new LuaRuntimeException(context.State.GetTraceback(), "attempt to yield from outside a coroutine");
         throw new LuaRuntimeException(context.State.GetTraceback(), "attempt to yield from outside a coroutine");
     }
     }

+ 2 - 3
src/Lua/LuaThread.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using Lua.Internal;
 using Lua.Internal;
 using Lua.Runtime;
 using Lua.Runtime;
 
 
@@ -8,8 +7,8 @@ public abstract class LuaThread
 {
 {
     public abstract LuaThreadStatus GetStatus();
     public abstract LuaThreadStatus GetStatus();
     public abstract void UnsafeSetStatus(LuaThreadStatus status);
     public abstract void UnsafeSetStatus(LuaThreadStatus status);
-    public abstract ValueTask<int> Resume(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default);
-    public abstract ValueTask<int> Yield(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default);
+    public abstract ValueTask<int> ResumeAsync(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default);
+    public abstract ValueTask<int> YieldAsync(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken = default);
 
 
     LuaStack stack = new();
     LuaStack stack = new();
     FastStackCore<CallStackFrame> callStack;
     FastStackCore<CallStackFrame> callStack;

+ 1 - 1
src/Lua/Standard/Coroutines/CoroutineResumeFunction.cs

@@ -9,6 +9,6 @@ public sealed class CoroutineResumeFunction : LuaFunction
     protected override async ValueTask<int> InvokeAsyncCore(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken)
     protected override async ValueTask<int> InvokeAsyncCore(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken)
     {
     {
         var thread = context.GetArgument<LuaThread>(0);
         var thread = context.GetArgument<LuaThread>(0);
-        return await thread.Resume(context, buffer, cancellationToken);
+        return await thread.ResumeAsync(context, buffer, cancellationToken);
     }
     }
 }
 }

+ 1 - 1
src/Lua/Standard/Coroutines/CoroutineWrapFunction.cs

@@ -27,7 +27,7 @@ public sealed class CoroutineWrapFunction : LuaFunction
             stack.Push(targetThread);
             stack.Push(targetThread);
             PushArguments(stack, context.Arguments);
             PushArguments(stack, context.Arguments);
 
 
-            var resultCount = await targetThread.Resume(context with
+            var resultCount = await targetThread.ResumeAsync(context with
             {
             {
                 ArgumentCount = context.ArgumentCount + 1,
                 ArgumentCount = context.ArgumentCount + 1,
                 FrameBase = frameBase,
                 FrameBase = frameBase,

+ 1 - 1
src/Lua/Standard/Coroutines/CoroutineYieldFunction.cs

@@ -8,6 +8,6 @@ public sealed class CoroutineYieldFunction : LuaFunction
 
 
     protected override ValueTask<int> InvokeAsyncCore(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken)
     protected override ValueTask<int> InvokeAsyncCore(LuaFunctionExecutionContext context, Memory<LuaValue> buffer, CancellationToken cancellationToken)
     {
     {
-        return context.Thread.Yield(context, buffer, cancellationToken);
+        return context.Thread.YieldAsync(context, buffer, cancellationToken);
     }
     }
 }
 }