Skip to content

Commit bd5ce70

Browse files
nuskey8nuskey8
committed
Run formatter
1 parent 466b2ac commit bd5ce70

File tree

2 files changed

+81
-81
lines changed

2 files changed

+81
-81
lines changed

‎src/Lua/CodeAnalysis/Compilation/FunctionCompilationContext.cs‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ public void PushInstruction(in Instruction instruction, in SourcePosition positi
114114
/// Push or merge the new instruction.
115115
/// </summary>
116116
[MethodImpl(MethodImplOptions.AggressiveInlining)]
117-
public void PushOrMergeInstruction(int lastLocal,in Instruction instruction, in SourcePosition position,ref bool incrementStackPosition)
117+
public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in SourcePosition position, ref bool incrementStackPosition)
118118
{
119-
if(instructions.Length==0)
119+
if (instructions.Length == 0)
120120
{
121121
instructions.Add(instruction);
122122
instructionPositions.Add(position);
@@ -127,13 +127,13 @@ public void PushOrMergeInstruction(int lastLocal,in Instruction instruction, in
127127
switch (opcode)
128128
{
129129
case OpCode.Move:
130-
//last A is not local variable
131-
if (lastInstruction.A!=lastLocal &&
132-
//available to merge
133-
lastInstruction.A == instruction.B &&
134-
//not already merged
135-
lastInstruction.A != lastInstruction.B)
136-
{
130+
// last A is not local variable
131+
if (lastInstruction.A != lastLocal &&
132+
// available to merge
133+
lastInstruction.A == instruction.B &&
134+
// not already merged
135+
lastInstruction.A != lastInstruction.B)
136+
{
137137
switch (lastInstruction.OpCode)
138138
{
139139
case OpCode.GetTable:
@@ -144,103 +144,103 @@ public void PushOrMergeInstruction(int lastLocal,in Instruction instruction, in
144144
case OpCode.Mod:
145145
case OpCode.Pow:
146146
case OpCode.Concat:
147-
{
148-
lastInstruction.A = instruction.A;
149-
incrementStackPosition = false;
150-
return;
151-
}
147+
{
148+
lastInstruction.A = instruction.A;
149+
incrementStackPosition = false;
150+
return;
151+
}
152152
}
153-
}
154-
break;
153+
}
154+
break;
155155
case OpCode.GetTable:
156-
{
157-
//Merge MOVE GetTable
158-
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
159156
{
160-
if (lastInstruction.A == instruction.B)
157+
// Merge MOVE GetTable
158+
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
161159
{
162-
lastInstruction=Instruction.GetTable(instruction.A, lastInstruction.B, instruction.C);
163-
instructionPositions[^1] = position;
164-
incrementStackPosition = false;
165-
return;
160+
if (lastInstruction.A == instruction.B)
161+
{
162+
lastInstruction = Instruction.GetTable(instruction.A, lastInstruction.B, instruction.C);
163+
instructionPositions[^1] = position;
164+
incrementStackPosition = false;
165+
return;
166+
}
167+
166168
}
167-
169+
break;
168170
}
169-
break;
170-
}
171171
case OpCode.SetTable:
172-
{
173-
//Merge MOVE SETTABLE
174-
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
175172
{
176-
var lastB = lastInstruction.B;
177-
var lastA = lastInstruction.A;
178-
if (lastB<255 && lastA == instruction.A)
173+
// Merge MOVE SETTABLE
174+
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
179175
{
180-
//Merge MOVE MOVE SETTABLE
181-
if (instructions.Length > 2)
176+
var lastB = lastInstruction.B;
177+
var lastA = lastInstruction.A;
178+
if (lastB < 255 && lastA == instruction.A)
182179
{
183-
ref var last2Instruction = ref instructions.AsSpan()[^2];
184-
var last2A = last2Instruction.A;
185-
if(last2Instruction.OpCode == OpCode.Move && lastLocal != last2A && instruction.C == last2A)
180+
// Merge MOVE MOVE SETTABLE
181+
if (instructions.Length > 2)
186182
{
187-
last2Instruction=Instruction.SetTable((byte)(lastB), instruction.B, last2Instruction.B);
188-
instructions.RemoveAtSwapback(instructions.Length - 1);
189-
instructionPositions.RemoveAtSwapback(instructionPositions.Length - 1);
190-
instructionPositions[^1] = position;
191-
incrementStackPosition = false;
192-
return;
183+
ref var last2Instruction = ref instructions.AsSpan()[^2];
184+
var last2A = last2Instruction.A;
185+
if (last2Instruction.OpCode == OpCode.Move && lastLocal != last2A && instruction.C == last2A)
186+
{
187+
last2Instruction = Instruction.SetTable((byte)(lastB), instruction.B, last2Instruction.B);
188+
instructions.RemoveAtSwapback(instructions.Length - 1);
189+
instructionPositions.RemoveAtSwapback(instructionPositions.Length - 1);
190+
instructionPositions[^1] = position;
191+
incrementStackPosition = false;
192+
return;
193+
}
193194
}
195+
lastInstruction = Instruction.SetTable((byte)(lastB), instruction.B, instruction.C);
196+
instructionPositions[^1] = position;
197+
incrementStackPosition = false;
198+
return;
194199
}
195-
lastInstruction=Instruction.SetTable((byte)(lastB), instruction.B, instruction.C);
196-
instructionPositions[^1] = position;
197-
incrementStackPosition = false;
198-
return;
199-
}
200200

201-
if (lastA == instruction.C)
202-
{
203-
lastInstruction=Instruction.SetTable(instruction.A, instruction.B, lastB);
204-
instructionPositions[^1] = position;
205-
incrementStackPosition = false;
206-
return;
207-
}
208-
}
209-
else if (lastInstruction.OpCode == OpCode.GetTabUp&&instructions.Length >= 2)
210-
{
211-
ref var last2Instruction = ref instructions[^2];
212-
var last2OpCode = last2Instruction.OpCode;
213-
if (last2OpCode is OpCode.LoadK or OpCode.Move)
214-
{
215-
216-
var last2A = last2Instruction.A;
217-
if (last2A != lastLocal && instruction.C == last2A)
201+
if (lastA == instruction.C)
218202
{
219-
var c = last2OpCode==OpCode.LoadK?last2Instruction.Bx+256:last2Instruction.B;
220-
last2Instruction = lastInstruction;
221-
lastInstruction = instruction with { C = (ushort)c};
222-
instructionPositions[^2] = instructionPositions[^1];
203+
lastInstruction = Instruction.SetTable(instruction.A, instruction.B, lastB);
223204
instructionPositions[^1] = position;
224205
incrementStackPosition = false;
225206
return;
226207
}
227208
}
209+
else if (lastInstruction.OpCode == OpCode.GetTabUp && instructions.Length >= 2)
210+
{
211+
ref var last2Instruction = ref instructions[^2];
212+
var last2OpCode = last2Instruction.OpCode;
213+
if (last2OpCode is OpCode.LoadK or OpCode.Move)
214+
{
215+
216+
var last2A = last2Instruction.A;
217+
if (last2A != lastLocal && instruction.C == last2A)
218+
{
219+
var c = last2OpCode == OpCode.LoadK ? last2Instruction.Bx + 256 : last2Instruction.B;
220+
last2Instruction = lastInstruction;
221+
lastInstruction = instruction with { C = (ushort)c };
222+
instructionPositions[^2] = instructionPositions[^1];
223+
instructionPositions[^1] = position;
224+
incrementStackPosition = false;
225+
return;
226+
}
227+
}
228+
}
229+
break;
228230
}
229-
break;
230-
}
231231
case OpCode.Unm:
232232
case OpCode.Not:
233233
case OpCode.Len:
234234
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A && lastInstruction.A == instruction.B)
235235
{
236-
lastInstruction = instruction with { B = lastInstruction.B };;
236+
lastInstruction = instruction with { B = lastInstruction.B }; ;
237237
instructionPositions[^1] = position;
238238
incrementStackPosition = false;
239239
return;
240240
}
241241
break;
242242
case OpCode.Return:
243-
if (lastInstruction.OpCode == OpCode.Move && instruction.B ==2 && lastInstruction.B < 256)
243+
if (lastInstruction.OpCode == OpCode.Move && instruction.B == 2 && lastInstruction.B < 256)
244244
{
245245
lastInstruction = instruction with { A = (byte)lastInstruction.B };
246246
instructionPositions[^1] = position;
@@ -249,11 +249,11 @@ public void PushOrMergeInstruction(int lastLocal,in Instruction instruction, in
249249
}
250250
break;
251251
}
252-
252+
253253
instructions.Add(instruction);
254254
instructionPositions.Add(position);
255255
}
256-
256+
257257
/// <summary>
258258
/// Gets the index of the constant from the value, or if the constant is not registered it is added and its index is returned.
259259
/// </summary>

‎src/Lua/CodeAnalysis/Compilation/ScopeCompilationContext.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void Return(ScopeCompilationContext context)
3434
readonly Dictionary<ReadOnlyMemory<char>, LabelDescription> labels = new(32, Utf16StringMemoryComparer.Default);
3535

3636
byte lastLocalVariableIndex;
37-
37+
3838
public byte StackStartPosition { get; private set; }
3939
public byte StackPosition { get; set; }
4040

@@ -74,8 +74,8 @@ public FunctionCompilationContext CreateChildFunction()
7474
[MethodImpl(MethodImplOptions.AggressiveInlining)]
7575
public void PushInstruction(in Instruction instruction, SourcePosition position, bool incrementStackPosition = false)
7676
{
77-
Function.PushOrMergeInstruction(lastLocalVariableIndex,instruction, position, ref incrementStackPosition);
78-
if(incrementStackPosition)
77+
Function.PushOrMergeInstruction(lastLocalVariableIndex, instruction, position, ref incrementStackPosition);
78+
if (incrementStackPosition)
7979
{
8080
StackPosition++;
8181
}
@@ -94,12 +94,12 @@ public void TryPushCloseUpValue(byte top, SourcePosition position)
9494
/// Add new local variable.
9595
/// </summary>
9696
[MethodImpl(MethodImplOptions.AggressiveInlining)]
97-
public void AddLocalVariable(ReadOnlyMemory<char> name, LocalVariableDescription description,bool markAsLastLocalVariable = true)
97+
public void AddLocalVariable(ReadOnlyMemory<char> name, LocalVariableDescription description, bool markAsLastLocalVariable = true)
9898
{
9999
localVariables[name] = description;
100100
lastLocalVariableIndex = description.RegisterIndex;
101101
}
102-
102+
103103

104104
/// <summary>
105105
/// Gets the local variable in scope.

0 commit comments

Comments
 (0)