This commit is contained in:
Andrey Breslav
2011-01-14 21:42:48 +03:00
parent 8d83b866a4
commit 78cc7fdc0d
3 changed files with 4 additions and 5 deletions
+2 -3
View File
@@ -25,7 +25,7 @@ primaryConstructorParameters
typeParameters typeParameters
: "<" typeParameter{","} ">" : "<" typeParameter{","} ">"
("where" typeConstraint{","})? // TODO: Syntax is questionable ("where" typeConstraint{","})?
; ;
classBody classBody
@@ -38,7 +38,7 @@ delegationSpecifier
; ;
explicitDelegation explicitDelegation
: userType "by" expression // internal this expression no foo {bar} is allowed // TODO: Syntax is questionable : userType "by" expression // internal this expression no foo {bar} is allowed
; ;
typeParameter typeParameter
@@ -48,7 +48,6 @@ typeParameter
typeConstraint typeConstraint
: userType ":" type : userType ":" type
: "class" "object" userType ":" type : "class" "object" userType ":" type
// TODO: other constraints, maybe
; ;
primaryConstructorParameter primaryConstructorParameter
+1 -1
View File
@@ -96,7 +96,7 @@ getter
; ;
setter setter
: modifiers "set" "(" modifiers (SimpleName | parameter) ")" functionBody // TODO: Can the parameter be lazy? : modifiers "set" "(" modifiers (SimpleName | parameter) ")" functionBody
; ;
parameter parameter
+1 -1
View File
@@ -86,7 +86,7 @@ atomicExpression
: when : when
: try : try
: "typeof" "(" expression ")" : "typeof" "(" expression ")"
: "new" constructorInvocation // TODO: Do we need "new"?, see factory methods : "new" constructorInvocation
: objectLiteral : objectLiteral
: declaration : declaration
: jump : jump