Permalink
Browse files

Removed tuples from PSI tests.

  • Loading branch information...
1 parent ffb67d3 commit 7bfa4a9c092628629f9b721e8d07f55f560aebbf Evgeny Gerashchenko committed Mar 18, 2013
@@ -1,24 +1,24 @@
type f = ([a] a) -> b
type f = (a) -> b
type f = () -> [x] b
-type f = () -> #()
+type f = () -> Unit
type f = (a : [a] a) -> b
type f = (a : a) -> b
type f = () -> b
-type f = () -> #()
+type f = () -> Unit
type f = (a : [a] a, foo, x : bar) -> b
type f = (foo, a : a) -> b
type f = (foo, a : (a) -> b) -> b
-type f = (foo, a : (a) -> b) -> () -> #()
+type f = (foo, a : (a) -> b) -> () -> Unit
-//type f = (ref foo, ref a : (ref a) -> b) -> () -> #()
+//type f = (ref foo, ref a : (ref a) -> b) -> () -> Unit
-type f = T.() -> #()
-type f = T.T.() -> #()
-type f = T<A, B>.T<x>.() -> #()
+type f = T.() -> Unit
+type f = T.T.() -> Unit
+type f = T<A, B>.T<x>.() -> Unit
-type f = [a] T.() -> #()
-type f = [a] T.T.() -> #()
-type f = [a] T<A, B>.T<x>.() -> #()
+type f = [a] T.() -> Unit
+type f = [a] T.T.() -> Unit
+type f = [a] T<A, B>.T<x>.() -> Unit
@@ -116,10 +116,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
@@ -233,10 +232,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
@@ -441,12 +439,11 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
- PsiComment(EOL_COMMENT)('//type f = (ref foo, ref a : (ref a) -> b) -> () -> #()')
+ PsiComment(EOL_COMMENT)('//type f = (ref foo, ref a : (ref a) -> b) -> () -> Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
@@ -472,10 +469,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
@@ -505,10 +501,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
@@ -561,10 +556,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
@@ -600,10 +594,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
@@ -643,10 +636,9 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
@@ -709,7 +701,6 @@ JetFile: FunctionTypes.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
@@ -6,6 +6,6 @@ fun foo() {
out val foo = 5
[a] var foo = 4
- type f = T.() -> #()
+ type f = T.() -> Unit
}
@@ -124,9 +124,8 @@ JetFile: LocalDeclarations.jet
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
- TUPLE_TYPE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ USER_TYPE
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
@@ -1,6 +1,5 @@
-
fun a(
- a : foo = #(),
+ a : foo = Unit.VALUE,
a : foo = 10,
a : foo = 0x10,
a : foo = '1',
@@ -17,7 +16,7 @@ fun a(
a : foo = this,
a : foo = super<sdf>,
a : foo = (10),
- a : foo = #(10, "A", 0xf),
+ a : foo = Triple(10, "A", 0xf),
a : foo = Foo(bar),
a : foo = Foo<A>(bar),
a : foo = Foo(),
@@ -20,10 +20,12 @@ JetFile: SimpleExpressions.jet
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
- TUPLE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- PsiElement(RPAR)(')')
+ DOT_QUALIFIED_EXPRESSION
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Unit')
+ PsiElement(DOT)('.')
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('VALUE')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
@@ -327,23 +329,28 @@ JetFile: SimpleExpressions.jet
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
- TUPLE
- PsiElement(HASH)('#')
- PsiElement(LPAR)('(')
- INTEGER_CONSTANT
- PsiElement(INTEGER_LITERAL)('10')
- PsiElement(COMMA)(',')
- PsiWhiteSpace(' ')
- STRING_TEMPLATE
- PsiElement(OPEN_QUOTE)('"')
- LITERAL_STRING_TEMPLATE_ENTRY
- PsiElement(REGULAR_STRING_PART)('A')
- PsiElement(CLOSING_QUOTE)('"')
- PsiElement(COMMA)(',')
- PsiWhiteSpace(' ')
- INTEGER_CONSTANT
- PsiElement(INTEGER_LITERAL)('0xf')
- PsiElement(RPAR)(')')
+ CALL_EXPRESSION
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('Triple')
+ VALUE_ARGUMENT_LIST
+ PsiElement(LPAR)('(')
+ VALUE_ARGUMENT
+ INTEGER_CONSTANT
+ PsiElement(INTEGER_LITERAL)('10')
+ PsiElement(COMMA)(',')
+ PsiWhiteSpace(' ')
+ VALUE_ARGUMENT
+ STRING_TEMPLATE
+ PsiElement(OPEN_QUOTE)('"')
+ LITERAL_STRING_TEMPLATE_ENTRY
+ PsiElement(REGULAR_STRING_PART)('A')
+ PsiElement(CLOSING_QUOTE)('"')
+ PsiElement(COMMA)(',')
+ PsiWhiteSpace(' ')
+ VALUE_ARGUMENT
+ INTEGER_CONSTANT
+ PsiElement(INTEGER_LITERAL)('0xf')
+ PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
@@ -1,10 +0,0 @@
-class F(
- a : #(),
- x : #(X),
- b : #(A, B),
- c : #(x : Int, y : Int),
- a : [x] #(),
- x : [x]#([x] X),
- b : [x] #([x] A, [x]B),
- c : [x] #(x : [x] Int, y : [x] Int)
- )
Oops, something went wrong.

0 comments on commit 7bfa4a9

Please sign in to comment.