Remove intermediate UnrealAngelscriptServerCodeParser.

Author: webbju

ServerCodeExciser/ServerCodeExcisionProcessor.cs

@@ -183,10 +183,12 @@ private ExcisionStats ProcessCodeFile(string fileName, string inputPath, EExcisi
             // Setup parsing and output.
             List<KeyValuePair<int, string>> serverCodeInjections = new List<KeyValuePair<int, string>>();
             var inputStream = new AntlrInputStream(script);
-            var lexer = excisionLanguage.CreateLexer(inputStream);
+            var lexer = excisionLanguage.CreateLexer<UnrealAngelscriptLexer>(inputStream);
             lexer.AddErrorListener(new ExcisionLexerErrorListener());
             var commonTokenStream = new CommonTokenStream(lexer);
-            var parser = excisionLanguage.CreateParser(commonTokenStream);
+            var parser = excisionLanguage.CreateParser<UnrealAngelscriptParser>(commonTokenStream);
+            parser.AddErrorListener(new ExcisionParserErrorListener());
+
             var answerText = new StringBuilder();
             answerText.Append(script);
 
@@ -221,7 +223,7 @@ private ExcisionStats ProcessCodeFile(string fileName, string inputPath, EExcisi
             // Gather all the injections we want to make
             if (visitor != null)
             {
-                visitor.VisitContext(parser.GetParseTree());
+                visitor.VisitContext(parser.script());
                 if (_parameters.UseFunctionStats)
                 {
                     stats.TotalNrCharacters = visitor.TotalNumberOfFunctionCharactersVisited;

ServerCodeExcisionCommon/IServerCodeExcisionLanguage.cs

@@ -9,16 +9,23 @@ public interface IServerCodeExcisionLanguage
 		List<string> ServerOnlySymbols { get; }
 
 		string ServerPrecompilerSymbol { get; }
+
 		string ServerScopeStartString { get; }
+
 		string ServerScopeEndString { get; }
 
-		Antlr4.Runtime.Lexer CreateLexer(Antlr4.Runtime.AntlrInputStream inputStream);
-		IServerCodeParser CreateParser(Antlr4.Runtime.CommonTokenStream tokenStream);
-		
+		T CreateLexer<T>(Antlr4.Runtime.AntlrInputStream inputStream)
+			where T : Antlr4.Runtime.Lexer;
+
+		T CreateParser<T>(Antlr4.Runtime.CommonTokenStream tokenStream)
+			where T : Antlr4.Runtime.Parser;
+
 		IServerCodeVisitor CreateSimpleVisitor(string code);
+
 		IServerCodeVisitor CreateFunctionVisitor(string code);
+
 		IServerCodeVisitor CreateSymbolVisitor(string code);
-		
+
 		bool AnyServerOnlySymbolsInScript(string script);
 	}
 }

ServerCodeExcisionCommon/IServerCodeParser.cs

@@ -89,7 +89,10 @@ public enum EExciserReturnValues
 
 	public class ExcisionException : Exception
 	{
-		public ExcisionException(string excisionError, Exception innerException) : base(excisionError, innerException) {}
+		public ExcisionException(string excisionError, Exception innerException)
+			: base(excisionError, innerException)
+		{
+		}
 	}
 
 	public class ExcisionParserErrorListener : Antlr4.Runtime.IAntlrErrorListener<Antlr4.Runtime.IToken>

ServerCodeExcisionCommon/ServerCodeExcisionUtils.cs

@@ -1,5 +1,6 @@
-using System.Collections.Generic;
 using ServerCodeExcisionCommon;
+using System;
+using System.Collections.Generic;
 
 namespace UnrealAngelscriptServerCodeExcision
 {
@@ -10,27 +11,33 @@ public class UnrealAngelscriptServerCodeExcisionLanguage : IServerCodeExcisionLa
 			@"^System::IsServer\(\)$",
 			@"^[A-z]+\.HasAuthority\(\)$"
 		};
+
 		public List<string> ServerOnlySymbolRegexes	{ get { return _angelscriptServerOnlySymbolRegexes; } }
 
 		private List<string> _angelscriptServerOnlySymbols = new List<string>
 		{
 			"hasauthority()",
 			"server"
 		};
+
 		public List<string> ServerOnlySymbols { get { return _angelscriptServerOnlySymbols; } }
 
 		public string ServerPrecompilerSymbol { get { return "WITH_SERVER"; } }
+
 		public string ServerScopeStartString { get { return "\r\n#ifdef " + ServerPrecompilerSymbol; } }
+
 		public string ServerScopeEndString { get { return "#endif // " + ServerPrecompilerSymbol + "\r\n"; } }
 
-		public Antlr4.Runtime.Lexer CreateLexer(Antlr4.Runtime.AntlrInputStream inputStream)
-		{
-			return new UnrealAngelscriptLexer(inputStream);
+		public T CreateLexer<T>(Antlr4.Runtime.AntlrInputStream inputStream)
+            where T : Antlr4.Runtime.Lexer
+        {
+			return (T)Activator.CreateInstance(typeof(T), inputStream);
 		}
 
-		public IServerCodeParser CreateParser(Antlr4.Runtime.CommonTokenStream tokenStream)
+		public T CreateParser<T>(Antlr4.Runtime.CommonTokenStream tokenStream)
+			where T : Antlr4.Runtime.Parser
 		{
-			return new UnrealAngelscriptServerCodeParser(tokenStream);
+			return (T)Activator.CreateInstance(typeof(T), tokenStream);
 		}
 
 		public IServerCodeVisitor CreateSimpleVisitor(string code)