Fixed 'Call' function (#9)

Unknown6656 · Jun 27, 2020 · e4a9d93 · e4a9d93
1 parent 1d9224c
commit e4a9d93
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/new/AutoItInterpreter/AssemblyInfo.cs b/new/AutoItInterpreter/AssemblyInfo.cs
@@ -1,15 +1,15 @@
 
 //////////////////////////////////////////////////////////////////////////
-// Autogenerated 2020-06-27 09:21:53.272                                //
+// Autogenerated 2020-06-27 09:31:11.930                                //
 // ANY CHANGES TO THIS DOCUMENT WILL BE LOST UPON RE-GENERATION         //
 //////////////////////////////////////////////////////////////////////////
 
 using System.Reflection;
 using System;
 
-[assembly: AssemblyVersion("0.5.673.20179")]
-[assembly: AssemblyFileVersion("0.5.673.20179")]
-[assembly: AssemblyInformationalVersion("327f60ed6c92039d5cc9f93de7f0a047257c4617")]
+[assembly: AssemblyVersion("0.5.675.20179")]
+[assembly: AssemblyFileVersion("0.5.675.20179")]
+[assembly: AssemblyInformationalVersion("1d9224c8993d134c64f9465f8038f37c79fbbef4")]
 [assembly: AssemblyCompany("Unknown6656")]
 [assembly: AssemblyCopyright("Copyright © 2018 - 2020, Unknown6656")]
 [assembly: AssemblyProduct("AutoIt3 Interpreter by Unknown6656")]
@@ -20,6 +20,6 @@ public static class __module__
     public static string Author { get; } = "Unknown6656";
     public static string Year { get; } = "2018 - 2020";
     public static string Copyright { get; } = "Copyright © 2018 - 2020, Unknown6656";
-    public static Version? InterpreterVersion { get; } = Version.Parse("0.5.673.20179");
-    public static string GitHash { get; } = "327f60ed6c92039d5cc9f93de7f0a047257c4617";
+    public static Version? InterpreterVersion { get; } = Version.Parse("0.5.675.20179");
+    public static string GitHash { get; } = "1d9224c8993d134c64f9465f8038f37c79fbbef4";
 }
diff --git a/new/AutoItInterpreter/Extensibility/Plugins.Au3Framework.Functions.cs b/new/AutoItInterpreter/Extensibility/Plugins.Au3Framework.Functions.cs
@@ -184,14 +184,12 @@ Variant rotate(int size)
 
         public static FunctionReturnValue Call(CallFrame frame, Variant[] args)
         {
-            Variant[] call_args = frame.PassedArguments.Length switch
-            {
-                1 => Array.Empty<Variant>(),
-                2 when args[1] is { Type: VariantType.Array } arr &&
-                       arr.TryGetIndexed(0, out Variant caa) &&
-                       caa.ToString().Equals("CallArgArray") => arr.ToArray()[1..],
-                _ => args
-            };
+            Variant[] call_args = frame.PassedArguments.Length == 2 &&
+                                  args[1] is { Type: VariantType.Array } arr &&
+                                  arr.TryGetIndexed(0, out Variant caa) &&
+                                  caa.ToString().Equals("CallArgArray") ? arr.ToArray() : args;
+
+            call_args = call_args[1..];
 
             if (!args[0].IsFunction(out ScriptFunction? func))
                 func = frame.Interpreter.ScriptScanner.TryResolveFunction(args[0].ToString());

diff --git a/new/AutoItInterpreter/version.txt b/new/AutoItInterpreter/version.txt
@@ -1,2 +1,2 @@
-0.5.673.20179
-327f60ed6c92039d5cc9f93de7f0a047257c4617
+0.5.675.20179
+1d9224c8993d134c64f9465f8038f37c79fbbef4
diff --git a/new/test/test.au3 b/new/test/test.au3
@@ -1,5 +1,5 @@
 
-dim $funcs = [String, Binary, Number, Int, BinaryToString, StringToBinary]
+dim $funcs = [lol2, String, Binary, Number, Int, BinaryToString, StringToBinary]
 dim $inputs = [True, False, Null, Default, 0xff00, 0x00ff, 0xfedcba9876543210, Binary("0xaaffbb00"), "0xaaffbb00", "0xfedcba9876543210", "topkek", 420.135, $funcs, Binary]
 
 for $func in $funcs
@@ -9,6 +9,10 @@ for $func in $funcs
    next
    ConsoleWrite(@CRLF)
 next
+func lol2($in)
+   debugallvarscompact()
+   exit 1
+endfunc
 
 exit 0