Primary constructor parameters supproted properly

2011-03-24 19:50:44 +03:00
parent 120a03ccdc
commit b51653fe74
37 changed files with 272 additions and 219 deletions
@@ -14,14 +14,11 @@ class
  : modifiers "class" SimpleName
      typeParameters?
      "wraps"?
-      primaryConstructorParameters?
+      valueParameters?
      (":" attributes delegationSpecifier{","})?
      (classBody? | enumClassBody)
  ;

-primaryConstructorParameters
-  : "(" primaryConstructorParameter{","} ")"
-  ;

 typeParameters
  : "<" typeParameter{","} ">"
@@ -48,8 +45,4 @@ typeParameter
 typeConstraint
  : userType ":" type
  : "class" "object" userType ":" type
-  ;
-
-primaryConstructorParameter
-  : modifiers ("val" | "var")? functionParameterRest
  ;
@@ -54,11 +54,7 @@ functionParameters
  ;

 functionParameter
-  : modifiers functionParameterRest
-  ;
-
-functionParameterRest
-  : parameter ("=" expression)?
+  : modifiers ("val" | "var")? parameter ("=" expression)?
  ;

 initializer