Fix UnderminersTeam/UndertaleModTool#2032

Underanalyzer/Decompiler/AST/Nodes/VariableNode.cs

@@ -234,7 +234,7 @@ public IExpressionNode Clean(ASTCleaner cleaner)
         if (cleaner.StructArguments is not null)
         {
             // Verify this is an argument array access
-            if (instType == (int)InstanceType.Argument && 
+            if (instType is (int)InstanceType.Argument or (int)InstanceType.Self &&
                 Variable is { Name.Content: "argument" } &&
                 ArrayIndices is [Int16Node arrayIndex])
             {

UnderanalyzerTest/DecompileContext.DecompileToString.cs

@@ -2790,4 +2790,49 @@ function Test(arg0) constructor
             """
         );
     }
+
+    [Fact]
+    public void TestStructSelfArgument()
+    {
+        // Note about this test case: -1 (self) values are generally -15 (arguments), but seems like either
+        // different GameMaker versions or mod tooling(?) generates code that uses self...
+        TestUtil.VerifyDecompileResult(
+            """
+            :[0]
+            call.i @@NewGMLArray@@ 0
+            call.i @@NewGMLArray@@ 0
+            b [2]
+
+            > test_struct (locals=0, args=0)
+            :[1]
+            pushi.e -1
+            pushi.e 0
+            push.v [array]self.argument
+            pop.v.v self.a
+            pushi.e -1
+            pushi.e 1
+            push.v [array]self.argument
+            pop.v.v self.b
+            exit.i
+
+            :[2]
+            push.i [function]test_struct
+            conv.i.v
+            call.i @@NullObject@@ 0
+            call.i method 2
+            dup.v 0
+            pushi.e -16
+            pop.v.v [stacktop]static.test_struct
+            call.i @@NewGMLObject@@ 3
+            pop.v.v self.c
+            """,
+            """
+            c = 
+            {
+                a: [],
+                b: []
+            };
+            """
+        );
+    }
 }