Run formatter

src/Lua/CodeAnalysis/Compilation/FunctionCompilationContext.cs

@@ -114,9 +114,9 @@ public class FunctionCompilationContext : IDisposable
     /// Push or merge the new instruction.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void PushOrMergeInstruction(int lastLocal,in Instruction instruction, in SourcePosition position,ref bool incrementStackPosition)
+    public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in SourcePosition position, ref bool incrementStackPosition)
     {
-        if(instructions.Length==0)
+        if (instructions.Length == 0)
         {
             instructions.Add(instruction);
             instructionPositions.Add(position);
@@ -127,13 +127,13 @@ public class FunctionCompilationContext : IDisposable
         switch (opcode)
         {
             case OpCode.Move:
-                //last A is not local variable
-               if (lastInstruction.A!=lastLocal && 
-                   //available to merge
-                   lastInstruction.A == instruction.B &&
-                   //not already merged
-                   lastInstruction.A != lastInstruction.B)
-               {
+                // last A is not local variable
+                if (lastInstruction.A != lastLocal &&
+                    // available to merge
+                    lastInstruction.A == instruction.B &&
+                    // not already merged
+                    lastInstruction.A != lastInstruction.B)
+                {
                     switch (lastInstruction.OpCode)
                     {
                         case OpCode.GetTable:
@@ -144,103 +144,103 @@ public class FunctionCompilationContext : IDisposable
                         case OpCode.Mod:
                         case OpCode.Pow:
                         case OpCode.Concat:
-                        {
-                            lastInstruction.A = instruction.A;
-                            incrementStackPosition = false;
-                            return;
-                        }
+                            {
+                                lastInstruction.A = instruction.A;
+                                incrementStackPosition = false;
+                                return;
+                            }
                     }
-               }
-               break;
+                }
+                break;
             case OpCode.GetTable:
-            {
-                //Merge MOVE GetTable
-                if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
                 {
-                    if (lastInstruction.A == instruction.B)
+                    // Merge MOVE GetTable
+                    if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
                     {
-                        lastInstruction=Instruction.GetTable(instruction.A, lastInstruction.B, instruction.C);
-                        instructionPositions[^1] = position;
-                        incrementStackPosition = false;
-                        return;
+                        if (lastInstruction.A == instruction.B)
+                        {
+                            lastInstruction = Instruction.GetTable(instruction.A, lastInstruction.B, instruction.C);
+                            instructionPositions[^1] = position;
+                            incrementStackPosition = false;
+                            return;
+                        }
+
                     }
-                    
+                    break;
                 }
-                break;
-            }
             case OpCode.SetTable:
-            {
-                //Merge MOVE SETTABLE
-                if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
                 {
-                    var lastB = lastInstruction.B;
-                    var lastA = lastInstruction.A;
-                    if (lastB<255 && lastA == instruction.A)
+                    // Merge MOVE SETTABLE
+                    if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
                     {
-                        //Merge MOVE MOVE SETTABLE
-                        if (instructions.Length > 2)
+                        var lastB = lastInstruction.B;
+                        var lastA = lastInstruction.A;
+                        if (lastB < 255 && lastA == instruction.A)
                         {
-                            ref var last2Instruction = ref instructions.AsSpan()[^2];
-                            var last2A = last2Instruction.A;
-                            if(last2Instruction.OpCode == OpCode.Move && lastLocal != last2A && instruction.C == last2A)
+                            // Merge MOVE MOVE SETTABLE
+                            if (instructions.Length > 2)
                             {
-                                last2Instruction=Instruction.SetTable((byte)(lastB), instruction.B, last2Instruction.B);
-                                instructions.RemoveAtSwapback(instructions.Length - 1);
-                                instructionPositions.RemoveAtSwapback(instructionPositions.Length - 1);
-                                instructionPositions[^1] = position;
-                                incrementStackPosition = false;
-                                return;
+                                ref var last2Instruction = ref instructions.AsSpan()[^2];
+                                var last2A = last2Instruction.A;
+                                if (last2Instruction.OpCode == OpCode.Move && lastLocal != last2A && instruction.C == last2A)
+                                {
+                                    last2Instruction = Instruction.SetTable((byte)(lastB), instruction.B, last2Instruction.B);
+                                    instructions.RemoveAtSwapback(instructions.Length - 1);
+                                    instructionPositions.RemoveAtSwapback(instructionPositions.Length - 1);
+                                    instructionPositions[^1] = position;
+                                    incrementStackPosition = false;
+                                    return;
+                                }
                             }
+                            lastInstruction = Instruction.SetTable((byte)(lastB), instruction.B, instruction.C);
+                            instructionPositions[^1] = position;
+                            incrementStackPosition = false;
+                            return;
                         }
-                        lastInstruction=Instruction.SetTable((byte)(lastB), instruction.B, instruction.C);
-                        instructionPositions[^1] = position;
-                        incrementStackPosition = false;
-                        return;
-                    }
 
-                    if (lastA == instruction.C)
-                    {
-                        lastInstruction=Instruction.SetTable(instruction.A, instruction.B, lastB);
-                        instructionPositions[^1] = position;
-                        incrementStackPosition = false;
-                        return;
-                    }
-                }
-                else if (lastInstruction.OpCode == OpCode.GetTabUp&&instructions.Length >= 2)
-                {
-                    ref var last2Instruction = ref instructions[^2];
-                    var last2OpCode = last2Instruction.OpCode;
-                    if (last2OpCode is OpCode.LoadK or OpCode.Move)
-                    {
-                        
-                        var last2A = last2Instruction.A;
-                        if (last2A != lastLocal && instruction.C == last2A)
+                        if (lastA == instruction.C)
                         {
-                            var c = last2OpCode==OpCode.LoadK?last2Instruction.Bx+256:last2Instruction.B;
-                            last2Instruction = lastInstruction;
-                            lastInstruction = instruction with { C = (ushort)c};
-                            instructionPositions[^2] = instructionPositions[^1];
+                            lastInstruction = Instruction.SetTable(instruction.A, instruction.B, lastB);
                             instructionPositions[^1] = position;
                             incrementStackPosition = false;
                             return;
                         }
                     }
+                    else if (lastInstruction.OpCode == OpCode.GetTabUp && instructions.Length >= 2)
+                    {
+                        ref var last2Instruction = ref instructions[^2];
+                        var last2OpCode = last2Instruction.OpCode;
+                        if (last2OpCode is OpCode.LoadK or OpCode.Move)
+                        {
+
+                            var last2A = last2Instruction.A;
+                            if (last2A != lastLocal && instruction.C == last2A)
+                            {
+                                var c = last2OpCode == OpCode.LoadK ? last2Instruction.Bx + 256 : last2Instruction.B;
+                                last2Instruction = lastInstruction;
+                                lastInstruction = instruction with { C = (ushort)c };
+                                instructionPositions[^2] = instructionPositions[^1];
+                                instructionPositions[^1] = position;
+                                incrementStackPosition = false;
+                                return;
+                            }
+                        }
+                    }
+                    break;
                 }
-                break;
-            }
             case OpCode.Unm:
             case OpCode.Not:
             case OpCode.Len:
                 if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A && lastInstruction.A == instruction.B)
                 {
-                    lastInstruction = instruction with { B = lastInstruction.B };;
+                    lastInstruction = instruction with { B = lastInstruction.B }; ;
                     instructionPositions[^1] = position;
                     incrementStackPosition = false;
                     return;
                 }
                 break;
             case OpCode.Return:
-                if (lastInstruction.OpCode == OpCode.Move && instruction.B ==2 && lastInstruction.B < 256)
+                if (lastInstruction.OpCode == OpCode.Move && instruction.B == 2 && lastInstruction.B < 256)
                 {
                     lastInstruction = instruction with { A = (byte)lastInstruction.B };
                     instructionPositions[^1] = position;
@@ -249,11 +249,11 @@ public class FunctionCompilationContext : IDisposable
                 }
                 break;
         }
-        
+
         instructions.Add(instruction);
         instructionPositions.Add(position);
     }
