rename PSI classes according to current terminology:

KtMultiDeclaration(Entry) -> KtDestructuringDeclaration(Entry)
KtFunctionLiteralExpression -> KtLambdaExpression
KtFunctionLiteralArgument -> KtLambdaArgument
KtDelegationSpecifierList -> KtSuperTypeList
KtDelegationSpecifier -> KtSuperTypeListEntry
KtDelegatorToSuperClass -> KtSuperTypeEntry
KtDelegatorToSuperCall -> KtSuperTypeCallEntry
KtDelegationByExpressionSpecifier ->KtDelegatedSuperTypeEntry
This commit is contained in:
Dmitry Jemerov
2015-12-09 19:30:38 +01:00
parent ef4b3c99f4
commit 009e3f9cd7
302 changed files with 1375 additions and 1391 deletions
+5 -5
View File
@@ -110,8 +110,8 @@ JetFile: TypeAnnotations.kt
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
SUPER_TYPE_LIST
SUPER_TYPE_ENTRY
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
@@ -129,7 +129,7 @@ JetFile: TypeAnnotations.kt
PsiElement(IDENTIFIER)('B')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_BY
DELEGATED_SUPER_TYPE_ENTRY
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
@@ -159,7 +159,7 @@ JetFile: TypeAnnotations.kt
PsiElement(IDENTIFIER)('F')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL
SUPER_TYPE_CALL_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
ANNOTATION
@@ -181,7 +181,7 @@ JetFile: TypeAnnotations.kt
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CLASS
SUPER_TYPE_ENTRY
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
@@ -26,7 +26,7 @@ JetFile: annotationValueArgumentsAmbiguity.kt
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace(' ')
@@ -75,7 +75,7 @@ JetFile: annotationValueArgumentsAmbiguity.kt
PsiWhiteSpace(' ')
PARENTHESIZED
PsiElement(LPAR)('(')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace(' ')
+3 -3
View File
@@ -43,7 +43,7 @@ JetFile: enumEntries.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('X')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
SUPER_TYPE_CALL_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
@@ -66,7 +66,7 @@ JetFile: enumEntries.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Y')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
SUPER_TYPE_CALL_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
@@ -98,7 +98,7 @@ JetFile: enumEntries.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Z')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
SUPER_TYPE_CALL_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
+2 -2
View File
@@ -64,8 +64,8 @@ JetFile: primaryConstructor.kt
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
SUPER_TYPE_LIST
SUPER_TYPE_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
+1 -1
View File
@@ -351,7 +351,7 @@ JetFile: validExpressions.kt
LABEL
PsiElement(IDENTIFIER)('l')
PsiElement(AT)('@')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
+12 -12
View File
@@ -93,13 +93,13 @@ JetFile: forParameters.kt
PsiElement(for)('for')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
@@ -143,9 +143,9 @@ JetFile: forParameters.kt
PsiElement(for)('for')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
@@ -161,7 +161,7 @@ JetFile: forParameters.kt
<empty list>
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
@@ -253,7 +253,7 @@ JetFile: forParameters.kt
PsiElement(for)('for')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -267,11 +267,11 @@ JetFile: forParameters.kt
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -377,7 +377,7 @@ JetFile: forParameters.kt
PsiElement(for)('for')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
@@ -392,11 +392,11 @@ JetFile: forParameters.kt
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
+14 -14
View File
@@ -18,7 +18,7 @@ JetFile: lambda.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -28,7 +28,7 @@ JetFile: lambda.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -56,8 +56,8 @@ JetFile: lambda.kt
PsiElement(IDENTIFIER)('ann')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
FUNCTION_LITERAL_EXPRESSION
LAMBDA_ARGUMENT
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace(' ')
@@ -80,7 +80,7 @@ JetFile: lambda.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -101,7 +101,7 @@ JetFile: lambda.kt
PsiElement(IDENTIFIER)('ann')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -125,7 +125,7 @@ JetFile: lambda.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -135,7 +135,7 @@ JetFile: lambda.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -159,7 +159,7 @@ JetFile: lambda.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
@@ -172,7 +172,7 @@ JetFile: lambda.kt
PsiElement(IDENTIFIER)('ann')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -196,7 +196,7 @@ JetFile: lambda.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -217,7 +217,7 @@ JetFile: lambda.kt
PsiElement(IDENTIFIER)('ann')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -249,7 +249,7 @@ JetFile: lambda.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -336,7 +336,7 @@ JetFile: lambda.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
+16 -16
View File
@@ -22,7 +22,7 @@ JetFile: lambdaRecovery.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -43,12 +43,12 @@ JetFile: lambdaRecovery.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
PsiErrorElement:Expected annotation identifier after '@'
PsiElement(AT)('@')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -69,7 +69,7 @@ JetFile: lambdaRecovery.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
PsiErrorElement:Expected annotation identifier after '@'
PsiElement(AT)('@')
@@ -85,7 +85,7 @@ JetFile: lambdaRecovery.kt
PsiElement(IDENTIFIER)('ann')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -113,12 +113,12 @@ JetFile: lambdaRecovery.kt
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
PsiErrorElement:Expected annotation identifier after '@'
PsiElement(AT)('@')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -142,12 +142,12 @@ JetFile: lambdaRecovery.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
PsiErrorElement:Expected annotation identifier after '@'
PsiElement(AT)('@')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -171,7 +171,7 @@ JetFile: lambdaRecovery.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
LAMBDA_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
@@ -183,7 +183,7 @@ JetFile: lambdaRecovery.kt
PsiErrorElement:Expected annotation identifier after '@'
PsiElement(AT)('@')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -210,7 +210,7 @@ JetFile: lambdaRecovery.kt
PsiErrorElement:Expected annotation identifier after '@'
PsiElement(AT)('@')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -241,8 +241,8 @@ JetFile: lambdaRecovery.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
FUNCTION_LITERAL_EXPRESSION
LAMBDA_ARGUMENT
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -300,8 +300,8 @@ JetFile: lambdaRecovery.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
FUNCTION_LITERAL_EXPRESSION
LAMBDA_ARGUMENT
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
@@ -182,8 +182,8 @@ JetFile: newModifiers.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
FUNCTION_LITERAL_EXPRESSION
LAMBDA_ARGUMENT
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
@@ -201,8 +201,8 @@ JetFile: newModifiers.kt
PsiElement(IDENTIFIER)('data')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_ARGUMENT
FUNCTION_LITERAL_EXPRESSION
LAMBDA_ARGUMENT
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
+12 -12
View File
@@ -14,15 +14,15 @@ JetFile: multiDeclaration.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
@@ -55,11 +55,11 @@ JetFile: multiDeclaration.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('pair')
PsiWhiteSpace('\n ')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
@@ -75,7 +75,7 @@ JetFile: multiDeclaration.kt
<empty list>
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
@@ -84,7 +84,7 @@ JetFile: multiDeclaration.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('pair')
PsiWhiteSpace('\n\n ')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -97,7 +97,7 @@ JetFile: multiDeclaration.kt
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -110,7 +110,7 @@ JetFile: multiDeclaration.kt
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
@@ -119,7 +119,7 @@ JetFile: multiDeclaration.kt
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n ')
MULTI_VARIABLE_DECLARATION
DESTRUCTURING_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -132,7 +132,7 @@ JetFile: multiDeclaration.kt
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
@@ -145,7 +145,7 @@ JetFile: multiDeclaration.kt
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
DESTRUCTURING_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('y')
PsiErrorElement:Expecting ')'
<empty list>
@@ -48,7 +48,7 @@ JetFile: oldAnnotationsRecovery.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
LAMBDA_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -28,8 +28,8 @@ JetFile: recovery.kt
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
SUPER_TYPE_LIST
SUPER_TYPE_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION