diff --git a/grammar/src/class_members.grm b/grammar/src/class_members.grm index 50d2f184201..65879261bd5 100644 --- a/grammar/src/class_members.grm +++ b/grammar/src/class_members.grm @@ -109,6 +109,7 @@ parameter object : "object" SimpleName primaryConstructor? (":" delegationSpecifier{","})? classBody? + ; secondaryConstructor : modifiers "constructor" valueParameters (":" constructorDelegationCall)? block diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm index 7eb964e7c42..5a6df79262f 100644 --- a/grammar/src/expressions.grm +++ b/grammar/src/expressions.grm @@ -230,6 +230,7 @@ callSuffix annotatedLambda : ("@" unescapedAnnotation)* labelDefinition? functionLiteral + ; memberAccessOperation : "." : "?." : "?" diff --git a/grammar/src/lexical.grm b/grammar/src/lexical.grm index 7f691bd7104..ce31d2586ef 100644 --- a/grammar/src/lexical.grm +++ b/grammar/src/lexical.grm @@ -4,7 +4,8 @@ [helper] Digit - : ["0".."9"]; + : ["0".."9"] + ; IntegerLiteral : Digit @@ -12,11 +13,13 @@ IntegerLiteral ; FloatLiteral - : ; + : + ; [helper] HexDigit - : Digit | ["A".."F", "a".."f"]; + : Digit | ["A".."F", "a".."f"] + ; HexadecimalLiteral : "0x" HexDigit @@ -24,37 +27,44 @@ HexadecimalLiteral ; CharacterLiteral - : ; + : + ; /** See [Basic types](basic-types.html) */ NoEscapeString - : <"""-quoted string>; + : <"""-quoted string> + ; RegularStringPart : + ; ShortTemplateEntryStart : "$" + ; EscapeSequence : UnicodeEscapeSequence | RegularEscapeSequence + ; UnicodeEscapeSequence : "\u" HexDigit{4} + ; RegularEscapeSequence : "\" + ; /** See [String templates](basic-types.html#templates) */ SEMI - : ; - + : + ; SimpleName : @@ -66,7 +76,8 @@ See [Java interoperability](java-interop.html) */ LabelName - : "@" SimpleName; + : "@" SimpleName + ; /** See [Returns and jumps](returns.html) diff --git a/grammar/src/toplevel.grm b/grammar/src/toplevel.grm index a2c92503a58..57b8cb37bd2 100644 --- a/grammar/src/toplevel.grm +++ b/grammar/src/toplevel.grm @@ -4,7 +4,6 @@ Relevant pages: [Packages](packages.html) */ - [start] kotlinFile : preamble topLevelObject*