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

GreatSyntacticShift: Disable complex token merging in type ref parsing, to fulfill kt307.jet test

Browse Source
This commit is contained in:
Andrey Breslav
2011-12-21 11:30:06 +02:00
parent f73b7522b9
commit a3880923e1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+5 -2
View File
@@ -1286,7 +1286,10 @@ public class JetParsing extends AbstractJetParsing {
} }
private PsiBuilder.Marker parseTypeRefContents() { private PsiBuilder.Marker parseTypeRefContents() {
myBuilder.disableJoiningComplexTokens(); // Disabling token merge is required for cases like
// Int?.(Foo) -> Bar
// we don't support this case now
// myBuilder.disableJoiningComplexTokens();
PsiBuilder.Marker typeRefMarker = mark(); PsiBuilder.Marker typeRefMarker = mark();
parseAnnotations(false); parseAnnotations(false);
@@ -1365,7 +1368,7 @@ public class JetParsing extends AbstractJetParsing {
precede.done(FUNCTION_TYPE); precede.done(FUNCTION_TYPE);
} }
myBuilder.restoreJoiningComplexTokensState(); // myBuilder.restoreJoiningComplexTokensState();
return typeRefMarker; return typeRefMarker;
} }
compiler/testData/diagnostics/tests/ShiftFunctionTypes.jet
+2 -2
View File
@@ -25,7 +25,7 @@ abstract class XXX() {
abstract val a14 : n.B.(Int) -> Int abstract val a14 : n.B.(Int) -> Int
abstract val a15 : Int? .(Int) -> Int abstract val a15 : Int? .(Int) -> Int
abstract val a152 : (Int?).(Int) -> Int abstract val a152 : (Int?).(Int) -> Int
abstract val a151 : Int?.(Int) -> Int // abstract val a151 : Int?.(Int) -> Int
abstract val a16 : (Int) -> (Int) -> Int abstract val a16 : (Int) -> (Int) -> Int
abstract val a17 : ((Int) -> Int).(Int) -> Int abstract val a17 : ((Int) -> Int).(Int) -> Int
abstract val a18 : (Int) -> ((Int) -> Int) abstract val a18 : (Int) -> ((Int) -> Int)
@@ -43,7 +43,7 @@ abstract class YYY() {
abstract val a14 : n.B.(a : Int) -> Int abstract val a14 : n.B.(a : Int) -> Int
abstract val a15 : Int? .(a : Int) -> Int abstract val a15 : Int? .(a : Int) -> Int
abstract val a152 : (Int?).(a : Int) -> Int abstract val a152 : (Int?).(a : Int) -> Int
abstract val a151 : Int?.(a : Int) -> Int //abstract val a151 : Int?.(a : Int) -> Int
abstract val a16 : (a : Int) -> (a : Int) -> Int abstract val a16 : (a : Int) -> (a : Int) -> Int
abstract val a17 : ((a : Int) -> Int).(a : Int) -> Int abstract val a17 : ((a : Int) -> Int).(a : Int) -> Int
abstract val a18 : (a : Int) -> ((a : Int) -> Int) abstract val a18 : (a : Int) -> ((a : Int) -> Int)