Skip to content

Fix: or doesn't work well #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 16, 2025
Merged

Fix: or doesn't work well #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6567ce
Fix: `or` doesn't work well
Akeit0 Mar 7, 2025
d54cca6
Fix: revert access modifier
Akeit0 Mar 7, 2025
903068d
Fix: unintended InstructionMerge of GetTable
Akeit0 Apr 16, 2025
f9b12b5
Merge branch 'main' into fix-conditionals
Akeit0 Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions src/Lua/CodeAnalysis/Compilation/FunctionCompilationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void PushInstruction(in Instruction instruction, in SourcePosition positi
/// 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(in Instruction instruction, in SourcePosition position, ref bool incrementStackPosition)
{
if (instructions.Length == 0)
{
Expand All @@ -139,27 +139,40 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
return;
}

var activeLocals = Scope.ActiveLocalVariables;

ref var lastInstruction = ref instructions.AsSpan()[^1];
var opcode = instruction.OpCode;
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)

if (
// available to merge and last A is not local variable
lastInstruction.A == instruction.B && !activeLocals[lastInstruction.A])
{
switch (lastInstruction.OpCode)
{
case OpCode.GetTable:
case OpCode.LoadK:
case OpCode.LoadBool when lastInstruction.C == 0:
case OpCode.LoadNil when lastInstruction.B == 0:
case OpCode.GetUpVal:
case OpCode.GetTabUp:
case OpCode.GetTable when !activeLocals[lastInstruction.B]:
case OpCode.SetTabUp:
case OpCode.SetUpVal:
case OpCode.SetTable:
case OpCode.NewTable:
case OpCode.Self:
case OpCode.Add:
case OpCode.Sub:
case OpCode.Mul:
case OpCode.Div:
case OpCode.Mod:
case OpCode.Pow:
case OpCode.Unm:
case OpCode.Not:
case OpCode.Len:
case OpCode.Concat:
{
lastInstruction.A = instruction.A;
Expand All @@ -173,7 +186,7 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
case OpCode.GetTable:
{
// Merge MOVE GetTable
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
if (lastInstruction.OpCode == OpCode.Move && !activeLocals[lastInstruction.A])
{
if (lastInstruction.A == instruction.B)
{
Expand All @@ -189,7 +202,7 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
case OpCode.SetTable:
{
// Merge MOVE SETTABLE
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A)
if (lastInstruction.OpCode == OpCode.Move && !activeLocals[lastInstruction.A])
{
var lastB = lastInstruction.B;
var lastA = lastInstruction.A;
Expand All @@ -200,7 +213,7 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
{
ref var last2Instruction = ref instructions.AsSpan()[^2];
var last2A = last2Instruction.A;
if (last2Instruction.OpCode == OpCode.Move && lastLocal != last2A && instruction.C == last2A)
if (last2Instruction.OpCode == OpCode.Move && !activeLocals[last2A] && instruction.C == last2A)
{
last2Instruction = Instruction.SetTable((byte)(lastB), instruction.B, last2Instruction.B);
instructions.RemoveAtSwapback(instructions.Length - 1);
Expand Down Expand Up @@ -232,7 +245,7 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
if (last2OpCode is OpCode.LoadK or OpCode.Move)
{
var last2A = last2Instruction.A;
if (last2A != lastLocal && instruction.C == last2A)
if (!activeLocals[last2A] && instruction.C == last2A)
{
var c = last2OpCode == OpCode.LoadK ? last2Instruction.Bx + 256 : last2Instruction.B;
last2Instruction = lastInstruction;
Expand All @@ -250,10 +263,9 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
case OpCode.Unm:
case OpCode.Not:
case OpCode.Len:
if (lastInstruction.OpCode == OpCode.Move && lastLocal != lastInstruction.A && lastInstruction.A == instruction.B)
if (lastInstruction.OpCode == OpCode.Move && !activeLocals[lastInstruction.A] && lastInstruction.A == instruction.B)
{
lastInstruction = instruction with { B = lastInstruction.B };
;
instructionPositions[^1] = position;
incrementStackPosition = false;
return;
Expand All @@ -264,6 +276,7 @@ public void PushOrMergeInstruction(int lastLocal, in Instruction instruction, in
if (lastInstruction.OpCode == OpCode.Move && instruction.B == 2 && lastInstruction.B < 256)
{
lastInstruction = instruction with { A = (byte)lastInstruction.B };

instructionPositions[^1] = position;
incrementStackPosition = false;
return;
Expand Down
8 changes: 7 additions & 1 deletion src/Lua/CodeAnalysis/Compilation/LuaCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,13 @@ public bool VisitBinaryExpressionNode(BinaryExpressionNode node, ScopeCompilatio
a = context.StackTopPosition;
}

context.PushInstruction(Instruction.Test(a, (byte)(node.OperatorType is BinaryOperator.And ? 0 : 1)), node.Position);
context.PushInstruction(Instruction.Test(a, 0), node.Position);
if (node.OperatorType is BinaryOperator.Or)
{
context.PushInstruction(Instruction.Jmp(0, 2), node.Position);
context.PushInstruction(Instruction.Move(r, a), node.Position);
}

var testJmpIndex = context.Function.Instructions.Length;
context.PushInstruction(Instruction.Jmp(0, 0), node.Position);

Expand Down
8 changes: 4 additions & 4 deletions src/Lua/CodeAnalysis/Compilation/ScopeCompilationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static void Return(ScopeCompilationContext context)
readonly Dictionary<ReadOnlyMemory<char>, LocalVariableDescription> localVariables = new(256, Utf16StringMemoryComparer.Default);
readonly Dictionary<ReadOnlyMemory<char>, LabelDescription> labels = new(32, Utf16StringMemoryComparer.Default);

byte lastLocalVariableIndex;
internal BitFlags256 ActiveLocalVariables = default;

public byte StackStartPosition { get; private set; }
public byte StackPosition { get; set; }
Expand Down Expand Up @@ -74,7 +74,7 @@ public FunctionCompilationContext CreateChildFunction()
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void PushInstruction(in Instruction instruction, SourcePosition position, bool incrementStackPosition = false)
{
Function.PushOrMergeInstruction(lastLocalVariableIndex, instruction, position, ref incrementStackPosition);
Function.PushOrMergeInstruction(instruction, position, ref incrementStackPosition);
if (incrementStackPosition)
{
StackPosition++;
Expand All @@ -98,7 +98,7 @@ public void TryPushCloseUpValue(byte top, SourcePosition position)
public void AddLocalVariable(ReadOnlyMemory<char> name, LocalVariableDescription description, bool markAsLastLocalVariable = true)
{
localVariables[name] = description;
lastLocalVariableIndex = description.RegisterIndex;
ActiveLocalVariables.Set(description.RegisterIndex);
}


Expand Down Expand Up @@ -173,7 +173,7 @@ public void Reset()
HasCapturedLocalVariables = false;
localVariables.Clear();
labels.Clear();
lastLocalVariableIndex = 0;
ActiveLocalVariables = default;
}

/// <summary>
Expand Down
23 changes: 23 additions & 0 deletions src/Lua/Internal/BitFlags256.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
namespace Lua.Internal;

internal unsafe struct BitFlags256
{
internal fixed long Data[4];

public bool this[int index]
{
get => (Data[index >> 6] & (1L << (index & 63))) != 0;
set
{
if (value)
{
Data[index >> 6] |= 1L << (index & 63);
}
else
{
Data[index >> 6] &= ~(1L << (index & 63));
}
}
}
public void Set(int index) => Data[index >> 6] |= 1L << (index & 63);
}
22 changes: 22 additions & 0 deletions tests/Lua.Tests/ConditionalsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace Lua.Tests;

public class ConditionalsTests
{
[Test]
public async Task Test_Clamp()
{
var source = @"
function clamp(x, min, max)
return x < min and min or (x > max and max or x)
end

return clamp(0, 1, 25), clamp(10, 1, 25), clamp(30, 1, 25)
";
var result = await LuaState.Create().DoStringAsync(source);

Assert.That(result, Has.Length.EqualTo(3));
Assert.That(result[0], Is.EqualTo(new LuaValue(1)));
Assert.That(result[1], Is.EqualTo(new LuaValue(10)));
Assert.That(result[2], Is.EqualTo(new LuaValue(25)));
}
}