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

JET-172 Allow many parameters of a function literals to be declared without parentheses

Browse Source
This commit is contained in:
Andrey Breslav
2011-07-06 20:21:22 +04:00
parent d1b8a6b5c7
commit 900143af5b
7 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grammar/src/expressions.grm
+1 -1
View File
@@ -245,7 +245,7 @@ tupleLiteral
// one can use "it" as a parameter name
functionLiteral
: "{" statements "}"
: "{" (type ".")? modifiers SimpleName "=>" statements "}"
: "{" (modifiers SimpleName){","} "=>" statements "}"
: "{" (type ".")? "(" (modifiers SimpleName (":" type)?){","} ")" (":" type)? "=>" statements "}"
;
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+24 -14
View File
@@ -987,7 +987,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
/*
* functionLiteral // one can use "it" as a parameter name
* : "{" expressions "}"
* : "{" (type ".")? modifiers SimpleName "=>" expressions "}"
* : "{" (modifiers SimpleName){","} "=>" statements "}"
* : "{" (type ".")? "(" (modifiers SimpleName (":" type)?){","} ")" (":" type)? "=>" expressions "}"
* ;
*/
@@ -1038,27 +1038,37 @@ public class JetExpressionParsing extends AbstractJetParsing {
advance(); // COLON
if (at(DOUBLE_ARROW)) {
error("Expecting a type");
} else {
}
else {
myJetParsing.parseTypeRef();
}
}
} else if (!dontExpectParameters) {
}
else if (!dontExpectParameters) {
PsiBuilder.Marker parameterList = mark();
PsiBuilder.Marker parameter = mark();
int parameterNamePos = matchTokenStreamPredicate(new LastBefore(new At(IDENTIFIER), new AtOffset(doubleArrowPos)));
createTruncatedBuilder(parameterNamePos).parseModifierList(MODIFIER_LIST);
while (!eof()) {
PsiBuilder.Marker parameter = mark();
int parameterNamePos = matchTokenStreamPredicate(new LastBefore(new At(IDENTIFIER), new AtOffset(doubleArrowPos)));
expect(IDENTIFIER, "Expecting parameter name", TokenSet.create(DOUBLE_ARROW));
createTruncatedBuilder(parameterNamePos).parseModifierList(MODIFIER_LIST);
parameter.done(VALUE_PARAMETER);
expect(IDENTIFIER, "Expecting parameter name", TokenSet.create(DOUBLE_ARROW));
if (at(COLON)) {
errorUntilOffset("To specify a type of a parameter or a return type, use the full notation: {(parameter : Type) : ReturnType => ...}", doubleArrowPos);
} else if (at(COMMA)) {
errorUntilOffset("To specify many parameters, use the full notation: {(p1, p2, ...) => ...}", doubleArrowPos);
} else if (!at(DOUBLE_ARROW)) {
errorUntilOffset("Expecting '=>'", doubleArrowPos);
parameter.done(VALUE_PARAMETER);
if (at(COLON)) {
errorUntilOffset("To specify a type of a parameter or a return type, use the full notation: {(parameter : Type) : ReturnType => ...}", doubleArrowPos);
}
else if (at(DOUBLE_ARROW)) {
break;
}
else if (!at(COMMA)) {
errorUntilOffset("Expecting '=>' or ','", doubleArrowPos);
}
else {
advance(); // COMMA
}
}
parameterList.done(VALUE_PARAMETER_LIST);
idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
+3 -1
View File
@@ -77,7 +77,9 @@ public class JetPsiChecker implements Annotator {
if (!redeclarations.add(redeclaration)) return;
PsiElement declarationPsiElement = bindingContext.getDeclarationPsiElement(redeclaration);
if (declarationPsiElement instanceof JetNamedDeclaration) {
holder.createErrorAnnotation(((JetNamedDeclaration) declarationPsiElement).getNameIdentifier(), "Redeclaration");
PsiElement nameIdentifier = ((JetNamedDeclaration) declarationPsiElement).getNameIdentifier();
assert nameIdentifier != null : declarationPsiElement.getText() + " has nameIdentifier 'null'";
holder.createErrorAnnotation(nameIdentifier, "Redeclaration");
}
else if (declarationPsiElement != null) {
holder.createErrorAnnotation(declarationPsiElement, "Redeclaration");
idea/testData/psi/FunctionLiterals.jet
+2
View File
@@ -24,4 +24,6 @@ fun foo() {
{T.(a : A) => a}
{T.(a : A) : T => a}
{T.(a) : T => a}
{x, y => 1}
}
idea/testData/psi/FunctionLiterals.txt
+18
View File
@@ -435,5 +435,23 @@ JetFile: FunctionLiterals.jet
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUNCTION_LITERAL_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
VALUE_PARAMETER_LIST
VALUE_PARAMETER
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('y')
PsiWhiteSpace(' ')
PsiElement(DOUBLE_ARROW)('=>')
PsiWhiteSpace(' ')
BLOCK
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
idea/testData/psi/FunctionLiterals_ERR.jet
-1
View File
@@ -1,6 +1,5 @@
fun foo() {
{ => a}
{a, b => a}
{(a => a}
{(a : ) => a}
idea/testData/psi/FunctionLiterals_ERR.txt
+4 -19
View File
@@ -25,24 +25,6 @@ JetFile: FunctionLiterals_ERR.jet
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
FUNCTION_LITERAL_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
VALUE_PARAMETER_LIST
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiErrorElement:To specify many parameters, use the full notation: {(p1, p2, ...) => ...}
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace(' ')
PsiElement(DOUBLE_ARROW)('=>')
PsiWhiteSpace(' ')
BLOCK
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUNCTION_LITERAL_EXPRESSION
FUNCTION_LITERAL
@@ -297,7 +279,10 @@ JetFile: FunctionLiterals_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace(' ')
PsiWhiteSpace(' ')
VALUE_PARAMETER
PsiErrorElement:Expecting parameter name
<empty list>
PsiElement(DOUBLE_ARROW)('=>')
PsiWhiteSpace(' ')
BLOCK