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

Redundant node removed

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/JetNodeTypes.java
-1
View File
@@ -47,7 +47,6 @@ public interface JetNodeTypes {
JetNodeType TYPE_ARGUMENT_LIST = new JetNodeType("TYPE_ARGUMENT_LIST", JetTypeArgumentList.class); 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_LIST = new JetNodeType("VALUE_ARGUMENT_LIST", JetArgumentList.class);
JetNodeType VALUE_ARGUMENT = new JetNodeType("VALUE_ARGUMENT", JetArgument.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 TYPE_REFERENCE = new JetNodeType("TYPE_REFERENCE", JetTypeReference.class);
JetNodeType LABELED_TUPLE_ENTRY = new JetNodeType("LABELED_TUPLE_ENTRY"); JetNodeType LABELED_TUPLE_ENTRY = new JetNodeType("LABELED_TUPLE_ENTRY");
JetNodeType TUPLE_TYPE = new JetNodeType("TUPLE_TYPE"); JetNodeType TUPLE_TYPE = new JetNodeType("TUPLE_TYPE");
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+1 -3
View File
@@ -1122,15 +1122,13 @@ public class JetExpressionParsing extends AbstractJetParsing {
*/ */
private void parseValueArgument() { private void parseValueArgument() {
PsiBuilder.Marker argument = mark(); PsiBuilder.Marker argument = mark();
JetNodeType type = VALUE_ARGUMENT;
if (at(IDENTIFIER) && lookahead(1) == EQ) { if (at(IDENTIFIER) && lookahead(1) == EQ) {
advance(); // IDENTIFIER advance(); // IDENTIFIER
advance(); // EQ advance(); // EQ
type = NAMED_ARGUMENT;
} }
if (at(OUT_KEYWORD) || at(REF_KEYWORD)) advance(); // REF or OUT if (at(OUT_KEYWORD) || at(REF_KEYWORD)) advance(); // REF or OUT
parseExpression(); parseExpression();
argument.done(type); argument.done(VALUE_ARGUMENT);
} }
/* /*
idea/testData/psi/BabySteps.txt
+1 -1
View File
@@ -43,7 +43,7 @@ JetFile: BabySteps.jet
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
NAMED_ARGUMENT VALUE_ARGUMENT
PsiElement(IDENTIFIER)('d') PsiElement(IDENTIFIER)('d')
PsiElement(EQ)('=') PsiElement(EQ)('=')
INTEGER_CONSTANT INTEGER_CONSTANT
idea/testData/psi/BabySteps_ERR.txt
+1 -1
View File
@@ -43,7 +43,7 @@ JetFile: BabySteps_ERR.jet
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
NAMED_ARGUMENT VALUE_ARGUMENT
PsiElement(IDENTIFIER)('d') PsiElement(IDENTIFIER)('d')
PsiElement(EQ)('=') PsiElement(EQ)('=')
INTEGER_CONSTANT INTEGER_CONSTANT
idea/testData/psi/examples/UpdateOperation.txt
+2 -2
View File
@@ -168,7 +168,7 @@ JetFile: UpdateOperation.jet
PsiElement(IDENTIFIER)('p') PsiElement(IDENTIFIER)('p')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NAMED_ARGUMENT VALUE_ARGUMENT
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
@@ -198,7 +198,7 @@ JetFile: UpdateOperation.jet
PsiElement(IDENTIFIER)('p1') PsiElement(IDENTIFIER)('p1')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NAMED_ARGUMENT VALUE_ARGUMENT
PsiElement(IDENTIFIER)('y') PsiElement(IDENTIFIER)('y')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')