Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
0e63fa37
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0e63fa37
编写于
5月 04, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Renamed Attribute into Annotation
上级
8c8f1eb4
变更
37
显示空白变更内容
内联
并排
Showing
37 changed file
with
140 addition
and
140 deletion
+140
-140
idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
...rc/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+7
-7
idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
...g/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
+14
-14
idea/src/org/jetbrains/jet/lang/resolve/LazySubstitutingClassDescriptor.java
...ins/jet/lang/resolve/LazySubstitutingClassDescriptor.java
+1
-1
idea/src/org/jetbrains/jet/lang/resolve/MutableDeclarationDescriptor.java
...brains/jet/lang/resolve/MutableDeclarationDescriptor.java
+2
-2
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+1
-1
idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+8
-8
idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
...etbrains/jet/lang/resolve/java/JavaClassMembersScope.java
+1
-1
idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+8
-8
idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
.../jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/Annotated.java
idea/src/org/jetbrains/jet/lang/types/Annotated.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java
idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java
+5
-5
idea/src/org/jetbrains/jet/lang/types/Annotation.java
idea/src/org/jetbrains/jet/lang/types/Annotation.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java
...src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java
+3
-3
idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java
...g/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java
+5
-5
idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java
...g/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java
idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java
+8
-8
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java
.../org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java
+5
-5
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java
.../org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java
.../src/org/jetbrains/jet/lang/types/JetStandardClasses.java
+21
-21
idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
.../src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java
idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
+4
-4
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/LocalVariableDescriptor.java
...org/jetbrains/jet/lang/types/LocalVariableDescriptor.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java
idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java
...src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/NamespaceType.java
idea/src/org/jetbrains/jet/lang/types/NamespaceType.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/PropertyAccessorDescriptor.java
.../jetbrains/jet/lang/types/PropertyAccessorDescriptor.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/PropertyDescriptor.java
.../src/org/jetbrains/jet/lang/types/PropertyDescriptor.java
+3
-3
idea/src/org/jetbrains/jet/lang/types/PropertyGetterDescriptor.java
...rg/jetbrains/jet/lang/types/PropertyGetterDescriptor.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/PropertySetterDescriptor.java
...rg/jetbrains/jet/lang/types/PropertySetterDescriptor.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java
...src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java
+2
-2
idea/src/org/jetbrains/jet/lang/types/TypeParameterDescriptor.java
...org/jetbrains/jet/lang/types/TypeParameterDescriptor.java
+6
-6
idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java
idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
+5
-5
idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptorImpl.java
...etbrains/jet/lang/types/ValueParameterDescriptorImpl.java
+4
-4
idea/src/org/jetbrains/jet/lang/types/VariableDescriptorImpl.java
.../org/jetbrains/jet/lang/types/VariableDescriptorImpl.java
+2
-2
未找到文件。
idea/src/org/jetbrains/jet/lang/resolve/A
ttribute
Resolver.java
→
idea/src/org/jetbrains/jet/lang/resolve/A
nnotation
Resolver.java
浏览文件 @
0e63fa37
...
...
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.jet.lang.psi.JetAttribute
;
import
org.jetbrains.jet.lang.psi.JetModifierList
;
import
org.jetbrains.jet.lang.types.A
ttribute
;
import
org.jetbrains.jet.lang.types.A
nnotation
;
import
java.util.Collections
;
import
java.util.List
;
...
...
@@ -12,13 +12,13 @@ import java.util.List;
/**
* @author abreslav
*/
public
class
A
ttribute
Resolver
{
public
static
final
A
ttributeResolver
INSTANCE
=
new
Attribute
Resolver
();
public
class
A
nnotation
Resolver
{
public
static
final
A
nnotationResolver
INSTANCE
=
new
Annotation
Resolver
();
private
A
ttribute
Resolver
()
{}
private
A
nnotation
Resolver
()
{}
@NotNull
public
List
<
A
ttribute
>
resolveAttribute
s
(
@NotNull
List
<
JetAttribute
>
attributeElements
)
{
public
List
<
A
nnotation
>
resolveAnnotation
s
(
@NotNull
List
<
JetAttribute
>
attributeElements
)
{
return
Collections
.
emptyList
();
// TODO
// if (attributeElements.isEmpty()) {
// }
...
...
@@ -26,10 +26,10 @@ public class AttributeResolver {
}
@NotNull
public
List
<
A
ttribute
>
resolveAttribute
s
(
@Nullable
JetModifierList
modifierList
)
{
public
List
<
A
nnotation
>
resolveAnnotation
s
(
@Nullable
JetModifierList
modifierList
)
{
if
(
modifierList
==
null
)
{
return
Collections
.
emptyList
();
}
return
resolveA
ttribute
s
(
modifierList
.
getAttributes
());
return
resolveA
nnotation
s
(
modifierList
.
getAttributes
());
}
}
idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
浏览文件 @
0e63fa37
...
...
@@ -35,7 +35,7 @@ public class ClassDescriptorResolver {
public
ClassDescriptor
resolveClassDescriptor
(
@NotNull
JetScope
scope
,
@NotNull
JetClass
classElement
)
{
ClassDescriptorImpl
classDescriptor
=
new
ClassDescriptorImpl
(
scope
.
getContainingDeclaration
(),
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
classElement
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
classElement
.
getModifierList
()),
JetPsiUtil
.
safeName
(
classElement
.
getName
()));
trace
.
recordDeclarationResolution
(
classElement
,
classDescriptor
);
...
...
@@ -86,7 +86,7 @@ public class ClassDescriptorResolver {
List
<
JetType
>
supertypes
=
new
ArrayList
<
JetType
>();
TypeConstructorImpl
typeConstructor
=
new
TypeConstructorImpl
(
descriptor
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
classElement
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
classElement
.
getModifierList
()),
!
open
,
JetPsiUtil
.
safeName
(
classElement
.
getName
()),
typeParameters
,
...
...
@@ -163,7 +163,7 @@ public class ClassDescriptorResolver {
public
FunctionDescriptorImpl
resolveFunctionDescriptor
(
DeclarationDescriptor
containingDescriptor
,
JetScope
scope
,
JetFunction
function
)
{
FunctionDescriptorImpl
functionDescriptor
=
new
FunctionDescriptorImpl
(
containingDescriptor
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
function
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
function
.
getModifierList
()),
JetPsiUtil
.
safeName
(
function
.
getName
())
);
WritableScope
innerScope
=
semanticServices
.
createWritableScope
(
scope
,
functionDescriptor
);
...
...
@@ -220,7 +220,7 @@ public class ClassDescriptorResolver {
MutableValueParameterDescriptor
valueParameterDescriptor
=
new
ValueParameterDescriptorImpl
(
declarationDescriptor
,
index
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
valueParameter
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
valueParameter
.
getModifierList
()),
JetPsiUtil
.
safeName
(
valueParameter
.
getName
()),
valueParameter
.
isMutable
()
?
type
:
null
,
type
,
...
...
@@ -250,7 +250,7 @@ public class ClassDescriptorResolver {
:
typeResolver
.
resolveType
(
extensibleScope
,
extendsBound
);
TypeParameterDescriptor
typeParameterDescriptor
=
new
TypeParameterDescriptor
(
containingDescriptor
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
typeParameter
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
typeParameter
.
getModifierList
()),
typeParameter
.
getVariance
(),
JetPsiUtil
.
safeName
(
typeParameter
.
getName
()),
Collections
.
singleton
(
bound
),
...
...
@@ -300,7 +300,7 @@ public class ClassDescriptorResolver {
public
VariableDescriptor
resolveLocalVariableDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
JetParameter
parameter
,
@NotNull
JetType
type
)
{
VariableDescriptor
variableDescriptor
=
new
LocalVariableDescriptor
(
containingDeclaration
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
parameter
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
parameter
.
getModifierList
()),
JetPsiUtil
.
safeName
(
parameter
.
getName
()),
type
,
parameter
.
isMutable
());
...
...
@@ -314,7 +314,7 @@ public class ClassDescriptorResolver {
VariableDescriptorImpl
variableDescriptor
=
new
LocalVariableDescriptor
(
containingDeclaration
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
property
.
getModifierList
()),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
property
.
getModifierList
()),
JetPsiUtil
.
safeName
(
property
.
getName
()),
type
,
property
.
isVar
());
...
...
@@ -330,7 +330,7 @@ public class ClassDescriptorResolver {
JetModifierList
modifierList
=
property
.
getModifierList
();
PropertyDescriptor
propertyDescriptor
=
new
PropertyDescriptor
(
containingDeclaration
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
modifierList
),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
modifierList
),
resolveModifiers
(
modifierList
,
DEFAULT_MODIFIERS
),
// TODO : default modifiers differ in different contexts
isVar
,
JetPsiUtil
.
safeName
(
property
.
getName
()),
...
...
@@ -364,10 +364,10 @@ public class ClassDescriptorResolver {
}
PropertySetterDescriptor
setterDescriptor
=
null
;
if
(
setter
!=
null
)
{
List
<
A
ttribute
>
attributes
=
AttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
setter
.
getModifierList
());
List
<
A
nnotation
>
annotations
=
AnnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
setter
.
getModifierList
());
JetParameter
parameter
=
setter
.
getParameter
();
setterDescriptor
=
new
PropertySetterDescriptor
(
propertyDescriptor
,
a
ttribute
s
,
setter
.
getBodyExpression
()
!=
null
);
setterDescriptor
=
new
PropertySetterDescriptor
(
propertyDescriptor
,
a
nnotation
s
,
setter
.
getBodyExpression
()
!=
null
);
if
(
parameter
!=
null
)
{
if
(
parameter
.
isRef
())
{
semanticServices
.
getErrorHandler
().
genericError
(
parameter
.
getRefNode
(),
"Setter parameters can not be 'ref'"
);
...
...
@@ -410,7 +410,7 @@ public class ClassDescriptorResolver {
PropertyGetterDescriptor
getterDescriptor
=
null
;
JetPropertyAccessor
getter
=
property
.
getGetter
();
if
(
getter
!=
null
)
{
List
<
A
ttribute
>
attributes
=
AttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
getter
.
getModifierList
());
List
<
A
nnotation
>
annotations
=
AnnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
getter
.
getModifierList
());
JetType
returnType
=
null
;
JetTypeReference
returnTypeReference
=
getter
.
getReturnTypeReference
();
...
...
@@ -418,7 +418,7 @@ public class ClassDescriptorResolver {
returnType
=
typeResolver
.
resolveType
(
scope
,
returnTypeReference
);
}
getterDescriptor
=
new
PropertyGetterDescriptor
(
propertyDescriptor
,
a
ttribute
s
,
returnType
,
getter
.
getBodyExpression
()
!=
null
);
getterDescriptor
=
new
PropertyGetterDescriptor
(
propertyDescriptor
,
a
nnotation
s
,
returnType
,
getter
.
getBodyExpression
()
!=
null
);
trace
.
recordDeclarationResolution
(
getter
,
getterDescriptor
);
}
return
getterDescriptor
;
...
...
@@ -460,7 +460,7 @@ public class ClassDescriptorResolver {
@NotNull
List
<
JetParameter
>
valueParameters
)
{
ConstructorDescriptorImpl
constructorDescriptor
=
new
ConstructorDescriptorImpl
(
classDescriptor
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
modifierList
),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
modifierList
),
isPrimary
);
trace
.
recordDeclarationResolution
(
declarationToTrace
,
constructorDescriptor
);
...
...
@@ -502,7 +502,7 @@ public class ClassDescriptorResolver {
PropertyDescriptor
propertyDescriptor
=
new
PropertyDescriptor
(
classDescriptor
,
A
ttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
modifierList
),
A
nnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
modifierList
),
resolveModifiers
(
modifierList
,
DEFAULT_MODIFIERS
),
isMutable
,
name
==
null
?
"<no name>"
:
name
,
...
...
idea/src/org/jetbrains/jet/lang/resolve/LazySubstitutingClassDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -60,7 +60,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
}
@Override
public
List
<
A
ttribute
>
getAttribute
s
()
{
public
List
<
A
nnotation
>
getAnnotation
s
()
{
throw
new
UnsupportedOperationException
();
// TODO
}
...
...
idea/src/org/jetbrains/jet/lang/resolve/MutableDeclarationDescriptor.java
浏览文件 @
0e63fa37
package
org.jetbrains.jet.lang.resolve
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.types.A
ttribute
;
import
org.jetbrains.jet.lang.types.A
nnotation
;
import
org.jetbrains.jet.lang.types.DeclarationDescriptor
;
import
org.jetbrains.jet.lang.types.DeclarationDescriptorVisitor
;
...
...
@@ -19,7 +19,7 @@ public abstract class MutableDeclarationDescriptor implements DeclarationDescrip
}
@Override
public
List
<
A
ttribute
>
getAttribute
s
()
{
public
List
<
A
nnotation
>
getAnnotation
s
()
{
throw
new
UnsupportedOperationException
();
// TODO
}
...
...
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
浏览文件 @
0e63fa37
...
...
@@ -119,7 +119,7 @@ public class TopDownAnalyzer {
if
(
namespaceDescriptor
==
null
)
{
namespaceDescriptor
=
new
NamespaceDescriptor
(
declaringScope
.
getContainingDeclaration
(),
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
name
);
namespaceDescriptor
.
initialize
(
semanticServices
.
createWritableScope
(
JetScope
.
EMPTY
,
namespaceDescriptor
));
...
...
idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
浏览文件 @
0e63fa37
...
...
@@ -25,16 +25,16 @@ public class TypeResolver {
@NotNull
public
JetType
resolveType
(
@NotNull
final
JetScope
scope
,
@NotNull
final
JetTypeReference
typeReference
)
{
final
List
<
A
ttribute
>
attributes
=
AttributeResolver
.
INSTANCE
.
resolveAttribute
s
(
typeReference
.
getAttributes
());
final
List
<
A
nnotation
>
annotations
=
AnnotationResolver
.
INSTANCE
.
resolveAnnotation
s
(
typeReference
.
getAttributes
());
JetTypeElement
typeElement
=
typeReference
.
getTypeElement
();
JetType
type
=
resolveTypeElement
(
scope
,
a
ttribute
s
,
typeElement
,
false
);
JetType
type
=
resolveTypeElement
(
scope
,
a
nnotation
s
,
typeElement
,
false
);
trace
.
recordTypeResolution
(
typeReference
,
type
);
return
type
;
}
@NotNull
private
JetType
resolveTypeElement
(
final
JetScope
scope
,
final
List
<
A
ttribute
>
attribute
s
,
JetTypeElement
typeElement
,
final
boolean
nullable
)
{
private
JetType
resolveTypeElement
(
final
JetScope
scope
,
final
List
<
A
nnotation
>
annotation
s
,
JetTypeElement
typeElement
,
final
boolean
nullable
)
{
final
JetType
[]
result
=
new
JetType
[
1
];
if
(
typeElement
!=
null
)
{
typeElement
.
accept
(
new
JetVisitor
()
{
...
...
@@ -54,7 +54,7 @@ public class TypeResolver {
trace
.
recordReferenceResolution
(
referenceExpression
,
typeParameterDescriptor
);
result
[
0
]
=
new
JetTypeImpl
(
a
ttribute
s
,
a
nnotation
s
,
typeParameterDescriptor
.
getTypeConstructor
(),
nullable
||
TypeUtils
.
hasNullableBound
(
typeParameterDescriptor
),
Collections
.<
TypeProjection
>
emptyList
(),
...
...
@@ -72,7 +72,7 @@ public class TypeResolver {
int
actualArgumentCount
=
arguments
.
size
();
if
(
ErrorUtils
.
isError
(
typeConstructor
))
{
result
[
0
]
=
new
JetTypeImpl
(
a
ttribute
s
,
a
nnotation
s
,
typeConstructor
,
nullable
,
arguments
,
// TODO : review
...
...
@@ -89,7 +89,7 @@ public class TypeResolver {
}
}
else
{
result
[
0
]
=
new
JetTypeImpl
(
a
ttribute
s
,
a
nnotation
s
,
typeConstructor
,
nullable
,
arguments
,
...
...
@@ -103,7 +103,7 @@ public class TypeResolver {
@Override
public
void
visitNullableType
(
JetNullableType
nullableType
)
{
result
[
0
]
=
resolveTypeElement
(
scope
,
a
ttribute
s
,
nullableType
.
getInnerType
(),
true
);
result
[
0
]
=
resolveTypeElement
(
scope
,
a
nnotation
s
,
nullableType
.
getInnerType
(),
true
);
}
@Override
...
...
@@ -125,7 +125,7 @@ public class TypeResolver {
JetTypeReference
returnTypeRef
=
type
.
getReturnTypeRef
();
if
(
returnTypeRef
!=
null
)
{
JetType
returnType
=
resolveType
(
scope
,
returnTypeRef
);
result
[
0
]
=
JetStandardClasses
.
getFunctionType
(
a
ttribute
s
,
receiverType
,
parameterTypes
,
returnType
);
result
[
0
]
=
JetStandardClasses
.
getFunctionType
(
a
nnotation
s
,
receiverType
,
parameterTypes
,
returnType
);
}
}
...
...
idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
浏览文件 @
0e63fa37
...
...
@@ -88,7 +88,7 @@ public class JavaClassMembersScope implements JetScope {
boolean
isFinal
=
field
.
hasModifierProperty
(
PsiModifier
.
FINAL
);
PropertyDescriptor
propertyDescriptor
=
new
PropertyDescriptor
(
containingDeclaration
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
new
MemberModifiers
(
false
,
false
,
false
),
!
isFinal
,
field
.
getName
(),
...
...
idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
0e63fa37
...
...
@@ -19,7 +19,7 @@ import java.util.*;
*/
public
class
JavaDescriptorResolver
{
/*package*/
static
final
DeclarationDescriptor
JAVA_ROOT
=
new
DeclarationDescriptorImpl
(
null
,
Collections
.<
A
ttribute
>
emptyList
(),
"<java_root>"
)
{
/*package*/
static
final
DeclarationDescriptor
JAVA_ROOT
=
new
DeclarationDescriptorImpl
(
null
,
Collections
.<
A
nnotation
>
emptyList
(),
"<java_root>"
)
{
@NotNull
@Override
public
DeclarationDescriptor
substitute
(
TypeSubstitutor
substitutor
)
{
...
...
@@ -84,7 +84,7 @@ public class JavaDescriptorResolver {
List
<
JetType
>
supertypes
=
new
ArrayList
<
JetType
>();
classDescriptor
.
setTypeConstructor
(
new
TypeConstructorImpl
(
classDescriptor
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
// TODO
modifierList
==
null
?
false
:
modifierList
.
hasModifierProperty
(
PsiModifier
.
FINAL
),
name
,
...
...
@@ -102,7 +102,7 @@ public class JavaDescriptorResolver {
for
(
PsiMethod
constructor
:
psiConstructors
)
{
ConstructorDescriptorImpl
constructorDescriptor
=
new
ConstructorDescriptorImpl
(
classDescriptor
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
false
);
constructorDescriptor
.
initialize
(
resolveParameterDescriptors
(
constructorDescriptor
,
constructor
.
getParameterList
().
getParameters
()));
classDescriptor
.
addConstructor
(
constructorDescriptor
);
...
...
@@ -143,7 +143,7 @@ public class JavaDescriptorResolver {
}
return
new
TypeParameterDescriptor
(
owner
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
Variance
.
INVARIANT
,
typeParameter
.
getName
(),
upperBounds
,
...
...
@@ -200,7 +200,7 @@ public class JavaDescriptorResolver {
private
NamespaceDescriptor
createJavaNamespaceDescriptor
(
PsiPackage
psiPackage
)
{
NamespaceDescriptor
namespaceDescriptor
=
new
NamespaceDescriptor
(
JAVA_ROOT
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
psiPackage
.
getName
()
);
namespaceDescriptor
.
initialize
(
new
JavaPackageScope
(
psiPackage
.
getQualifiedName
(),
namespaceDescriptor
,
semanticServices
));
...
...
@@ -211,7 +211,7 @@ public class JavaDescriptorResolver {
private
NamespaceDescriptor
createJavaNamespaceDescriptor
(
@NotNull
final
PsiClass
psiClass
)
{
NamespaceDescriptor
namespaceDescriptor
=
new
NamespaceDescriptor
(
JAVA_ROOT
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
psiClass
.
getName
()
);
namespaceDescriptor
.
initialize
(
new
JavaClassMembersScope
(
namespaceDescriptor
,
psiClass
,
semanticServices
,
true
));
...
...
@@ -227,7 +227,7 @@ public class JavaDescriptorResolver {
result
.
add
(
new
ValueParameterDescriptorImpl
(
containingDeclaration
,
i
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
name
==
null
?
"p"
+
i
:
name
,
null
,
// TODO : review
semanticServices
.
getTypeTransformer
().
transformToType
(
parameter
.
getType
()),
...
...
@@ -253,7 +253,7 @@ public class JavaDescriptorResolver {
FunctionDescriptorImpl
functionDescriptor
=
new
FunctionDescriptorImpl
(
JavaDescriptorResolver
.
JAVA_ROOT
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
methodName
);
functionDescriptor
.
initialize
(
...
...
idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
浏览文件 @
0e63fa37
...
...
@@ -69,7 +69,7 @@ public class JavaTypeTransformer {
PsiTypeParameter
typeParameter
=
(
PsiTypeParameter
)
psiClass
;
TypeParameterDescriptor
typeParameterDescriptor
=
resolver
.
resolveTypeParameter
(
typeParameter
);
return
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
typeParameterDescriptor
.
getTypeConstructor
(),
!
TypeUtils
.
hasNullableBound
(
typeParameterDescriptor
),
Collections
.<
TypeProjection
>
emptyList
(),
...
...
@@ -99,7 +99,7 @@ public class JavaTypeTransformer {
}
}
return
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
descriptor
.
getTypeConstructor
(),
true
,
arguments
,
...
...
idea/src/org/jetbrains/jet/lang/types/Annotated.java
浏览文件 @
0e63fa37
...
...
@@ -6,5 +6,5 @@ import java.util.List;
* @author abreslav
*/
public
interface
Annotated
{
List
<
A
ttribute
>
getAttribute
s
();
List
<
A
nnotation
>
getAnnotation
s
();
}
idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java
浏览文件 @
0e63fa37
...
...
@@ -6,14 +6,14 @@ import java.util.List;
* @author abreslav
*/
public
abstract
class
AnnotatedImpl
implements
Annotated
{
private
final
List
<
A
ttribute
>
attribute
s
;
private
final
List
<
A
nnotation
>
annotation
s
;
public
AnnotatedImpl
(
List
<
A
ttribute
>
attribute
s
)
{
this
.
a
ttributes
=
attribute
s
;
public
AnnotatedImpl
(
List
<
A
nnotation
>
annotation
s
)
{
this
.
a
nnotations
=
annotation
s
;
}
@Override
public
List
<
A
ttribute
>
getAttribute
s
()
{
return
a
ttribute
s
;
public
List
<
A
nnotation
>
getAnnotation
s
()
{
return
a
nnotation
s
;
}
}
idea/src/org/jetbrains/jet/lang/types/A
ttribute
.java
→
idea/src/org/jetbrains/jet/lang/types/A
nnotation
.java
浏览文件 @
0e63fa37
...
...
@@ -3,5 +3,5 @@ package org.jetbrains.jet.lang.types;
/**
* @author abreslav
*/
public
interface
A
ttribute
{
public
interface
A
nnotation
{
}
idea/src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -21,9 +21,9 @@ public class ClassDescriptorImpl extends DeclarationDescriptorImpl implements Cl
public
ClassDescriptorImpl
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
);
}
public
final
ClassDescriptorImpl
initialize
(
boolean
sealed
,
...
...
@@ -32,7 +32,7 @@ public class ClassDescriptorImpl extends DeclarationDescriptorImpl implements Cl
@NotNull
JetScope
memberDeclarations
,
@NotNull
FunctionGroup
constructors
,
@Nullable
ConstructorDescriptor
primaryConstructor
)
{
this
.
typeConstructor
=
new
TypeConstructorImpl
(
this
,
getA
ttribute
s
(),
sealed
,
getName
(),
typeParameters
,
superclasses
);
this
.
typeConstructor
=
new
TypeConstructorImpl
(
this
,
getA
nnotation
s
(),
sealed
,
getName
(),
typeParameters
,
superclasses
);
this
.
memberDeclarations
=
memberDeclarations
;
this
.
constructors
=
constructors
;
this
.
primaryConstructor
=
primaryConstructor
;
...
...
idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -12,13 +12,13 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements
private
final
boolean
isPrimary
;
public
ConstructorDescriptorImpl
(
@NotNull
ClassDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
boolean
isPrimary
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
"<init>"
);
public
ConstructorDescriptorImpl
(
@NotNull
ClassDescriptor
containingDeclaration
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
boolean
isPrimary
)
{
super
(
containingDeclaration
,
a
nnotation
s
,
"<init>"
);
this
.
isPrimary
=
isPrimary
;
}
public
ConstructorDescriptorImpl
(
@NotNull
ConstructorDescriptor
original
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
boolean
isPrimary
)
{
super
(
original
,
a
ttribute
s
,
"<init>"
);
public
ConstructorDescriptorImpl
(
@NotNull
ConstructorDescriptor
original
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
boolean
isPrimary
)
{
super
(
original
,
a
nnotation
s
,
"<init>"
);
this
.
isPrimary
=
isPrimary
;
}
...
...
@@ -65,7 +65,7 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements
protected
FunctionDescriptorImpl
createSubstitutedCopy
()
{
return
new
ConstructorDescriptorImpl
(
this
,
Collections
.<
A
ttribute
>
emptyList
(),
// TODO
Collections
.<
A
nnotation
>
emptyList
(),
// TODO
isPrimary
);
}
}
idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -14,8 +14,8 @@ public abstract class DeclarationDescriptorImpl extends AnnotatedImpl implements
private
final
String
name
;
private
final
DeclarationDescriptor
containingDeclaration
;
public
DeclarationDescriptorImpl
(
@Nullable
DeclarationDescriptor
containingDeclaration
,
List
<
A
ttribute
>
attribute
s
,
String
name
)
{
super
(
a
ttribute
s
);
public
DeclarationDescriptorImpl
(
@Nullable
DeclarationDescriptor
containingDeclaration
,
List
<
A
nnotation
>
annotation
s
,
String
name
)
{
super
(
a
nnotation
s
);
this
.
name
=
name
;
this
.
containingDeclaration
=
containingDeclaration
;
}
...
...
idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java
浏览文件 @
0e63fa37
...
...
@@ -80,8 +80,8 @@ public class ErrorUtils {
}
};
private
static
final
ClassDescriptorImpl
ERROR_CLASS
=
new
ClassDescriptorImpl
(
ERROR_MODULE
,
Collections
.<
A
ttribute
>
emptyList
(),
"<ERROR CLASS>"
);
private
static
final
ConstructorDescriptor
ERROR_CONSTRUCTOR
=
new
ConstructorDescriptorImpl
(
ERROR_CLASS
,
Collections
.<
A
ttribute
>
emptyList
(),
true
);
private
static
final
ClassDescriptorImpl
ERROR_CLASS
=
new
ClassDescriptorImpl
(
ERROR_MODULE
,
Collections
.<
A
nnotation
>
emptyList
(),
"<ERROR CLASS>"
);
private
static
final
ConstructorDescriptor
ERROR_CONSTRUCTOR
=
new
ConstructorDescriptorImpl
(
ERROR_CLASS
,
Collections
.<
A
nnotation
>
emptyList
(),
true
);
static
{
ERROR_CLASS
.
initialize
(
true
,
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
Collections
.<
JetType
>
emptyList
(),
getErrorScope
(),
ERROR_FUNCTION_GROUP
,
ERROR_CONSTRUCTOR
);
...
...
@@ -93,10 +93,10 @@ public class ErrorUtils {
private
static
final
JetType
ERROR_PROPERTY_TYPE
=
createErrorType
(
"<ERROR PROPERTY TYPE>"
);
private
static
final
VariableDescriptor
ERROR_PROPERTY
=
new
PropertyDescriptor
(
ERROR_CLASS
,
Collections
.<
A
ttribute
>
emptyList
(),
new
MemberModifiers
(
false
,
false
,
false
),
true
,
"<ERROR PROPERTY>"
,
ERROR_PROPERTY_TYPE
,
ERROR_PROPERTY_TYPE
);
ERROR_CLASS
,
Collections
.<
A
nnotation
>
emptyList
(),
new
MemberModifiers
(
false
,
false
,
false
),
true
,
"<ERROR PROPERTY>"
,
ERROR_PROPERTY_TYPE
,
ERROR_PROPERTY_TYPE
);
private
static
FunctionDescriptor
createErrorFunction
(
List
<
TypeParameterDescriptor
>
typeParameters
,
List
<
JetType
>
positionedValueArgumentTypes
)
{
FunctionDescriptorImpl
functionDescriptor
=
new
FunctionDescriptorImpl
(
ERROR_CLASS
,
Collections
.<
A
ttribute
>
emptyList
(),
"<ERROR FUNCTION>"
);
FunctionDescriptorImpl
functionDescriptor
=
new
FunctionDescriptorImpl
(
ERROR_CLASS
,
Collections
.<
A
nnotation
>
emptyList
(),
"<ERROR FUNCTION>"
);
return
functionDescriptor
.
initialize
(
typeParameters
,
getValueParameters
(
functionDescriptor
,
positionedValueArgumentTypes
),
...
...
@@ -109,7 +109,7 @@ public class ErrorUtils {
}
private
static
FunctionDescriptor
createErrorFunction
(
int
typeParameterCount
,
List
<
JetType
>
positionedValueParameterTypes
)
{
return
new
FunctionDescriptorImpl
(
ERROR_CLASS
,
Collections
.<
A
ttribute
>
emptyList
(),
"<ERROR FUNCTION>"
).
initialize
(
return
new
FunctionDescriptorImpl
(
ERROR_CLASS
,
Collections
.<
A
nnotation
>
emptyList
(),
"<ERROR FUNCTION>"
).
initialize
(
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
// TODO
Collections
.<
ValueParameterDescriptor
>
emptyList
(),
// TODO
createErrorType
(
"<ERROR FUNCTION RETURN TYPE>"
)
...
...
@@ -123,7 +123,7 @@ public class ErrorUtils {
result
.
add
(
new
ValueParameterDescriptorImpl
(
functionDescriptor
,
i
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
"<ERROR PARAMETER>"
,
ERROR_PARAMETER_TYPE
,
ERROR_PARAMETER_TYPE
,
...
...
@@ -138,7 +138,7 @@ public class ErrorUtils {
}
private
static
JetType
createErrorType
(
String
debugMessage
,
JetScope
memberScope
)
{
return
new
ErrorTypeImpl
(
new
TypeConstructorImpl
(
ERROR_CLASS
,
Collections
.<
A
ttribute
>
emptyList
(),
false
,
"[ERROR : "
+
debugMessage
+
"]"
,
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
Collections
.<
JetType
>
emptyList
()),
memberScope
);
return
new
ErrorTypeImpl
(
new
TypeConstructorImpl
(
ERROR_CLASS
,
Collections
.<
A
nnotation
>
emptyList
(),
false
,
"[ERROR : "
+
debugMessage
+
"]"
,
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
Collections
.<
JetType
>
emptyList
()),
memberScope
);
}
public
static
JetType
createWrongVarianceErrorType
(
TypeProjection
value
)
{
...
...
@@ -192,7 +192,7 @@ public class ErrorUtils {
}
@Override
public
List
<
A
ttribute
>
getAttribute
s
()
{
public
List
<
A
nnotation
>
getAnnotation
s
()
{
return
Collections
.
emptyList
();
}
...
...
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -20,17 +20,17 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
public
FunctionDescriptorImpl
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
);
this
.
original
=
this
;
}
public
FunctionDescriptorImpl
(
@NotNull
FunctionDescriptor
original
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
)
{
super
(
original
.
getContainingDeclaration
(),
a
ttribute
s
,
name
);
super
(
original
.
getContainingDeclaration
(),
a
nnotation
s
,
name
);
this
.
original
=
original
;
}
...
...
@@ -108,7 +108,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
return
new
FunctionDescriptorImpl
(
this
,
// TODO : safeSubstitute
getA
ttribute
s
(),
getA
nnotation
s
(),
getName
());
}
...
...
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java
浏览文件 @
0e63fa37
...
...
@@ -69,7 +69,7 @@ public class FunctionDescriptorUtil {
result
.
add
(
new
ValueParameterDescriptorImpl
(
substitutedDescriptor
,
i
,
unsubstitutedValueParameter
.
getA
ttribute
s
(),
unsubstitutedValueParameter
.
getA
nnotation
s
(),
unsubstitutedValueParameter
.
getName
(),
unsubstitutedValueParameter
.
getInType
()
==
null
?
null
:
substitutedType
,
substitutedType
,
...
...
idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java
浏览文件 @
0e63fa37
...
...
@@ -21,11 +21,11 @@ public class JetStandardClasses {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private
static
NamespaceDescriptor
STANDARD_CLASSES_NAMESPACE
=
new
NamespaceDescriptor
(
null
,
Collections
.<
A
ttribute
>
emptyList
(),
"jet"
);
private
static
NamespaceDescriptor
STANDARD_CLASSES_NAMESPACE
=
new
NamespaceDescriptor
(
null
,
Collections
.<
A
nnotation
>
emptyList
(),
"jet"
);
private
static
final
ClassDescriptor
NOTHING_CLASS
=
new
ClassDescriptorImpl
(
STANDARD_CLASSES_NAMESPACE
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
"Nothing"
).
initialize
(
true
,
...
...
@@ -53,7 +53,7 @@ public class JetStandardClasses {
private
static
final
JetType
NOTHING_TYPE
=
new
JetTypeImpl
(
getNothing
());
private
static
final
JetType
NULLABLE_NOTHING_TYPE
=
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
getNothing
().
getTypeConstructor
(),
true
,
Collections
.<
TypeProjection
>
emptyList
(),
...
...
@@ -63,7 +63,7 @@ public class JetStandardClasses {
private
static
final
ClassDescriptor
ANY
=
new
ClassDescriptorImpl
(
STANDARD_CLASSES_NAMESPACE
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
"Any"
).
initialize
(
false
,
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
...
...
@@ -91,12 +91,12 @@ public class JetStandardClasses {
List
<
TypeParameterDescriptor
>
parameters
=
new
ArrayList
<
TypeParameterDescriptor
>();
ClassDescriptorImpl
classDescriptor
=
new
ClassDescriptorImpl
(
STANDARD_CLASSES_NAMESPACE
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
"Tuple"
+
i
);
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
parameters
.
add
(
new
TypeParameterDescriptor
(
classDescriptor
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
Variance
.
OUT_VARIANCE
,
"T"
+
j
));
}
TUPLE
[
i
]
=
classDescriptor
.
initialize
(
...
...
@@ -120,7 +120,7 @@ public class JetStandardClasses {
for
(
int
i
=
0
;
i
<
FUNCTION_COUNT
;
i
++)
{
ClassDescriptorImpl
function
=
new
ClassDescriptorImpl
(
STANDARD_CLASSES_NAMESPACE
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
"Function"
+
i
);
FUNCTION
[
i
]
=
function
.
initialize
(
false
,
...
...
@@ -129,12 +129,12 @@ public class JetStandardClasses {
ClassDescriptorImpl
receiverFunction
=
new
ClassDescriptorImpl
(
STANDARD_CLASSES_NAMESPACE
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
"ReceiverFunction"
+
i
);
List
<
TypeParameterDescriptor
>
parameters
=
createTypeParameters
(
i
,
receiverFunction
);
parameters
.
add
(
0
,
new
TypeParameterDescriptor
(
receiverFunction
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
Variance
.
IN_VARIANCE
,
"T"
));
RECEIVER_FUNCTION
[
i
]
=
receiverFunction
.
initialize
(
false
,
...
...
@@ -148,12 +148,12 @@ public class JetStandardClasses {
for
(
int
j
=
0
;
j
<
parameterCount
;
j
++)
{
parameters
.
add
(
new
TypeParameterDescriptor
(
function
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
Variance
.
IN_VARIANCE
,
"P"
+
j
));
}
parameters
.
add
(
new
TypeParameterDescriptor
(
function
,
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
Variance
.
OUT_VARIANCE
,
"R"
));
return
parameters
;
}
...
...
@@ -258,29 +258,29 @@ public class JetStandardClasses {
type
.
getConstructor
()
==
NOTHING_CLASS
.
getTypeConstructor
();
}
public
static
JetType
getTupleType
(
List
<
A
ttribute
>
attribute
s
,
List
<
JetType
>
arguments
)
{
if
(
a
ttribute
s
.
isEmpty
()
&&
arguments
.
isEmpty
())
{
public
static
JetType
getTupleType
(
List
<
A
nnotation
>
annotation
s
,
List
<
JetType
>
arguments
)
{
if
(
a
nnotation
s
.
isEmpty
()
&&
arguments
.
isEmpty
())
{
return
getUnitType
();
}
return
new
JetTypeImpl
(
a
ttribute
s
,
getTuple
(
arguments
.
size
()).
getTypeConstructor
(),
false
,
toProjections
(
arguments
),
STUB
);
return
new
JetTypeImpl
(
a
nnotation
s
,
getTuple
(
arguments
.
size
()).
getTypeConstructor
(),
false
,
toProjections
(
arguments
),
STUB
);
}
public
static
JetType
getTupleType
(
List
<
JetType
>
arguments
)
{
return
getTupleType
(
Collections
.<
A
ttribute
>
emptyList
(),
arguments
);
return
getTupleType
(
Collections
.<
A
nnotation
>
emptyList
(),
arguments
);
}
public
static
JetType
getTupleType
(
JetType
...
arguments
)
{
return
getTupleType
(
Collections
.<
A
ttribute
>
emptyList
(),
Arrays
.
asList
(
arguments
));
return
getTupleType
(
Collections
.<
A
nnotation
>
emptyList
(),
Arrays
.
asList
(
arguments
));
}
public
static
JetType
getLabeledTupleType
(
List
<
A
ttribute
>
attribute
s
,
List
<
ValueParameterDescriptor
>
arguments
)
{
public
static
JetType
getLabeledTupleType
(
List
<
A
nnotation
>
annotation
s
,
List
<
ValueParameterDescriptor
>
arguments
)
{
// TODO
return
getTupleType
(
a
ttribute
s
,
toTypes
(
arguments
));
return
getTupleType
(
a
nnotation
s
,
toTypes
(
arguments
));
}
public
static
JetType
getLabeledTupleType
(
List
<
ValueParameterDescriptor
>
arguments
)
{
// TODO
return
getLabeledTupleType
(
Collections
.<
A
ttribute
>
emptyList
(),
arguments
);
return
getLabeledTupleType
(
Collections
.<
A
nnotation
>
emptyList
(),
arguments
);
}
private
static
List
<
TypeProjection
>
toProjections
(
List
<
JetType
>
arguments
)
{
...
...
@@ -300,7 +300,7 @@ public class JetStandardClasses {
}
// TODO : labeled version?
public
static
JetType
getFunctionType
(
List
<
A
ttribute
>
attribute
s
,
@Nullable
JetType
receiverType
,
@NotNull
List
<
JetType
>
parameterTypes
,
@NotNull
JetType
returnType
)
{
public
static
JetType
getFunctionType
(
List
<
A
nnotation
>
annotation
s
,
@Nullable
JetType
receiverType
,
@NotNull
List
<
JetType
>
parameterTypes
,
@NotNull
JetType
returnType
)
{
List
<
TypeProjection
>
arguments
=
new
ArrayList
<
TypeProjection
>();
if
(
receiverType
!=
null
)
{
arguments
.
add
(
defaultProjection
(
receiverType
));
...
...
@@ -311,7 +311,7 @@ public class JetStandardClasses {
arguments
.
add
(
defaultProjection
(
returnType
));
int
size
=
parameterTypes
.
size
();
TypeConstructor
constructor
=
receiverType
==
null
?
FUNCTION
[
size
].
getTypeConstructor
()
:
RECEIVER_FUNCTION
[
size
].
getTypeConstructor
();
return
new
JetTypeImpl
(
a
ttribute
s
,
constructor
,
false
,
arguments
,
STUB
);
return
new
JetTypeImpl
(
a
nnotation
s
,
constructor
,
false
,
arguments
,
STUB
);
}
private
static
TypeProjection
defaultProjection
(
JetType
returnType
)
{
...
...
idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
浏览文件 @
0e63fa37
...
...
@@ -217,7 +217,7 @@ public class JetStandardLibrary {
public
JetType
getArrayType
(
@NotNull
Variance
variance
,
@NotNull
JetType
argument
)
{
List
<
TypeProjection
>
types
=
Collections
.
singletonList
(
new
TypeProjection
(
variance
,
argument
));
return
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
getArray
().
getTypeConstructor
(),
false
,
types
,
...
...
@@ -229,7 +229,7 @@ public class JetStandardLibrary {
public
JetType
getIterableType
(
@NotNull
JetType
argument
)
{
List
<
TypeProjection
>
types
=
Collections
.
singletonList
(
new
TypeProjection
(
Variance
.
INVARIANT
,
argument
));
return
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
getIterable
().
getTypeConstructor
(),
false
,
types
,
...
...
idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java
浏览文件 @
0e63fa37
...
...
@@ -134,7 +134,7 @@ public class JetTypeChecker {
}
// TODO : attributes?
return
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
constructor
,
nullable
,
newProjections
,
JetStandardClasses
.
STUB
);
return
new
JetTypeImpl
(
Collections
.<
A
nnotation
>
emptyList
(),
constructor
,
nullable
,
newProjections
,
JetStandardClasses
.
STUB
);
}
@NotNull
...
...
idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
浏览文件 @
0e63fa37
...
...
@@ -17,8 +17,8 @@ public final class JetTypeImpl extends AnnotatedImpl implements JetType {
private
final
boolean
nullable
;
private
JetScope
memberScope
;
public
JetTypeImpl
(
List
<
A
ttribute
>
attribute
s
,
TypeConstructor
constructor
,
boolean
nullable
,
List
<
TypeProjection
>
arguments
,
JetScope
memberScope
)
{
super
(
a
ttribute
s
);
public
JetTypeImpl
(
List
<
A
nnotation
>
annotation
s
,
TypeConstructor
constructor
,
boolean
nullable
,
List
<
TypeProjection
>
arguments
,
JetScope
memberScope
)
{
super
(
a
nnotation
s
);
this
.
constructor
=
constructor
;
this
.
nullable
=
nullable
;
this
.
arguments
=
arguments
;
...
...
@@ -26,11 +26,11 @@ public final class JetTypeImpl extends AnnotatedImpl implements JetType {
}
public
JetTypeImpl
(
TypeConstructor
constructor
,
JetScope
memberScope
)
{
this
(
Collections
.<
A
ttribute
>
emptyList
(),
constructor
,
false
,
Collections
.<
TypeProjection
>
emptyList
(),
memberScope
);
this
(
Collections
.<
A
nnotation
>
emptyList
(),
constructor
,
false
,
Collections
.<
TypeProjection
>
emptyList
(),
memberScope
);
}
public
JetTypeImpl
(
@NotNull
ClassDescriptor
classDescriptor
)
{
this
(
Collections
.<
A
ttribute
>
emptyList
(),
this
(
Collections
.<
A
nnotation
>
emptyList
(),
classDescriptor
.
getTypeConstructor
(),
false
,
Collections
.<
TypeProjection
>
emptyList
(),
...
...
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
0e63fa37
...
...
@@ -684,7 +684,7 @@ public class JetTypeInferrer {
return
;
}
FunctionDescriptorImpl
functionDescriptor
=
new
FunctionDescriptorImpl
(
scope
.
getContainingDeclaration
(),
Collections
.<
A
ttribute
>
emptyList
(),
"<anonymous>"
);
FunctionDescriptorImpl
functionDescriptor
=
new
FunctionDescriptorImpl
(
scope
.
getContainingDeclaration
(),
Collections
.<
A
nnotation
>
emptyList
(),
"<anonymous>"
);
JetTypeReference
returnTypeRef
=
expression
.
getReturnTypeRef
();
...
...
@@ -721,7 +721,7 @@ public class JetTypeInferrer {
}
JetType
effectiveReceiverType
=
receiverTypeRef
==
null
?
null
:
receiverType
;
JetType
safeReturnType
=
returnType
==
null
?
ErrorUtils
.
createErrorType
(
"<return type>"
)
:
returnType
;
result
=
JetStandardClasses
.
getFunctionType
(
Collections
.<
A
ttribute
>
emptyList
(),
effectiveReceiverType
,
parameterTypes
,
safeReturnType
);
result
=
JetStandardClasses
.
getFunctionType
(
Collections
.<
A
nnotation
>
emptyList
(),
effectiveReceiverType
,
parameterTypes
,
safeReturnType
);
}
@Override
...
...
idea/src/org/jetbrains/jet/lang/types/LocalVariableDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -11,11 +11,11 @@ import java.util.List;
public
class
LocalVariableDescriptor
extends
VariableDescriptorImpl
{
public
LocalVariableDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
,
@Nullable
JetType
type
,
boolean
mutable
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
,
mutable
?
type
:
null
,
type
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
,
mutable
?
type
:
null
,
type
);
}
@NotNull
...
...
idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -9,7 +9,7 @@ import java.util.Collections;
*/
public
class
ModuleDescriptor
extends
DeclarationDescriptorImpl
{
public
ModuleDescriptor
(
String
name
)
{
super
(
null
,
Collections
.<
A
ttribute
>
emptyList
(),
name
);
super
(
null
,
Collections
.<
A
nnotation
>
emptyList
(),
name
);
}
@NotNull
...
...
idea/src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -14,8 +14,8 @@ public class NamespaceDescriptor extends DeclarationDescriptorImpl {
private
JetScope
memberScope
;
public
NamespaceDescriptor
(
@Nullable
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
String
name
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
);
public
NamespaceDescriptor
(
@Nullable
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
)
{
super
(
containingDeclaration
,
a
nnotation
s
,
name
);
}
public
void
initialize
(
@NotNull
JetScope
memberScope
)
{
...
...
idea/src/org/jetbrains/jet/lang/types/NamespaceType.java
浏览文件 @
0e63fa37
...
...
@@ -51,7 +51,7 @@ public class NamespaceType implements JetType {
}
@Override
public
List
<
A
ttribute
>
getAttribute
s
()
{
public
List
<
A
nnotation
>
getAnnotation
s
()
{
throwException
();
return
null
;
}
...
...
idea/src/org/jetbrains/jet/lang/types/PropertyAccessorDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -12,8 +12,8 @@ public abstract class PropertyAccessorDescriptor extends DeclarationDescriptorIm
private
final
boolean
hasBody
;
protected
PropertyAccessorDescriptor
(
@NotNull
PropertyDescriptor
correspondingProperty
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
String
name
,
boolean
hasBody
)
{
super
(
correspondingProperty
.
getContainingDeclaration
(),
a
ttribute
s
,
name
);
protected
PropertyAccessorDescriptor
(
@NotNull
PropertyDescriptor
correspondingProperty
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
,
boolean
hasBody
)
{
super
(
correspondingProperty
.
getContainingDeclaration
(),
a
nnotation
s
,
name
);
this
.
hasBody
=
hasBody
;
}
...
...
idea/src/org/jetbrains/jet/lang/types/PropertyDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -17,13 +17,13 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Member
public
PropertyDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
MemberModifiers
memberModifiers
,
boolean
isVar
,
@NotNull
String
name
,
@Nullable
JetType
inType
,
@Nullable
JetType
outType
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
,
inType
,
outType
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
,
inType
,
outType
);
assert
!
isVar
||
inType
!=
null
;
assert
outType
!=
null
;
this
.
isVar
=
isVar
;
...
...
@@ -36,7 +36,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Member
@Nullable
JetType
outType
)
{
this
(
original
.
getContainingDeclaration
(),
original
.
getA
ttribute
s
(),
// TODO : substitute?
original
.
getA
nnotation
s
(),
// TODO : substitute?
original
.
getModifiers
(),
original
.
isVar
,
original
.
getName
(),
...
...
idea/src/org/jetbrains/jet/lang/types/PropertyGetterDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -12,8 +12,8 @@ import java.util.List;
public
class
PropertyGetterDescriptor
extends
PropertyAccessorDescriptor
implements
MutableFunctionDescriptor
{
private
JetType
returnType
;
public
PropertyGetterDescriptor
(
@NotNull
PropertyDescriptor
correspondingProperty
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@Nullable
JetType
returnType
,
boolean
hasBody
)
{
super
(
correspondingProperty
,
a
ttribute
s
,
"get-"
+
correspondingProperty
.
getName
(),
hasBody
);
public
PropertyGetterDescriptor
(
@NotNull
PropertyDescriptor
correspondingProperty
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@Nullable
JetType
returnType
,
boolean
hasBody
)
{
super
(
correspondingProperty
,
a
nnotation
s
,
"get-"
+
correspondingProperty
.
getName
(),
hasBody
);
this
.
returnType
=
returnType
==
null
?
correspondingProperty
.
getOutType
()
:
returnType
;
}
...
...
idea/src/org/jetbrains/jet/lang/types/PropertySetterDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -12,8 +12,8 @@ public class PropertySetterDescriptor extends PropertyAccessorDescriptor impleme
private
MutableValueParameterDescriptor
parameter
;
public
PropertySetterDescriptor
(
@NotNull
PropertyDescriptor
correspondingProperty
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
boolean
hasBody
)
{
super
(
correspondingProperty
,
a
ttribute
s
,
"set-"
+
correspondingProperty
.
getName
(),
hasBody
);
public
PropertySetterDescriptor
(
@NotNull
PropertyDescriptor
correspondingProperty
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
boolean
hasBody
)
{
super
(
correspondingProperty
,
a
nnotation
s
,
"set-"
+
correspondingProperty
.
getName
(),
hasBody
);
}
public
void
initialize
(
@NotNull
MutableValueParameterDescriptor
parameter
)
{
...
...
idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -21,12 +21,12 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo
public
TypeConstructorImpl
(
@Nullable
DeclarationDescriptor
declarationDescriptor
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
boolean
sealed
,
@NotNull
String
debugName
,
@NotNull
List
<
TypeParameterDescriptor
>
parameters
,
@NotNull
Collection
<?
extends
JetType
>
supertypes
)
{
super
(
a
ttribute
s
);
super
(
a
nnotation
s
);
this
.
declarationDescriptor
=
declarationDescriptor
;
this
.
sealed
=
sealed
;
this
.
debugName
=
debugName
;
...
...
idea/src/org/jetbrains/jet/lang/types/TypeParameterDescriptor.java
浏览文件 @
0e63fa37
...
...
@@ -17,18 +17,18 @@ public class TypeParameterDescriptor extends DeclarationDescriptorImpl implement
public
TypeParameterDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
Variance
variance
,
@NotNull
String
name
,
@NotNull
Set
<
JetType
>
upperBounds
,
@NotNull
JetType
boundsAsType
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
);
this
.
variance
=
variance
;
this
.
upperBounds
=
upperBounds
;
// TODO: Should we actually pass the a
ttribute
s on to the type constructor?
// TODO: Should we actually pass the a
nnotation
s on to the type constructor?
this
.
typeConstructor
=
new
TypeConstructorImpl
(
this
,
a
ttribute
s
,
a
nnotation
s
,
false
,
"&"
+
name
,
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
...
...
@@ -38,12 +38,12 @@ public class TypeParameterDescriptor extends DeclarationDescriptorImpl implement
public
TypeParameterDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
Variance
variance
,
@NotNull
String
name
)
{
this
(
containingDeclaration
,
attribute
s
,
annotation
s
,
variance
,
name
,
Collections
.
singleton
(
JetStandardClasses
.
getNullableAnyType
()),
...
...
idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java
浏览文件 @
0e63fa37
...
...
@@ -94,7 +94,7 @@ public class TypeSubstitutor {
callSiteVariance
));
}
return
new
JetTypeImpl
(
subjectType
.
getA
ttribute
s
(),
subjectType
.
getA
nnotation
s
(),
subjectType
.
getConstructor
(),
subjectType
.
isNullable
(),
newArguments
,
...
...
idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
浏览文件 @
0e63fa37
...
...
@@ -24,7 +24,7 @@ public class TypeUtils {
if
(
type
.
isNullable
()
==
nullable
)
{
return
type
;
}
return
new
JetTypeImpl
(
type
.
getA
ttribute
s
(),
type
.
getConstructor
(),
nullable
,
type
.
getArguments
(),
type
.
getMemberScope
());
return
new
JetTypeImpl
(
type
.
getA
nnotation
s
(),
type
.
getConstructor
(),
nullable
,
type
.
getArguments
(),
type
.
getMemberScope
());
}
@NotNull
...
...
@@ -64,10 +64,10 @@ public class TypeUtils {
}
}
List
<
A
ttribute
>
noAttributes
=
Collections
.<
Attribute
>
emptyList
();
TypeConstructor
constructor
=
new
TypeConstructorImpl
(
null
,
noA
ttribute
s
,
false
,
debugName
.
toString
(),
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
types
);
List
<
A
nnotation
>
noAnnotations
=
Collections
.<
Annotation
>
emptyList
();
TypeConstructor
constructor
=
new
TypeConstructorImpl
(
null
,
noA
nnotation
s
,
false
,
debugName
.
toString
(),
Collections
.<
TypeParameterDescriptor
>
emptyList
(),
types
);
return
new
JetTypeImpl
(
noA
ttribute
s
,
noA
nnotation
s
,
constructor
,
nullable
,
Collections
.<
TypeProjection
>
emptyList
(),
...
...
@@ -159,7 +159,7 @@ public class TypeUtils {
public
static
JetType
makeUnsubstitutedType
(
ClassDescriptor
classDescriptor
,
JetScope
unsubstitutedMemberScope
)
{
List
<
TypeProjection
>
arguments
=
getArguments
(
classDescriptor
);
return
new
JetTypeImpl
(
Collections
.<
A
ttribute
>
emptyList
(),
Collections
.<
A
nnotation
>
emptyList
(),
classDescriptor
.
getTypeConstructor
(),
false
,
arguments
,
...
...
idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -17,13 +17,13 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme
public
ValueParameterDescriptorImpl
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
int
index
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
,
@Nullable
JetType
inType
,
@NotNull
JetType
outType
,
boolean
hasDefaultValue
,
boolean
isVararg
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
,
inType
,
outType
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
,
inType
,
outType
);
this
.
index
=
index
;
this
.
hasDefaultValue
=
hasDefaultValue
;
this
.
isVararg
=
isVararg
;
...
...
@@ -33,12 +33,12 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme
public
ValueParameterDescriptorImpl
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
int
index
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
,
boolean
isVar
,
boolean
hasDefaultValue
,
boolean
isVararg
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
,
null
,
null
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
,
null
,
null
);
this
.
index
=
index
;
this
.
hasDefaultValue
=
hasDefaultValue
;
this
.
isVararg
=
isVararg
;
...
...
idea/src/org/jetbrains/jet/lang/types/VariableDescriptorImpl.java
浏览文件 @
0e63fa37
...
...
@@ -14,11 +14,11 @@ public abstract class VariableDescriptorImpl extends DeclarationDescriptorImpl i
public
VariableDescriptorImpl
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
List
<
A
ttribute
>
attribute
s
,
@NotNull
List
<
A
nnotation
>
annotation
s
,
@NotNull
String
name
,
@Nullable
JetType
inType
,
@Nullable
JetType
outType
)
{
super
(
containingDeclaration
,
a
ttribute
s
,
name
);
super
(
containingDeclaration
,
a
nnotation
s
,
name
);
assert
(
inType
!=
null
)
||
(
outType
!=
null
);
this
.
inType
=
inType
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录