Support annotation trailing comma.

Author: webbju

ServerCodeExciserTest/AngelscriptSyntaxTests.cs

@@ -89,5 +89,37 @@ public void DataType(string type, string value)
             parser.AddErrorListener(new ThrowingErrorListener());
             new UnrealAngelscriptSimpleVisitor(script).VisitChildren(parser.script());
         }
+
+        [TestMethod]
+        [DataRow("")]
+        [DataRow("UCLASS()")]
+        [DataRow("UCLASS(Abstract)")]
+        public void UClass(string annotation)
+        {
+            var script = $"{annotation} class ClassName : BaseClass {{}};";
+            var lexer = new UnrealAngelscriptLexer(new AntlrInputStream(script));
+            var tokenStream = new CommonTokenStream(lexer);
+            var parser = new UnrealAngelscriptParser(tokenStream);
+            parser.RemoveErrorListeners();
+            parser.AddErrorListener(new ThrowingErrorListener());
+            new UnrealAngelscriptSimpleVisitor(script).VisitChildren(parser.script());
+        }
+
+        [TestMethod]
+        [DataRow("")]
+        [DataRow("UPROPERTY()")]
+        [DataRow("UPROPERTY(DefaultComponent)")]
+        [DataRow("UPROPERTY(DefaultComponent,)")]
+        [DataRow("UPROPERTY(DefaultComponent, RootComponent)")]
+        public void UProperty(string annotation)
+        {
+            var script = $"class ClassName : BaseClass\r\n{{\r\n\t{annotation}\r\nDummyType DummyProperty;\r\n}};";
+            var lexer = new UnrealAngelscriptLexer(new AntlrInputStream(script));
+            var tokenStream = new CommonTokenStream(lexer);
+            var parser = new UnrealAngelscriptParser(tokenStream);
+            parser.RemoveErrorListeners();
+            parser.AddErrorListener(new ThrowingErrorListener());
+            new UnrealAngelscriptSimpleVisitor(script).VisitChildren(parser.script());
+        }
     }
 }

UnrealAngelscriptParser/Grammar/UnrealAngelscriptParser.g4

@@ -35,8 +35,9 @@ script:
 	declarationseq? EOF;
 
 /*Angelscript */
+
 annotationList:
-	annotation (Comma annotation)*;
+	annotation (Comma annotation)* Comma?; // trailing commas are permitted in AS
 
 annotation:
 	Identifier (Assign expression)?;
@@ -477,7 +478,7 @@ initializerClause:
     | bracedInitList;
 
 initializerList:
-	initializerClause (Comma initializerClause)* Comma?; // I *really* don't like that trailing commas are a thing in AS...
+	initializerClause (Comma initializerClause)* Comma?; // trailing commas are permitted in AS
 
 bracedInitList: (LeftBrace|LeftBracket) (initializerList Comma?)? (RightBrace|RightBracket);