Merge pull request #4 from EmbarkStudios/feature/access-specifiers

Add support for access specifiers

Author: arturjpv

UnrealAngelscriptParser/Grammar/UnrealAngelscriptLexer.g4

@@ -80,6 +80,8 @@ Bool: 'bool';
 
 Auto: 'auto';
 
+Access: 'access';
+
 Break: 'break';
 
 Case: 'case';
@@ -98,6 +100,8 @@ Default: 'default';
 
 Do: 'do';
 
+EditDefaults: 'editdefaults';
+
 Else: 'else';
 
 Enum: 'enum';
@@ -114,6 +118,8 @@ Goto: 'goto';
 
 If: 'if';
 
+Inherited: 'inherited';
+
 Namespace: 'namespace';
 
 Nullptr: 'nullptr';
@@ -128,6 +134,8 @@ Protected: 'protected';
 
 Public: 'public';
 
+ReadOnly: 'readonly';
+
 Return: 'return';
 
 Short: 'short';

UnrealAngelscriptParser/Grammar/UnrealAngelscriptParser.g4

@@ -444,7 +444,7 @@ parameterDeclaration:
 	declSpecifierSeq Identifier? (Assign initializerClause)?;
 
 functionDefinition:
-	ufunction? accessSpecifier? Mixin? declSpecifierSeq? declarator postFuncSpecifierSeq? functionBody;
+	ufunction? (accessSpecifier | accessPattern)? Mixin? declSpecifierSeq? declarator postFuncSpecifierSeq? functionBody;
 
 functionBody:
 	compoundStatement
@@ -491,10 +491,11 @@ memberdeclaration:
 	propertyDefinition
 	| functionDefinition
 	| aliasDeclaration
-	| emptyDeclaration;
+	| emptyDeclaration
+	| accessDeclaration;
 
 propertyDefinition:
-	uproperty? accessSpecifier? Default? declSpecifierSeq? (memberDeclaratorList | assignmentExpression)? Semi;
+	uproperty? (accessSpecifier | accessPattern)? Default? declSpecifierSeq? (memberDeclaratorList | assignmentExpression)? Semi;
 
 memberDeclaratorList:
 	memberDeclarator (Comma memberDeclarator)*;
@@ -532,6 +533,14 @@ baseTypeSpecifier: classOrDeclType;
 
 accessSpecifier: Private | Protected | Public;
 
+accessModifier: Inherited | EditDefaults | ReadOnly;
+
+accessModifiers: LeftParen accessModifier (Comma accessModifier)* RightParen;
+
+accessDeclaration: Access Identifier Assign accessSpecifier ((Comma Identifier accessModifiers?)* | (Comma Star accessModifiers)) Semi;
+
+accessPattern: Access Colon Identifier;
+
 /*Overloading*/
 
 operatorFunctionId: Operator theOperator;