Skip to content

Commit 61e999c

Browse files
QuahuQuahu
committed
Make LuaReference always refer to Lua
1 parent 49c3a0a commit 61e999c

File tree

14 files changed

+228
-210
lines changed

14 files changed

+228
-210
lines changed

‎src/Laylua/Library/Entities/Reference/Function/LuaFunction.Dump.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public int Dump(LuaChunkWriter chunkWriter, bool stripDebugInformation = false)
4040

4141
private int DumpInternal(object target, bool stripDebugInformation)
4242
{
43-
Thread.Stack.EnsureFreeCapacity(1);
43+
Lua.Stack.EnsureFreeCapacity(1);
4444

45-
using (Thread.Stack.SnapshotCount())
45+
using (Lua.Stack.SnapshotCount())
4646
{
47-
Thread.Stack.Push(this);
47+
Lua.Stack.Push(this);
4848

4949
delegate* unmanaged[Cdecl]<lua_State*, void*, nuint, void*, int> writerFunctionPtr;
5050
if (target is Stream)
@@ -64,7 +64,7 @@ private int DumpInternal(object target, bool stripDebugInformation)
6464
var handle = GCHandle.Alloc(state);
6565
try
6666
{
67-
var L = Thread.State.L;
67+
var L = Lua.State.L;
6868
var result = lua_dump(L, writerFunctionPtr, (void*) (IntPtr) handle, stripDebugInformation);
6969
if (state.Exception != null)
7070
{

‎src/Laylua/Library/Entities/Reference/Function/LuaFunction.Upvalues.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ internal UpvalueCollection(LuaFunction function)
1717

1818
public int Count()
1919
{
20-
using (_function.Thread.Stack.SnapshotCount())
20+
using (_function.Lua.Stack.SnapshotCount())
2121
{
22-
_function.Thread.Stack.Push(_function);
22+
_function.Lua.Stack.Push(_function);
2323

24-
var L = _function.Thread.State.L;
24+
var L = _function.Lua.State.L;
2525
var index = 1;
2626
while (lua_getupvalue(L, -1, lua_upvalueindex(index)).Pointer != null)
2727
{
@@ -54,14 +54,14 @@ public struct Enumerator : IEnumerator<KeyValuePair<LuaString, LuaStackValue>>
5454
public Enumerator(LuaFunction function)
5555
{
5656
_function = function;
57-
function.Thread.Stack.Push(_function);
58-
_functionIndex = lua_absindex(_function.Thread.State.L, -1);
57+
function.Lua.Stack.Push(_function);
58+
_functionIndex = lua_absindex(_function.Lua.State.L, -1);
5959
}
6060

6161
/// <inheritdoc/>
6262
public bool MoveNext()
6363
{
64-
var L = _function.Thread.State.L;
64+
var L = _function.Lua.State.L;
6565
if (_index != 0)
6666
{
6767
lua_remove(L, _current.Value.Index);
@@ -74,7 +74,7 @@ public bool MoveNext()
7474
return false;
7575
}
7676

77-
_current = new(name, new LuaStackValue(_function.Thread, -1));
77+
_current = new(name, new LuaStackValue(_function.Lua, -1));
7878
return true;
7979
}
8080

@@ -83,7 +83,7 @@ public void Reset()
8383
{
8484
if (_index != 0)
8585
{
86-
var L = _function.Thread.State.L;
86+
var L = _function.Lua.State.L;
8787
lua_remove(L, _current.Value.Index);
8888
}
8989

@@ -94,7 +94,7 @@ public void Reset()
9494
/// <inheritdoc/>
9595
public void Dispose()
9696
{
97-
var L = _function.Thread.State.L;
97+
var L = _function.Lua.State.L;
9898
lua_remove(L, _functionIndex);
9999
}
100100
}

‎src/Laylua/Library/Entities/Reference/Function/LuaFunction.cs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public sealed unsafe partial class LuaFunction : LuaReference
1919
public UpvalueCollection Upvalues => new(this);
2020

2121
[DebuggerBrowsable(DebuggerBrowsableState.Never)]
22-
protected override LuaThread? ThreadCore { get; set; }
22+
protected override Lua? LuaCore { get; set; }
2323

2424
internal LuaFunction()
2525
{ }
@@ -39,12 +39,12 @@ public LuaWeakReference<LuaFunction> CreateWeakReference()
3939

4040
private static void PrepareFunction(LuaReference reference, out int top, int argumentCount)
4141
{
42-
reference.Thread.Stack.EnsureFreeCapacity(argumentCount + 1);
42+
reference.Lua.Stack.EnsureFreeCapacity(argumentCount + 1);
4343

44-
var L = reference.Thread.State.L;
44+
var L = reference.Lua.State.L;
4545
top = lua_gettop(L);
4646

47-
reference.Thread.Stack.Push(reference);
47+
reference.Lua.Stack.Push(reference);
4848
}
4949

5050
internal static LuaFunctionResults PCall(LuaThread thread, int oldTop, int argumentCount)
@@ -73,7 +73,7 @@ public LuaFunctionResults Call()
7373

7474
PrepareFunction(this, out var top, 0);
7575

76-
return PCall(Thread, top, 0);
76+
return PCall(Lua, top, 0);
7777
}
7878

7979
/// <summary>
@@ -92,13 +92,13 @@ public LuaFunctionResults Call<T>(T? argument)
9292

9393
try
9494
{
95-
Thread.Stack.Push(argument);
95+
Lua.Stack.Push(argument);
9696

97-
return PCall(Thread, top, 1);
97+
return PCall(Lua, top, 1);
9898
}
9999
catch
100100
{
101-
lua_settop(Thread.State.L, top);
101+
lua_settop(Lua.State.L, top);
102102
throw;
103103
}
104104
}
@@ -121,14 +121,14 @@ public LuaFunctionResults Call<T1, T2>(T1? argument1, T2? argument2)
121121

122122
try
123123
{
124-
Thread.Stack.Push(argument1);
125-
Thread.Stack.Push(argument2);
124+
Lua.Stack.Push(argument1);
125+
Lua.Stack.Push(argument2);
126126

127-
return PCall(Thread, top, 2);
127+
return PCall(Lua, top, 2);
128128
}
129129
catch
130130
{
131-
lua_settop(Thread.State.L, top);
131+
lua_settop(Lua.State.L, top);
132132
throw;
133133
}
134134
}
@@ -153,15 +153,15 @@ public LuaFunctionResults Call<T1, T2, T3>(T1? argument1, T2? argument2, T3? arg
153153

154154
try
155155
{
156-
Thread.Stack.Push(argument1);
157-
Thread.Stack.Push(argument2);
158-
Thread.Stack.Push(argument3);
156+
Lua.Stack.Push(argument1);
157+
Lua.Stack.Push(argument2);
158+
Lua.Stack.Push(argument3);
159159

160-
return PCall(Thread, top, 3);
160+
return PCall(Lua, top, 3);
161161
}
162162
catch
163163
{
164-
lua_settop(Thread.State.L, top);
164+
lua_settop(Lua.State.L, top);
165165
throw;
166166
}
167167
}
@@ -188,16 +188,16 @@ public LuaFunctionResults Call<T1, T2, T3, T4>(T1? argument1, T2? argument2, T3?
188188

189189
try
190190
{
191-
Thread.Stack.Push(argument1);
192-
Thread.Stack.Push(argument2);
193-
Thread.Stack.Push(argument3);
194-
Thread.Stack.Push(argument4);
191+
Lua.Stack.Push(argument1);
192+
Lua.Stack.Push(argument2);
193+
Lua.Stack.Push(argument3);
194+
Lua.Stack.Push(argument4);
195195

196-
return PCall(Thread, top, 4);
196+
return PCall(Lua, top, 4);
197197
}
198198
catch
199199
{
200-
lua_settop(Thread.State.L, top);
200+
lua_settop(Lua.State.L, top);
201201
throw;
202202
}
203203
}
@@ -233,14 +233,14 @@ public LuaFunctionResults Call(params ReadOnlySpan<object?> arguments)
233233
{
234234
foreach (var argument in arguments)
235235
{
236-
Thread.Stack.Push(argument);
236+
Lua.Stack.Push(argument);
237237
}
238238

239-
return PCall(Thread, top, argumentCount);
239+
return PCall(Lua, top, argumentCount);
240240
}
241241
catch
242242
{
243-
lua_settop(Thread.State.L, top);
243+
lua_settop(Lua.State.L, top);
244244
throw;
245245
}
246246
}
@@ -276,14 +276,14 @@ public LuaFunctionResults Call(params ReadOnlySpan<LuaStackValue> arguments)
276276
{
277277
foreach (var argument in arguments)
278278
{
279-
Thread.Stack.Push(argument);
279+
Lua.Stack.Push(argument);
280280
}
281281

282-
return PCall(Thread, top, argumentCount);
282+
return PCall(Lua, top, argumentCount);
283283
}
284284
catch
285285
{
286-
lua_settop(Thread.State.L, top);
286+
lua_settop(Lua.State.L, top);
287287
throw;
288288
}
289289
}
@@ -307,14 +307,14 @@ public LuaFunctionResults Call(LuaStackValueRange arguments)
307307
{
308308
foreach (var argument in arguments)
309309
{
310-
Thread.Stack.Push(argument);
310+
Lua.Stack.Push(argument);
311311
}
312312

313-
return PCall(Thread, top, argumentCount);
313+
return PCall(Lua, top, argumentCount);
314314
}
315315
catch
316316
{
317-
lua_settop(Thread.State.L, top);
317+
lua_settop(Lua.State.L, top);
318318
throw;
319319
}
320320
}

0 commit comments

Comments
 (0)