File tree Expand file tree Collapse file tree 2 files changed +20
-9
lines changed
UnrealAngelscriptParser/Grammar Expand file tree Collapse file tree 2 files changed +20
-9
lines changed Original file line number Diff line number Diff line change @@ -87,6 +87,12 @@ Bool: 'bool';
8787
8888/* UnrealAngelscript */
8989
90+ NoDiscard : ' no_discard' ;
91+
92+ AllowDiscard : ' allow_discard' ;
93+
94+ AcceptTemporaryThis : ' accept_temporary_this' ;
95+
9096UClass : ' UCLASS' ;
9197
9298UStruct : ' USTRUCT' ;
@@ -109,8 +115,6 @@ Check: 'check';
109115
110116Auto : ' auto' ;
111117
112- AcceptTemporaryThis : ' accept_temporary_this' ;
113-
114118Access : ' access' ;
115119
116120Break : ' break' ;
@@ -153,8 +157,6 @@ Inherited: 'inherited';
153157
154158Namespace : ' namespace' ;
155159
156- NoDiscard : ' no_discard' ;
157-
158160Nullptr : ' nullptr' ;
159161
160162Operator : ' operator' ;
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ ufunction:
5858
5959moduleImport :
6060 Import Identifier (Dot Identifier)* Semi
61- | Import declSpecifierSeq? declarator postFuncSpecifierSeq ? From StringLiteral Semi
61+ | Import declSpecifierSeq? declarator virtualSpecifierSeq ? From StringLiteral Semi
6262 ;
6363
6464asGeneric :
@@ -451,7 +451,7 @@ parameterDeclaration:
451451 declSpecifierSeq Identifier? (Assign initializerClause)?;
452452
453453functionDefinition :
454- ufunction? (accessSpecifier | accessPattern)? Mixin? declSpecifierSeq? declarator postFuncSpecifierSeq ? functionBody;
454+ ufunction? (accessSpecifier | accessPattern)? Mixin? declSpecifierSeq? declarator virtualSpecifierSeq? angelscriptModifierSeq ? functionBody;
455455
456456functionBody :
457457 compoundStatement
@@ -514,15 +514,24 @@ memberDeclaratorList:
514514
515515memberDeclarator :
516516 declarator (
517- postFuncSpecifierSeq ?
517+ virtualSpecifierSeq? angelscriptModifierSeq ?
518518 | braceOrEqualInitializer?
519519 )
520520 | Identifier? Colon constantExpression
521521 | Identifier;
522522
523- postFuncSpecifierSeq : virtualSpecifier+;
523+ virtualSpecifierSeq : virtualSpecifier+;
524524
525- virtualSpecifier : Override | Final | Property;
525+ virtualSpecifier
526+ : Override
527+ | Final
528+ | Property // Angelscript
529+ ;
530+
531+ angelscriptModifierSeq : angelscriptModifier+;
532+
533+ angelscriptModifier :
534+ NoDiscard | AllowDiscard;
526535
527536/* Derived classes*/
528537
You can’t perform that action at this time.
0 commit comments