Jun 23, 2023 · Jun 11, 2023 · Jun 12, 2023 · Jun 13, 2023 · Jun 13, 2023 · Jun 14, 2023
diff --git a/...st/Binary/MultipleNamecallStatements.luau → Unluau.Test/Binary/Namecall.luau b/...st/Binary/MultipleNamecallStatements.luau → Unluau.Test/Binary/Namecall.luau
diff --git a/Unluau.Test/Binary/Tables01.luau b/Unluau.Test/Binary/Tables01.luau
diff --git a/Unluau.Test/Binary/WhileLoops.luau b/Unluau.Test/Binary/WhileLoops.luau
diff --git a/Unluau.Test/Expect/Namecall.lua b/Unluau.Test/Expect/Namecall.lua
 local PlayersService = game:GetService("Players")
 local MiscService = game:GetService("Misc")
diff --git a/Unluau.Test/Expect/Tables01.lua b/Unluau.Test/Expect/Tables01.lua
 local var1 = {}
 var1.first = 1
 var1.second = 2
 var1.third = 3
 y = { first = 1, second = 2, third = 3 }
diff --git a/Unluau.Test/Expect/WhileLoops.lua b/Unluau.Test/Expect/WhileLoops.lua
 while a do
   f()
 end
 while a do
   if b then
      f()
   end
 end
 while a do
   while b do
      f()
   end
   g()
 end
 while a do
   f()
   while b do
      g()
   end
 end
diff --git a/Unluau.Test/UnluauTests.cs b/Unluau.Test/UnluauTests.cs

 namespace Unluau.Test
 {
    /// <summary>
    /// Specifically created for the test decompilation stage
    /// </summary>
    public class UnluauOptions
    {

    }

    [TestClass]
    public class UnluauTests
    {
                Decompiler decompiler = new Decompiler(stream, new DecompilerOptions()
                {
                    Output = new Output(new StreamWriter(memoryStream)),
                    HeaderEnabled = false
                    HeaderEnabled = false,
                    VariableNameGuessing = true,
                    InlineTableDefintions = true
                });

                decompiler.Decompile();
            }
        }

        private void GetAndAssert(string binary, string expect)
        {
            string actual = GetCode(binary);
            string expected = new StreamReader(OpenRead(expect)).ReadToEnd();

            Assert.AreEqual(expected, actual);
        }

        [TestMethod]
        public voidMultiple_Namecall()
        public voidTest_Namecall()
        {
            string actual = GetCode("Binary/MultipleNamecallStatements.luau");
            GetAndAssert("Binary/Namecall.luau", "Expect/Namecall.lua");
        }

        [TestMethod]
        public void Test_WhileLoops()
        {
            GetAndAssert("Binary/WhileLoops.luau", "Expect/WhileLoops.lua");
        }

            string expected = "local var4 = game:GetService(\"Players\")\nlocal var8 = game:GetService(\"Misc\")";

            Assert.AreEqual(expected, actual);
        [TestMethod]
        public void Test_DictionaryTable()
        {
            GetAndAssert("Binary/Tables01.luau", "Expect/Tables01.lua");
        }
    }
 }
