diff --git a/appveyor.yml b/appveyor.yml index b6393ed..ae19894 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,10 @@ ################################################################ -# Auto-generated 2024-04-15 23:53:34.354 # +# Auto-generated 2024-04-17 08:12:10.736 # # ANY CHANGES TO THIS DOCUMENT WILL BE LOST UPON RE-GENERATION # ################################################################ # -# git commit: fc8e83b32164422fe0cbcc8b641fbb42ebe0d778 -version: 0.12.2390.8650 +# git commit: b728be29d3366955236e5645a70fc5317b5de033 +version: 0.12.2392.8652 image: Visual Studio 2022 configuration: Release install: diff --git a/src/AutoItInterpreter/AssemblyInfo.cs b/src/AutoItInterpreter/AssemblyInfo.cs index e2d01b7..89e2ec2 100644 --- a/src/AutoItInterpreter/AssemblyInfo.cs +++ b/src/AutoItInterpreter/AssemblyInfo.cs @@ -1,15 +1,15 @@ ////////////////////////////////////////////////////////////////////////// -// Auto-generated 2024-04-15 23:53:34.354 // +// Auto-generated 2024-04-17 08:12:10.736 // // ANY CHANGES TO THIS DOCUMENT WILL BE LOST UPON RE-GENERATION // ////////////////////////////////////////////////////////////////////////// using System.Reflection; using System; -[assembly: AssemblyVersion("0.12.2390.8650")] -[assembly: AssemblyFileVersion("0.12.2390.8650")] -[assembly: AssemblyInformationalVersion("v.0.12.2390.8650, commit: fc8e83b32164422fe0cbcc8b641fbb42ebe0d778")] +[assembly: AssemblyVersion("0.12.2392.8652")] +[assembly: AssemblyFileVersion("0.12.2392.8652")] +[assembly: AssemblyInformationalVersion("v.0.12.2392.8652, commit: b728be29d3366955236e5645a70fc5317b5de033")] [assembly: AssemblyCompany("Unknown6656")] [assembly: AssemblyCopyright("Copyright © 2018 - 2024, Unknown6656")] [assembly: AssemblyProduct("AutoIt-Interpreter by Unknown6656")] @@ -35,11 +35,11 @@ public static class __module__ /// /// The interpreter's current version. /// - public static Version? InterpreterVersion { get; } = Version.Parse("0.12.2390.8650"); + public static Version? InterpreterVersion { get; } = Version.Parse("0.12.2392.8652"); /// /// The Git hash associated with the current build. /// - public const string GitHash = "fc8e83b32164422fe0cbcc8b641fbb42ebe0d778"; + public const string GitHash = "b728be29d3366955236e5645a70fc5317b5de033"; /// /// The name of the GitHub repository associated with . /// @@ -49,7 +49,7 @@ public static class __module__ /// public const string RepositoryURL = "https://github.com/Unknown6656/AutoIt-Interpreter"; /// - /// The date and time of the current build (2024-04-15 23:53:34.354). + /// The date and time of the current build (2024-04-17 08:12:10.736). /// - public static DateTime DateBuilt { get; } = DateTime.FromFileTimeUtc(0x01da8f7f5ced8f6dL); + public static DateTime DateBuilt { get; } = DateTime.FromFileTimeUtc(0x01da908e2ee50274L); } diff --git a/src/AutoItInterpreter/Properties/launchSettings.json b/src/AutoItInterpreter/Properties/launchSettings.json index 9bd03a8..3b450ca 100644 --- a/src/AutoItInterpreter/Properties/launchSettings.json +++ b/src/AutoItInterpreter/Properties/launchSettings.json @@ -2,8 +2,7 @@ "profiles": { "AutoItInterpreter": { "commandName": "Project", - "commandLineArgs": "-ml ConsoleWrite(@OSVERSION)", - //"commandLineArgs": "../test/hello-world -vv", + "commandLineArgs": "-ml $ -vv", "nativeDebugging": false } } diff --git a/src/AutoItInterpreter/Runtime/ScriptScanner.cs b/src/AutoItInterpreter/Runtime/ScriptScanner.cs index 720fac1..3e6331e 100644 --- a/src/AutoItInterpreter/Runtime/ScriptScanner.cs +++ b/src/AutoItInterpreter/Runtime/ScriptScanner.cs @@ -23,31 +23,32 @@ namespace Unknown6656.AutoIt3.Runtime; /// /// Represents an AutoIt3 script scanning and caching module. /// -public sealed class ScriptScanner +public sealed partial class ScriptScanner { private static readonly string[] AUTOIT_FILE_EXTENSIONS = ["", ".au3", ".au2", ".au", ".aupp", ".au++"]; private const RegexOptions REGEX_OPTIONS = RegexOptions.IgnoreCase | RegexOptions.Compiled; - private const string REGEX_FUNC_MODIFIERS = /*lang=regex*/@"((\s+|\b)(?volatile(\s+cached)?|cached(\s+volatile)?)(\s+|\b))?"; - private static readonly Regex REGEX_COMMENT = new(@"\;[^\""\']*$", REGEX_OPTIONS); - private static readonly Regex REGEX_COMMENT_AFTER_STRING1 = new(@"^([^\""\;]*\""[^\""]*\""[^\""\;]*)*(?\;).*$", REGEX_OPTIONS); - private static readonly Regex REGEX_COMMENT_AFTER_STRING2 = new(@"^([^'\;]*'[^']*'[^'\;]*)*(?\;).*$", REGEX_OPTIONS); - internal static readonly Regex REGEX_CS = new(@"^#(comments\-start|cs)(\b|$)", REGEX_OPTIONS); - internal static readonly Regex REGEX_CE = new(@"^#(comments\-end|ce)(\b|$)", REGEX_OPTIONS); - private static readonly Regex REGEX_REGION = new(@"^#(end-?)?region\b", REGEX_OPTIONS); - private static readonly Regex REGEX_PRAGMA = new(@"^#pragma\s+(?