test: collection numeric indexing adds one codegen

roblox-csharp · Jul 14, 2024 · 07c6131 · 07c6131
1 parent a155f56
commit 07c6131
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 Roblox CSharp to Lua compiler
 
 # To-do
+- Test `DebugTransformer`
 - Imports
 - Inheritance chains 🤮
 - Append ` = null` to generated nullable properties

diff --git a/RobloxCS.Tests/CodeGenerator_GenerateLuaShould.cs b/RobloxCS.Tests/CodeGenerator_GenerateLuaShould.cs
@@ -182,6 +182,15 @@ public void CollectionInitializer_GeneratesTable()
             Assert.Equal("local nums = {1, 2, 3}", cleanedLua);
         }
 
+        [Theory]
+        [InlineData("int[] nums = [1, 2, 3]; nums[0]", "nums[1]", 1)]
+        [InlineData("int[] nums = [1, 2, 3]; int i = 4; nums[i]", "nums[i + 1]", 2)]
+        public void CollectionIndexing_AddsOneToNumericalIndices(string input, string expected, int removeLines = 0)
+        {
+            var cleanedLua = GetCleanLua(input, removeLines);
+            Assert.Equal(expected, cleanedLua);
+        }
+
         private static void AssertEqualLines(List<string> lines, List<string> expectedLines)
         {
             foreach (var line in lines)

diff --git a/RobloxCS/CodeGenerator.cs b/RobloxCS/CodeGenerator.cs
@@ -252,10 +252,8 @@ public override void VisitBracketedArgumentList(BracketedArgumentListSyntax node
                 {
                     Visit(argument);
 
-                    var argumentSymbol = _semanticModel.GetSymbolInfo(argument.Expression).Symbol;
-                    var definitionSymbol = argumentSymbol?.OriginalDefinition;
-                    var indexSymbol = definitionSymbol ?? argumentSymbol;
-                    var isNumericalIndex = indexSymbol is ITypeSymbol typeSymbol && Constants.INTEGER_TYPES.Contains(typeSymbol.Name);
+                    var typeSymbol = _semanticModel.GetTypeInfo(argument.Expression).Type;
+                    var isNumericalIndex = typeSymbol != null && Constants.INTEGER_TYPES.Contains(typeSymbol.Name);
                     if (isNumericalIndex)
                     {
                         Write(" + 1");
@@ -306,17 +304,15 @@ public override void VisitPrefixUnaryExpression(PrefixUnaryExpressionSyntax node
         public override void VisitBinaryExpression(BinaryExpressionSyntax node)
         {
             var operatorText = node.OperatorToken.Text;
-            var leftSymbolInfo = _semanticModel.GetSymbolInfo(node.Left);
-            var rightSymbolInfo = _semanticModel.GetSymbolInfo(node.Right);
-            var leftSymbol = leftSymbolInfo.Symbol?.OriginalDefinition ?? leftSymbolInfo.Symbol ?? _semanticModel.GetTypeInfo(node.Left).Type;
-            var rightSymbol = rightSymbolInfo.Symbol?.OriginalDefinition ?? rightSymbolInfo.Symbol ?? _semanticModel.GetTypeInfo(node.Right).Type;
+            var leftType = _semanticModel.GetTypeInfo(node.Left).Type;
+            var rightType = _semanticModel.GetTypeInfo(node.Right).Type;
             var perTypeOperators = Constants.PER_TYPE_BINARY_OPERATOR_MAP;
             if (
-                (leftSymbol != null && perTypeOperators.Any(pair => pair.Key.Contains(leftSymbol.Name)))
-                || (rightSymbol != null && perTypeOperators.Any(pair => pair.Key.Contains(rightSymbol.Name)))
+                (leftType != null && perTypeOperators.Any(pair => pair.Key.Contains(leftType.Name)))
+                || (rightType != null && perTypeOperators.Any(pair => pair.Key.Contains(rightType.Name)))
             )
             {
-                var typeList = perTypeOperators.FirstOrDefault(pair => pair.Key.Contains(leftSymbol!.Name) || pair.Key.Contains(rightSymbol!.Name)).Key;
+                var typeList = perTypeOperators.FirstOrDefault(pair => pair.Key.Contains(leftType!.Name) || pair.Key.Contains(rightType!.Name)).Key;
                 var operatorMap = perTypeOperators[typeList];
                 if (operatorText == operatorMap.Item1)
                 {
@@ -447,9 +443,8 @@ public override void VisitInvocationExpression(InvocationExpressionSyntax node)
                     case "Write":
                     case "WriteLine":
                         {
-                            var objectSymbolInfo = _semanticModel.GetSymbolInfo(memberAccess.Expression);
-                            var objectDefinitionSymbol = (ITypeSymbol)objectSymbolInfo.Symbol!;
-                            if (objectDefinitionSymbol.Name != "Console") break;
+                            var objectType = _semanticModel.GetTypeInfo(memberAccess.Expression).Type;
+                            if (objectType == null || objectType.Name != "Console") break;
 
                             Write("print");
                             Visit(node.ArgumentList);

diff --git a/RobloxCS/Constants.cs b/RobloxCS/Constants.cs
@@ -30,7 +30,17 @@ internal static class Constants
             "int",
             "uint",
             "long",
-            "ulong"
+            "ulong",
+            "SByte",
+            "Byte",
+            "Int16",
+            "Int32",
+            "Int64",
+            "Int128",
+            "UInt16",
+            "UInt32",
+            "UInt64",
+            "UInt128",
         };
     }
 }
diff --git a/TestProject/dist/client/Main.client.lua b/TestProject/dist/client/Main.client.lua
@@ -5,7 +5,9 @@ CS.class("Game", function(namespace)
     class.__index = class
 
     function class.Main()
-        print("[TestProject/Client/Main.client.cs:5:9]:", 420)
+        local nums = {1, 2, 3}
+        local i = 4
+        print("[TestProject/Client/Main.client.cs:9:9]:", nums[i + 1])
     end
 
     if namespace == nil then

diff --git a/TestProject/src/client/Main.client.cs b/TestProject/src/client/Main.client.cs
@@ -4,6 +4,8 @@ public static class Game
 {
     public static void Main()
     {
-        warn("hello baby");
+        int[] nums = [1, 2, 3];
+        int i = 4;
+        Console.WriteLine(nums[i]);
     }
 }