Skip to content

Commit 5ed9d77

Browse files
committed
Discard modifier is only singular.
1 parent 0f8424d commit 5ed9d77

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

ServerCodeExciserTest/AngelscriptSyntaxTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public void NamedArgumentsFunctionCall()
3838
[DataRow("no_discard")] // UnrealAngelscript
3939
[DataRow("allow_discard")] // UnrealAngelscript
4040
[DataRow("accept_temporary_this")] // UnrealAngelscript
41+
[DataRow("const allow_discard")] // UnrealAngelscript
4142
public void FunctionModifier(string modifier)
4243
{
4344
ParseScript($"bool Func() {modifier}\r\n{{\r\nreturn true;\r\n}}");

UnrealAngelscriptParser/Grammar/UnrealAngelscriptParser.g4

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ parameterDeclaration:
456456
declSpecifierSeq Identifier? (Assign initializerClause)?;
457457

458458
functionDefinition:
459-
ufunction? (accessSpecifier | accessPattern)? Mixin? declSpecifierSeq? declarator virtualSpecifierSeq? angelscriptModifierSeq? functionBody;
459+
ufunction? (accessSpecifier | accessPattern)? Mixin? declSpecifierSeq? declarator virtualSpecifierSeq? angelscriptDiscardModifier? functionBody;
460460

461461
functionBody:
462462
compoundStatement
@@ -523,7 +523,7 @@ memberDeclaratorList:
523523

524524
memberDeclarator:
525525
declarator (
526-
virtualSpecifierSeq? angelscriptModifierSeq?
526+
virtualSpecifierSeq? angelscriptDiscardModifier?
527527
| braceOrEqualInitializer?
528528
)
529529
| Identifier? Colon constantExpression
@@ -537,9 +537,7 @@ virtualSpecifier
537537
| Property // Angelscript
538538
;
539539

540-
angelscriptModifierSeq: angelscriptModifier+;
541-
542-
angelscriptModifier:
540+
angelscriptDiscardModifier:
543541
NoDiscard | AllowDiscard;
544542

545543
/*Derived classes*/

0 commit comments

Comments
 (0)