azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Grammar for property declarations fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-08-21 18:23:16 +04:00
parent 119612fcc2
commit d8e8145954
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+6 -2
View File
@@ -799,10 +799,14 @@ public class JetParsing extends AbstractJetParsing {
} }
/* /*
* variableDeclarationEntry
* : SimpleName (":" type)?
* ;
*
* property * property
* : modifiers ("val" | "var") * : modifiers ("val" | "var")
* typeParameters? (type "." | attributes)? * typeParameters? (type "." | annotations)?
* (SimpleName (":" type)?){","} * ("(" variableDeclarationEntry{","} ")" | variableDeclarationEntry)
* typeConstraints * typeConstraints
* ("=" element SEMI?)? * ("=" element SEMI?)?
* (getter? setter? | setter? getter?) SEMI? * (getter? setter? | setter? getter?) SEMI?
grammar/src/class_members.grm
+5 -1
View File
@@ -81,10 +81,14 @@ functionBody
: "=" expression : "=" expression
; ;
variableDeclarationEntry
: SimpleName (":" type)?
;
property property
: modifiers ("val" | "var") : modifiers ("val" | "var")
typeParameters? (type "." | annotations)? typeParameters? (type "." | annotations)?
(SimpleName (":" type)?){","} ("(" variableDeclarationEntry{","} ")" | variableDeclarationEntry)
typeConstraints typeConstraints
("=" expression SEMI?)? ("=" expression SEMI?)?
(getter? setter? | setter? getter?) SEMI? (getter? setter? | setter? getter?) SEMI?