Support 'strict mode' lexer/parser errors.

Author: webbju

ServerCodeExciser/ServerCodeExciser.cs

@@ -54,9 +54,13 @@ public sealed class Settings : CommandSettings
             public bool IsDryRun { get; init; }
 
             [CommandOption("-v|--verify")]
-            [Description("Verify that all analized code does not require modifications to excise server scopes.")]
+            [Description("Verify that all analyzed code does not require modifications to excise server scopes.")]
             public bool Verify { get; init; }
 
+            [CommandOption("--strict")]
+            [Description("Ensure that all files can be analyzed without syntactic or lexicographical errors.")]
+            public bool StrictMode { get; init; }
+
             [CommandArgument(0, "[INPUT]")]
             [Description("The input folder to excise.")]
             public string InputPath { get; init; } = string.Empty;
@@ -87,6 +91,7 @@ public override int Execute([NotNull] CommandContext context, [NotNull] Settings
             parameters.ShouldOutputUntouchedFiles = settings.ShouldOutputUntouchedFiles;
             parameters.IsDryRun = settings.IsDryRun || settings.ShouldOutputUntouchedFiles || settings.Verify;
             parameters.Verify = settings.Verify;
+            parameters.StrictMode = settings.StrictMode;
             parameters.UseFunctionStats = settings.UseFunctionStats;
             parameters.DontSkip = settings.DontSkip;
             if (settings.RequiredExcisionRatio.HasValue)

ServerCodeExciser/ServerCodeExcisionProcessor.cs

@@ -17,6 +17,7 @@ public class ServerCodeExcisionParameters
         public bool ShouldOutputUntouchedFiles { get; set; } = false;
         public bool IsDryRun { get; set; } = false;
         public bool Verify { get; set; } = false;
+        public bool StrictMode { get; set; } = false;
         public bool UseFunctionStats { get; set; } = false;
         public bool DontSkip { get; set; } = false;
         public float RequiredExcisionRatio { get; set; } = -1.0f;
@@ -109,8 +110,7 @@ public EExciserReturnValues ExciseServerCode(string filePattern, IServerCodeExci
                         {
                             System.Diagnostics.Debug.Assert(stats.TotalNrCharacters > 0, "Something is terribly wrong. We have excised characters, but no total characters..?");
                             var excisionRatio = (float)stats.CharactersExcised / (float)stats.TotalNrCharacters * 100.0f;
-                            Console.WriteLine("Excised {0:0.00}% of server only code in file ({1}/{2}): {3}",
-                                    excisionRatio, fileIdx + 1, allFiles.Length, fileName);
+                            Console.WriteLine("Excised {0:0.00}% of server only code in file ({1}/{2}): {3}", excisionRatio, fileIdx + 1, allFiles.Length, fileName);
                         }
                         else
                         {
@@ -120,9 +120,10 @@ public EExciserReturnValues ExciseServerCode(string filePattern, IServerCodeExci
                         globalStats.CharactersExcised += stats.CharactersExcised;
                         globalStats.TotalNrCharacters += stats.TotalNrCharacters;
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
                         Console.WriteLine("Failed to parse ({0}/{1}): {2}", fileIdx + 1, allFiles.Length, fileName);
+                        throw;
                     }
                 }
             }
@@ -189,6 +190,11 @@ private ExcisionStats ProcessCodeFile(string fileName, string inputPath, EExcisi
             var parser = excisionLanguage.CreateParser<UnrealAngelscriptParser>(commonTokenStream);
             parser.AddErrorListener(new ExcisionParserErrorListener());
 
+            if (_parameters.StrictMode)
+            {
+                parser.ErrorHandler = new BailErrorStrategy();
+            }
+
             var answerText = new StringBuilder();
             answerText.Append(script);
 
@@ -224,6 +230,7 @@ private ExcisionStats ProcessCodeFile(string fileName, string inputPath, EExcisi
             if (visitor != null)
             {
                 visitor.VisitContext(parser.script());
+
                 if (_parameters.UseFunctionStats)
                 {
                     stats.TotalNrCharacters = visitor.TotalNumberOfFunctionCharactersVisited;

ServerCodeExciserTest/ExcisionIntegrationTests.cs

@@ -25,6 +25,10 @@ public static int Main(string[] args)
                 ref numTestFailures,
                 ref numTestCases);
 
+            Console.WriteLine("----------------------------");
+            Console.WriteLine($"{numTestCases} *.as test(s) executed.");
+            Console.WriteLine($"{numTestFailures} *.as test(s) failed.");
+
             // Run for "common"
             var commonResult = RunExciserIntegrationTests(
                 ".common",
@@ -34,8 +38,8 @@ public static int Main(string[] args)
                 ref numTestCases);
 
             Console.WriteLine("----------------------------");
-            Console.WriteLine($"{numTestCases - numTestFailures} test(s) passed.");
-            Console.WriteLine($"{numTestFailures} test(s) failed.");
+            Console.WriteLine($"{numTestCases} *.common test(s) executed.");
+            Console.WriteLine($"{numTestFailures} *.common test(s) failed.");
         }
         catch (Exception e)
         {
@@ -55,6 +59,7 @@ private static EExciserReturnValues RunExciserIntegrationTests(string fileExtens
         }
 
         string searchPattern = "*" + fileExtension.TrimStart('.');
+        Console.WriteLine($"Running integration tests for {searchPattern} files...");
 
         EExciserReturnValues returnCode;
         try
@@ -65,17 +70,17 @@ private static EExciserReturnValues RunExciserIntegrationTests(string fileExtens
                 ShouldOutputUntouchedFiles = true,
                 FullExcisionRegexString = @"FullExcise1/.*",
                 ExciseAllFunctionsRegexString = @"AllFunctionExcise1/.*|||AllFunctionExcise2/.*",
+                StrictMode = true,
             };
             excisionParams.InputPaths.Add(inputPath);
 
             var angelscriptServerCodeExciser = new ServerCodeExcisionProcessor(excisionParams);
             returnCode = angelscriptServerCodeExciser.ExciseServerCode(searchPattern, new UnrealAngelscriptServerCodeExcisionLanguage());
-            Console.WriteLine($"ExciseServerCode for {fileExtension} files returned: {returnCode}");
+            Console.WriteLine($"ExciseServerCode for {searchPattern} files returned: {returnCode}");
         }
-        catch (Exception e)
+        catch (Exception)
         {
-            AnsiConsole.WriteException(e);
-            return EExciserReturnValues.InternalExcisionError;
+            throw;
         }
 
         foreach (var answerFilePath in Directory.EnumerateFiles(outputPath, searchPattern, SearchOption.AllDirectories))

UnrealAngelscriptServerCodeExcision/UnrealAngelscriptSymbolVisitor.cs

@@ -1,6 +1,5 @@
 using ServerCodeExcisionCommon;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace UnrealAngelscriptServerCodeExcision