All tests except for properties are fixed

This commit is contained in:
Andrey Breslav
2010-12-29 15:48:54 +03:00
parent 2305f3c445
commit 9d9ee762e1
5 changed files with 46 additions and 216 deletions
-7
View File
@@ -17,13 +17,6 @@ fun a(
a : foo = this<sdf>, a : foo = this<sdf>,
a : foo = (10), a : foo = (10),
a : foo = (10, "A", 0xf), a : foo = (10, "A", 0xf),
a : foo = [:],
a : foo = [a:b],
a : foo = [a:b,d:c],
a : foo = [a,b,d,c],
a : foo = [],
a : foo = [10],
a : foo = [10..5],
a : foo = typeof(10), a : foo = typeof(10),
a : foo = new Foo(bar), a : foo = new Foo(bar),
a : foo = new Foo<A>(bar), a : foo = new Foo<A>(bar),
-140
View File
@@ -282,146 +282,6 @@ JetFile: SimpleExpressions.jet
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
MAP_LITERAL
PsiElement(LBRACKET)('[')
PsiElement(COLON)(':')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
MAP_LITERAL
PsiElement(LBRACKET)('[')
MAP_LITERAL_ENTRY
PsiElement(IDENTIFIER)('a')
PsiElement(COLON)(':')
PsiElement(IDENTIFIER)('b')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
MAP_LITERAL
PsiElement(LBRACKET)('[')
MAP_LITERAL_ENTRY
PsiElement(IDENTIFIER)('a')
PsiElement(COLON)(':')
PsiElement(IDENTIFIER)('b')
PsiElement(COMMA)(',')
MAP_LITERAL_ENTRY
PsiElement(IDENTIFIER)('d')
PsiElement(COLON)(':')
PsiElement(IDENTIFIER)('c')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
LIST_LITERAL
PsiElement(LBRACKET)('[')
PsiElement(IDENTIFIER)('a')
PsiElement(COMMA)(',')
PsiElement(IDENTIFIER)('b')
PsiElement(COMMA)(',')
PsiElement(IDENTIFIER)('d')
PsiElement(COMMA)(',')
PsiElement(IDENTIFIER)('c')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
LIST_LITERAL
PsiElement(LBRACKET)('[')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
LIST_LITERAL
PsiElement(LBRACKET)('[')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('10')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
RANGE_LITERAL
PsiElement(LBRACKET)('[')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('10')
PsiElement(RANGE)('..')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('5')
PsiElement(RBRACKET)(']')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER VALUE_PARAMETER
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
-9
View File
@@ -91,7 +91,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -110,7 +109,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -120,7 +118,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -139,7 +136,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -150,7 +146,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -163,7 +158,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -181,7 +175,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -197,7 +190,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -215,7 +207,6 @@ JetFile: TupleTypes.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
-9
View File
@@ -88,7 +88,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -107,7 +106,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -117,7 +115,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiErrorElement:Expecting ']' to close an attribute annotation PsiErrorElement:Expecting ']' to close an attribute annotation
@@ -137,7 +134,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -148,7 +144,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -161,7 +156,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -179,7 +173,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -195,7 +188,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -213,7 +205,6 @@ JetFile: TupleTypes_ERR.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
-5
View File
@@ -17,7 +17,6 @@ JetFile: TypeAnnotations.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -25,7 +24,6 @@ JetFile: TypeAnnotations.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('b')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -47,7 +45,6 @@ JetFile: TypeAnnotations.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('b')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -55,7 +52,6 @@ JetFile: TypeAnnotations.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
@@ -68,7 +64,6 @@ JetFile: TypeAnnotations.jet
ATTRIBUTE_ANNOTATION ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
ATTRIBUTE ATTRIBUTE
TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')