Redundant node removed

This commit is contained in:
Maxim Shafirov
2011-01-10 01:51:22 +03:00
parent 673a67b97b
commit 5311c7511b
5 changed files with 5 additions and 8 deletions
@@ -47,7 +47,6 @@ public interface JetNodeTypes {
JetNodeType TYPE_ARGUMENT_LIST = new JetNodeType("TYPE_ARGUMENT_LIST", JetTypeArgumentList.class);
JetNodeType VALUE_ARGUMENT_LIST = new JetNodeType("VALUE_ARGUMENT_LIST", JetArgumentList.class);
JetNodeType VALUE_ARGUMENT = new JetNodeType("VALUE_ARGUMENT", JetArgument.class);
JetNodeType NAMED_ARGUMENT = new JetNodeType("NAMED_ARGUMENT");
JetNodeType TYPE_REFERENCE = new JetNodeType("TYPE_REFERENCE", JetTypeReference.class);
JetNodeType LABELED_TUPLE_ENTRY = new JetNodeType("LABELED_TUPLE_ENTRY");
JetNodeType TUPLE_TYPE = new JetNodeType("TUPLE_TYPE");
@@ -1122,15 +1122,13 @@ public class JetExpressionParsing extends AbstractJetParsing {
*/
private void parseValueArgument() {
PsiBuilder.Marker argument = mark();
JetNodeType type = VALUE_ARGUMENT;
if (at(IDENTIFIER) && lookahead(1) == EQ) {
advance(); // IDENTIFIER
advance(); // EQ
type = NAMED_ARGUMENT;
}
if (at(OUT_KEYWORD) || at(REF_KEYWORD)) advance(); // REF or OUT
parseExpression();
argument.done(type);
argument.done(VALUE_ARGUMENT);
}
/*
+1 -1
View File
@@ -43,7 +43,7 @@ JetFile: BabySteps.jet
PsiElement(IDENTIFIER)('foo')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
NAMED_ARGUMENT
VALUE_ARGUMENT
PsiElement(IDENTIFIER)('d')
PsiElement(EQ)('=')
INTEGER_CONSTANT
+1 -1
View File
@@ -43,7 +43,7 @@ JetFile: BabySteps_ERR.jet
PsiElement(IDENTIFIER)('foo')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
NAMED_ARGUMENT
VALUE_ARGUMENT
PsiElement(IDENTIFIER)('d')
PsiElement(EQ)('=')
INTEGER_CONSTANT
@@ -168,7 +168,7 @@ JetFile: UpdateOperation.jet
PsiElement(IDENTIFIER)('p')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
NAMED_ARGUMENT
VALUE_ARGUMENT
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
@@ -198,7 +198,7 @@ JetFile: UpdateOperation.jet
PsiElement(IDENTIFIER)('p1')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
NAMED_ARGUMENT
VALUE_ARGUMENT
PsiElement(IDENTIFIER)('y')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')