Removed tuples from PSI tests.

This commit is contained in:
Evgeny Gerashchenko
2013-03-18 22:01:45 +04:00
parent ffb67d3a1f
commit 7bfa4a9c09
22 changed files with 451 additions and 1040 deletions
@@ -2,7 +2,7 @@ type f1 = (T) -> X
// type f1 = {(T) => X}
type f2 = (T, E) -> X
// type f2 = {(T, E) => X}
type f_tuple = (#(T, E)) -> X
type f_tuple = (Pair<T, E>) -> X
//type f_tuple = {((T, E)) => X}
type hof = (X) -> (T) -> Y
//type hof = { (X) => {(T) => Y} }
@@ -16,7 +16,7 @@ type Equality<in T> = (a : T, b : T) -> Boolean
//type Equality<in T> = {(a : T, b : T) => Boolean}
type HashFunction<in T> = (obj : T) -> Int
//type HashFunction<in T> = {(obj : T) => Int}
type Runnable = () -> #()
type Runnable = () -> Unit
//type Runnable = {() => ()}
type Function1<in T, out R> = (input : T) -> R
//type Function1<in T, out R> = {(input : T) => R}
@@ -81,20 +81,24 @@ JetFile: FunctionsAndTypes.jet
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
TUPLE_TYPE
PsiElement(HASH)('#')
PsiElement(LPAR)('(')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('E')
PsiElement(RPAR)(')')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Pair')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('E')
PsiElement(GT)('>')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
@@ -361,10 +365,9 @@ JetFile: FunctionsAndTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
TUPLE_TYPE
PsiElement(HASH)('#')
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
PsiComment(EOL_COMMENT)('//type Runnable = {() => ()}')
PsiWhiteSpace('\n')