Grammar for property declarations fixed

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java

@@ -799,10 +799,14 @@ public class JetParsing extends AbstractJetParsing {
     }
 
     /*
+     * variableDeclarationEntry
+     *   : SimpleName (":" type)?
+     *   ;
+     *
      * property
      *   : modifiers ("val" | "var")
-     *       typeParameters? (type "." | attributes)?
-     *       (SimpleName (":" type)?){","}
+     *       typeParameters? (type "." | annotations)?
+     *       ("(" variableDeclarationEntry{","} ")" | variableDeclarationEntry)
      *       typeConstraints
      *       ("=" element SEMI?)?
      *       (getter? setter? | setter? getter?) SEMI?

grammar/src/class_members.grm

@@ -81,10 +81,14 @@ functionBody
   : "=" expression
   ;
 
+variableDeclarationEntry
+  : SimpleName (":" type)?
+  ;
+
 property
   : modifiers ("val" | "var")
       typeParameters? (type "." | annotations)?
-      (SimpleName (":" type)?){","}
+      ("(" variableDeclarationEntry{","} ")" | variableDeclarationEntry)
       typeConstraints
       ("=" expression SEMI?)?
       (getter? setter? | setter? getter?) SEMI?