-    
+
     /// <summary>
     /// Gets the index of the constant from the value, or if the constant is not registered it is added and its index is returned.
     /// </summary>

src/Lua/CodeAnalysis/Compilation/ScopeCompilationContext.cs

@@ -34,7 +34,7 @@ public class ScopeCompilationContext : IDisposable
     readonly Dictionary<ReadOnlyMemory<char>, LabelDescription> labels = new(32, Utf16StringMemoryComparer.Default);
 
     byte lastLocalVariableIndex;
-    
+
     public byte StackStartPosition { get; private set; }
     public byte StackPosition { get; set; }
 
@@ -74,8 +74,8 @@ public class ScopeCompilationContext : IDisposable
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void PushInstruction(in Instruction instruction, SourcePosition position, bool incrementStackPosition = false)
     {
-        Function.PushOrMergeInstruction(lastLocalVariableIndex,instruction, position, ref incrementStackPosition);
-        if(incrementStackPosition)
+        Function.PushOrMergeInstruction(lastLocalVariableIndex, instruction, position, ref incrementStackPosition);
+        if (incrementStackPosition)
         {
             StackPosition++;
         }
@@ -94,12 +94,12 @@ public class ScopeCompilationContext : IDisposable
     /// Add new local variable.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void AddLocalVariable(ReadOnlyMemory<char> name, LocalVariableDescription description,bool markAsLastLocalVariable = true)
+    public void AddLocalVariable(ReadOnlyMemory<char> name, LocalVariableDescription description, bool markAsLastLocalVariable = true)
     {
         localVariables[name] = description;
         lastLocalVariableIndex = description.RegisterIndex;
     }
-    
+
 
     /// <summary>
     /// Gets the local variable in scope.