From 3255aaf23137896147d1f73e78ea17eafec02c56 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 19 Mar 2014 14:33:04 +0400 Subject: [PATCH] Minor. Grammar rules fixed --- .../src/org/jetbrains/jet/lang/parsing/JetParsing.java | 4 ++-- grammar/src/class.grm | 2 +- grammar/src/enum.grm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java index 4fc2956c295..cd2722763c2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -530,7 +530,7 @@ public class JetParsing extends AbstractJetParsing { /* * enumClassBody - * : "{" enumEntry* "}" + * : "{" (enumEntry | memberDeclaration)* "}" * ; */ private void parseEnumClassBody() { @@ -600,7 +600,7 @@ public class JetParsing extends AbstractJetParsing { /* * classBody - * : ("{" memberDeclaration "}")? + * : ("{" memberDeclaration* "}")? * ; */ /*package*/ void parseClassBody() { diff --git a/grammar/src/class.grm b/grammar/src/class.grm index 8dbf57426ad..24b906edf93 100644 --- a/grammar/src/class.grm +++ b/grammar/src/class.grm @@ -27,7 +27,7 @@ class classBody - : ("{" memberDeclaration "}")? + : ("{" memberDeclaration* "}")? ; delegationSpecifier diff --git a/grammar/src/enum.grm b/grammar/src/enum.grm index cb16578667e..d8ff1a9366b 100644 --- a/grammar/src/enum.grm +++ b/grammar/src/enum.grm @@ -5,7 +5,7 @@ bq. See [Enum classes] */ enumClassBody - : "{" enumEntry* "}" + : "{" (enumEntry | memberDeclaration)* "}" ; enumEntry