diff --git a/Unluau/Lifter/Expressions/TableLiteral.cs b/Unluau/Lifter/Expressions/TableLiteral.cs

        public override void Write(Output output)
        {
            if (Entries.Count == 0)
            {
                output.Write("{}");
                return;
            }

            output.Write("{ ");

            bool itemsOnNewline = (IsList && Entries.Count > 10) || (IsDictionary && Entries.Count > 5);

                if (entry.Key != null)
                {
                    if (entry.Key is NumberLiteral || entry.Key is StringLiteral)
                    if (entry.Key is NumberLiteral)
                    {
                        output.Write("[");
                        entry.Key.Write(output);
                        output.Write("]");
                    }
                    else if (entry.Key is StringLiteral)
                    {
                        output.Write((entry.Key as StringLiteral).Value);
                    }
                    else
                        entry.Key.Write(output);

diff --git a/Unluau/Lifter/Lifter.cs b/Unluau/Lifter/Lifter.cs
                    }
                    case OpCode.SETTABLEKS:
                    {
                        StringConstant target = (StringConstant)function.Constants[(int)function.Instructions[++pc].Value];
                        Expression table = registers.GetExpression(instruction.B), value = ((LocalExpression)table).Expression;
                        StringConstant target = (StringConstant)function.Constants[function.Instructions[++pc].Value];
                        Expression table = registers.GetExpression(instruction.B, false), value = ((LocalExpression)table).Expression;

                        if (options.InlineTableDefintions && value is TableLiteral)
                        {
                    case OpCode.SETTABLE:
                    {
                        Expression expression = registers.GetRefExpressionValue(instruction.C), value = registers.GetExpression(instruction.A);
                        Expression table = registers.GetExpression(instruction.B), tableValue = ((LocalExpression)table).Expression;
                        Expression table = registers.GetExpression(instruction.B, false), tableValue = ((LocalExpression)table).Expression;

                        if (options.InlineTableDefintions && tableValue is TableLiteral)
                        {

        private int IsSelf(Expression expression)
        {
            NameIndex nameIndex = (NameIndex)((LocalExpression)expression).Expression;
            return nameIndex.IsSelf ? 1 : 0;
            Expression value = ((LocalExpression)expression).Expression;

            if (value is NameIndex)
            {
                NameIndex nameIndex = (NameIndex)value;
                return nameIndex.IsSelf ? 1 : 0;
            }
            return 0;
        }

        private Expression BuildConcat(Registers registers, int from, int to)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		local PlayersService = game:GetService("Players")
		local MiscService = game:GetService("Misc")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		local var1 = {}
		var1.first = 1
		var1.second = 2
		var1.third = 3
		y = { first = 1, second = 2, third = 3 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,20 @@
		while a do
		f()
		end
		while a do
		if b then
		f()
		end
		end
		while a do
		while b do
		f()
		end
		g()
		end
		while a do
		f()
		while b do
		g()
		end
		end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,14 @@

		namespace Unluau.Test
		{
		/// <summary>
		/// Specifically created for the test decompilation stage
		/// </summary>
		public class UnluauOptions
		{

		}

		[TestClass]
		public class UnluauTests
		{
Expand All		@@ -24,7 +32,9 @@ private string GetCode(string FileName)
		Decompiler decompiler = new Decompiler(stream, new DecompilerOptions()
		{
		Output = new Output(new StreamWriter(memoryStream)),
		HeaderEnabled = false
		HeaderEnabled = false,
		VariableNameGuessing = true,
		InlineTableDefintions = true
		});

		decompiler.Decompile();
Expand All		@@ -33,14 +43,31 @@ private string GetCode(string FileName)
		}
		}

		private void GetAndAssert(string binary, string expect)
		{
		string actual = GetCode(binary);
		string expected = new StreamReader(OpenRead(expect)).ReadToEnd();

		Assert.AreEqual(expected, actual);
		}

		[TestMethod]
		public voidMultiple_Namecall()
		public voidTest_Namecall()
		{
		string actual = GetCode("Binary/MultipleNamecallStatements.luau");
		GetAndAssert("Binary/Namecall.luau", "Expect/Namecall.lua");
		}

		[TestMethod]
		public void Test_WhileLoops()
		{
		GetAndAssert("Binary/WhileLoops.luau", "Expect/WhileLoops.lua");
		}

		string expected = "local var4 = game:GetService(\"Players\")\nlocal var8 = game:GetService(\"Misc\")";

		Assert.AreEqual(expected, actual);
		[TestMethod]
		public void Test_DictionaryTable()
		{
		GetAndAssert("Binary/Tables01.luau", "Expect/Tables01.lua");
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,6 +45,12 @@ public void AddEntry(Entry entry)

		public override void Write(Output output)
		{
		if (Entries.Count == 0)
		{
		output.Write("{}");
		return;
		}

		output.Write("{ ");

		bool itemsOnNewline = (IsList && Entries.Count > 10) \|\| (IsDictionary && Entries.Count > 5);
Expand All		@@ -65,12 +71,16 @@ public override void Write(Output output)

		if (entry.Key != null)
		{
		if (entry.Key is NumberLiteral \|\| entry.Key is StringLiteral)
		if (entry.Key is NumberLiteral)
		{
		output.Write("[");
		entry.Key.Write(output);
		output.Write("]");
		}
		else if (entry.Key is StringLiteral)
		{
		output.Write((entry.Key as StringLiteral).Value);
		}
		else
		entry.Key.Write(output);

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -200,8 +200,8 @@ private Block LiftBlock(Function function, Registers registers, int pcStart = 0,
		}
		case OpCode.SETTABLEKS:
		{
		StringConstant target = (StringConstant)function.Constants[(int)function.Instructions[++pc].Value];
		Expression table = registers.GetExpression(instruction.B), value = ((LocalExpression)table).Expression;
		StringConstant target = (StringConstant)function.Constants[function.Instructions[++pc].Value];
		Expression table = registers.GetExpression(instruction.B, false), value = ((LocalExpression)table).Expression;

		if (options.InlineTableDefintions && value is TableLiteral)
		{
Expand All		@@ -222,7 +222,7 @@ private Block LiftBlock(Function function, Registers registers, int pcStart = 0,
		case OpCode.SETTABLE:
		{
		Expression expression = registers.GetRefExpressionValue(instruction.C), value = registers.GetExpression(instruction.A);
		Expression table = registers.GetExpression(instruction.B), tableValue = ((LocalExpression)table).Expression;
		Expression table = registers.GetExpression(instruction.B, false), tableValue = ((LocalExpression)table).Expression;

		if (options.InlineTableDefintions && tableValue is TableLiteral)
		{
Expand DownExpand Up		@@ -392,8 +392,14 @@ private Block LiftBlock(Function function, Registers registers, int pcStart = 0,

		private int IsSelf(Expression expression)
		{
		NameIndex nameIndex = (NameIndex)((LocalExpression)expression).Expression;
		return nameIndex.IsSelf ? 1 : 0;
		Expression value = ((LocalExpression)expression).Expression;

		if (value is NameIndex)
		{
		NameIndex nameIndex = (NameIndex)value;
		return nameIndex.IsSelf ? 1 : 0;
		}
		return 0;
		}

		private Expression BuildConcat(Registers registers, int from, int to)
Expand Down