Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
200fd785
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,发现更多精彩内容 >>
提交
200fd785
编写于
1月 12, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ReadClassDataTest: extension properties
上级
f4bf59ff
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
133 addition
and
55 deletion
+133
-55
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
...ackend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+17
-10
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+90
-37
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
...org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
+0
-8
compiler/testData/readClass/prop/ExtVal.kt
compiler/testData/readClass/prop/ExtVal.kt
+4
-0
compiler/testData/readClass/prop/ExtValInClass.kt
compiler/testData/readClass/prop/ExtValInClass.kt
+6
-0
compiler/testData/readClass/prop/ExtVar.kt
compiler/testData/readClass/prop/ExtVar.kt
+5
-0
compiler/testData/readClass/prop/ExtVarInClass.kt
compiler/testData/readClass/prop/ExtVarInClass.kt
+7
-0
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
+4
-0
未找到文件。
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
浏览文件 @
200fd785
...
...
@@ -91,17 +91,24 @@ public class FunctionCodegen {
if
(
v
.
generateCode
())
{
int
start
=
0
;
if
(
kind
!=
OwnerKind
.
TRAIT_IMPL
)
{
AnnotationVisitor
av
=
mv
.
visitAnnotation
(
JvmStdlibNames
.
JET_METHOD
.
getDescriptor
(),
true
);
if
(
functionDescriptor
.
getReturnType
().
isNullable
())
{
av
.
visit
(
JvmStdlibNames
.
JET_METHOD_NULLABLE_RETURN_TYPE_FIELD
,
true
);
}
if
(
jvmSignature
.
getKotlinReturnType
()
!=
null
)
{
av
.
visit
(
JvmStdlibNames
.
JET_METHOD_RETURN_TYPE_FIELD
,
jvmSignature
.
getKotlinReturnType
());
}
if
(
jvmSignature
.
getKotlinTypeParameter
()
!=
null
)
{
av
.
visit
(
JvmStdlibNames
.
JET_METHOD_TYPE_PARAMETERS_FIELD
,
jvmSignature
.
getKotlinTypeParameter
());
if
(
functionDescriptor
instanceof
PropertyAccessorDescriptor
)
{
AnnotationVisitor
av
=
mv
.
visitAnnotation
(
JvmStdlibNames
.
JET_PROPERTY
.
getDescriptor
(),
true
);
av
.
visitEnd
();
}
else
if
(
functionDescriptor
instanceof
NamedFunctionDescriptor
)
{
AnnotationVisitor
av
=
mv
.
visitAnnotation
(
JvmStdlibNames
.
JET_METHOD
.
getDescriptor
(),
true
);
if
(
functionDescriptor
.
getReturnType
().
isNullable
())
{
av
.
visit
(
JvmStdlibNames
.
JET_METHOD_NULLABLE_RETURN_TYPE_FIELD
,
true
);
}
if
(
jvmSignature
.
getKotlinReturnType
()
!=
null
)
{
av
.
visit
(
JvmStdlibNames
.
JET_METHOD_RETURN_TYPE_FIELD
,
jvmSignature
.
getKotlinReturnType
());
}
if
(
jvmSignature
.
getKotlinTypeParameter
()
!=
null
)
{
av
.
visit
(
JvmStdlibNames
.
JET_METHOD_TYPE_PARAMETERS_FIELD
,
jvmSignature
.
getKotlinTypeParameter
());
}
av
.
visitEnd
();
}
else
{
throw
new
IllegalStateException
();
}
av
.
visitEnd
();
}
if
(
kind
==
OwnerKind
.
TRAIT_IMPL
)
{
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
200fd785
...
...
@@ -740,10 +740,7 @@ public class JavaDescriptorResolver {
receiver
=
(
Boolean
)
receiverExpression
.
getValue
();
}
PsiLiteralExpression
hasDefaultValueExpression
=
(
PsiLiteralExpression
)
annotation
.
findAttributeValue
(
JvmStdlibNames
.
JET_VALUE_PARAMETER_HAS_DEFAULT_VALUE_FIELD
);
if
(
hasDefaultValueExpression
!=
null
)
{
hasDefaultValue
=
(
Boolean
)
hasDefaultValueExpression
.
getValue
();
}
hasDefaultValue
=
getBooleanAnnotationAttributeValue
(
annotation
,
JvmStdlibNames
.
JET_VALUE_PARAMETER_HAS_DEFAULT_VALUE_FIELD
,
false
);
}
else
if
(
annotation
.
getQualifiedName
().
equals
(
JvmStdlibNames
.
JET_TYPE_PARAMETER
.
getFqName
()))
{
...
...
@@ -773,6 +770,15 @@ public class JavaDescriptorResolver {
}
}
private
static
boolean
getBooleanAnnotationAttributeValue
(
PsiAnnotation
annotation
,
String
parameterName
,
boolean
defaultValue
)
{
PsiLiteralExpression
receiverExpression
=
(
PsiLiteralExpression
)
annotation
.
findAttributeValue
(
parameterName
);
if
(
receiverExpression
!=
null
)
{
return
(
Boolean
)
receiverExpression
.
getValue
();
}
else
{
return
defaultValue
;
}
}
/*
public VariableDescriptor resolveFieldToVariableDescriptor(DeclarationDescriptor containingDeclaration, PsiField field) {
VariableDescriptor variableDescriptor = fieldDescriptorCache.get(field);
...
...
@@ -802,21 +808,25 @@ public class JavaDescriptorResolver {
private
final
String
name
;
@NotNull
private
final
PsiType
type
;
@Nullable
private
final
PsiType
receiverType
;
private
PropertyKey
(
String
name
,
PsiType
t
ype
)
{
private
PropertyKey
(
@NotNull
String
name
,
@NotNull
PsiType
type
,
@Nullable
PsiType
receiverT
ype
)
{
this
.
name
=
name
;
this
.
type
=
type
;
this
.
receiverType
=
receiverType
;
}
@Override
public
boolean
equals
(
Object
o
)
{
// generated by Idea
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
PropertyKey
that
=
(
PropertyKey
)
o
;
if
(!
name
.
equals
(
that
.
name
))
return
false
;
if
(
receiverType
!=
null
?
!
receiverType
.
equals
(
that
.
receiverType
)
:
that
.
receiverType
!=
null
)
return
false
;
if
(!
type
.
equals
(
that
.
type
))
return
false
;
return
true
;
...
...
@@ -826,6 +836,7 @@ public class JavaDescriptorResolver {
public
int
hashCode
()
{
int
result
=
name
.
hashCode
();
result
=
31
*
result
+
type
.
hashCode
();
result
=
31
*
result
+
(
receiverType
!=
null
?
receiverType
.
hashCode
()
:
0
);
return
result
;
}
}
...
...
@@ -850,7 +861,7 @@ public class JavaDescriptorResolver {
MembersForProperty
members
=
new
MembersForProperty
();
members
.
field
=
field
;
membersMap
.
put
(
new
PropertyKey
(
field
.
getName
(),
field
.
getType
()),
members
);
membersMap
.
put
(
new
PropertyKey
(
field
.
getName
(),
field
.
getType
()
,
null
),
members
);
}
}
...
...
@@ -864,36 +875,77 @@ public class JavaDescriptorResolver {
}
// TODO: "is" prefix
// TODO: remove getJavaClass
if
(
method
.
getName
().
startsWith
(
JvmAbi
.
GETTER_PREFIX
))
{
// TODO: some java properties too
if
(
method
.
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_PROPERTY
.
getFqName
())
!=
null
)
{
PsiType
receiverType
;
if
(
method
.
getParameterList
().
getParametersCount
()
==
0
)
{
if
(
method
.
getName
().
equals
(
JvmStdlibNames
.
JET_OBJECT_GET_TYPEINFO_METHOD
))
{
continue
;
receiverType
=
null
;
}
else
if
(
method
.
getParameterList
().
getParametersCount
()
==
1
)
{
if
(
method
.
getParameterList
().
getParameters
()[
0
].
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_TYPE_PARAMETER
.
getFqName
())
!=
null
)
{
receiverType
=
null
;
}
else
{
receiverType
=
method
.
getParameterList
().
getParameters
()[
0
].
getType
();
}
String
propertyName
=
StringUtil
.
decapitalize
(
method
.
getName
().
substring
(
JvmAbi
.
GETTER_PREFIX
.
length
()));
PropertyKey
key
=
new
PropertyKey
(
propertyName
,
method
.
getReturnType
());
MembersForProperty
members
=
membersMap
.
get
(
key
);
if
(
members
==
null
)
{
members
=
new
MembersForProperty
();
membersMap
.
put
(
key
,
members
);
}
else
if
(
method
.
getParameterList
().
getParametersCount
()
==
2
)
{
if
(
method
.
getParameterList
().
getParameters
()[
1
].
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_TYPE_PARAMETER
.
getFqName
())
==
null
)
{
throw
new
IllegalStateException
();
}
members
.
getter
=
method
;
receiverType
=
method
.
getParameterList
().
getParameters
()[
0
].
getType
();
}
else
{
throw
new
IllegalStateException
();
}
if
(
method
.
getName
().
equals
(
JvmStdlibNames
.
JET_OBJECT_GET_TYPEINFO_METHOD
))
{
continue
;
}
String
propertyName
=
StringUtil
.
decapitalize
(
method
.
getName
().
substring
(
JvmAbi
.
GETTER_PREFIX
.
length
()));
PropertyKey
key
=
new
PropertyKey
(
propertyName
,
method
.
getReturnType
(),
receiverType
);
MembersForProperty
members
=
membersMap
.
get
(
key
);
if
(
members
==
null
)
{
members
=
new
MembersForProperty
();
membersMap
.
put
(
key
,
members
);
}
members
.
getter
=
method
;
}
}
else
if
(
method
.
getName
().
startsWith
(
JvmAbi
.
SETTER_PREFIX
))
{
if
(
method
.
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_PROPERTY
.
getFqName
())
!=
null
)
{
if
(
method
.
getParameterList
().
getParametersCount
()
==
1
)
{
String
propertyName
=
StringUtil
.
decapitalize
(
method
.
getName
().
substring
(
JvmAbi
.
SETTER_PREFIX
.
length
()));
PropertyKey
key
=
new
PropertyKey
(
propertyName
,
method
.
getParameterList
().
getParameters
()[
0
].
getType
());
MembersForProperty
members
=
membersMap
.
get
(
key
);
if
(
members
==
null
)
{
members
=
new
MembersForProperty
();
membersMap
.
put
(
key
,
members
);
if
(
method
.
getParameterList
().
getParametersCount
()
==
0
)
{
throw
new
IllegalStateException
();
}
int
i
=
0
;
PsiType
receiverType
=
null
;
PsiParameter
p1
=
method
.
getParameterList
().
getParameters
()[
0
];
PsiAnnotation
p1a
=
p1
.
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_VALUE_PARAMETER
.
getFqName
());
if
(
p1a
!=
null
)
{
if
(
getBooleanAnnotationAttributeValue
(
p1a
,
JvmStdlibNames
.
JET_VALUE_PARAMETER_RECEIVER_FIELD
,
false
))
{
receiverType
=
p1
.
getType
();
++
i
;
}
members
.
setter
=
method
;
}
while
(
i
<
method
.
getParameterList
().
getParametersCount
()
&&
method
.
getParameterList
().
getParameters
()[
i
].
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_TYPE_PARAMETER
.
getFqName
())
!=
null
)
{
++
i
;
}
if
(
i
+
1
!=
method
.
getParameterList
().
getParametersCount
())
{
throw
new
IllegalStateException
();
}
PsiType
propertyType
=
method
.
getParameterList
().
getParameters
()[
i
].
getType
();
String
propertyName
=
StringUtil
.
decapitalize
(
method
.
getName
().
substring
(
JvmAbi
.
SETTER_PREFIX
.
length
()));
PropertyKey
key
=
new
PropertyKey
(
propertyName
,
propertyType
,
receiverType
);
MembersForProperty
members
=
membersMap
.
get
(
key
);
if
(
members
==
null
)
{
members
=
new
MembersForProperty
();
membersMap
.
put
(
key
,
members
);
}
members
.
setter
=
method
;
}
}
}
...
...
@@ -940,6 +992,7 @@ public class JavaDescriptorResolver {
//}
String
propertyName
=
entry
.
getKey
().
name
;
PsiType
propertyType
=
entry
.
getKey
().
type
;
PsiType
receiverType
=
entry
.
getKey
().
receiverType
;
MembersForProperty
members
=
entry
.
getValue
();
JetType
type
=
semanticServices
.
getTypeTransformer
().
transformToType
(
propertyType
);
...
...
@@ -972,6 +1025,13 @@ public class JavaDescriptorResolver {
isVar
=
members
.
setter
!=
null
;
}
JetType
receiverJetType
;
if
(
receiverType
==
null
)
{
receiverJetType
=
null
;
}
else
{
receiverJetType
=
semanticServices
.
getTypeTransformer
().
transformToType
(
receiverType
);
}
PropertyDescriptor
propertyDescriptor
=
new
PropertyDescriptor
(
owner
,
Collections
.<
AnnotationDescriptor
>
emptyList
(),
...
...
@@ -979,7 +1039,7 @@ public class JavaDescriptorResolver {
resolveVisibilityFromPsiModifiers
(
anyMember
),
isVar
,
false
,
null
,
receiverJetType
,
DescriptorUtils
.
getExpectedThisObjectIfNeeded
(
owner
),
propertyName
,
type
);
...
...
@@ -1085,18 +1145,11 @@ public class JavaDescriptorResolver {
kotlin
=
classData
.
kotlin
;
}
// TODO: hide getters and setters properly
if
(
kotlin
)
{
if
(
method
.
getName
().
startsWith
(
JvmAbi
.
GETTER_PREFIX
)
&&
method
.
getParameterList
().
getParametersCount
()
==
0
)
{
if
(
method
.
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_PROPERTY
.
getFqName
())
!=
null
)
return
null
;
}
if
(
method
.
getName
().
startsWith
(
JvmAbi
.
SETTER_PREFIX
)
&&
method
.
getParameterList
().
getParametersCount
()
==
1
)
{
if
(
method
.
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_PROPERTY
.
getFqName
())
!=
null
)
return
null
;
}
// TODO: ugly
if
(
method
.
getModifierList
().
findAnnotation
(
JvmStdlibNames
.
JET_PROPERTY
.
getFqName
())
!=
null
)
{
return
null
;
}
DeclarationDescriptor
classDescriptor
;
final
List
<
TypeParameterDescriptor
>
classTypeParameters
;
if
(
method
.
hasModifierProperty
(
PsiModifier
.
STATIC
))
{
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
浏览文件 @
200fd785
...
...
@@ -86,14 +86,6 @@ public class JavaPackageScope extends JetScopeImpl {
return
Collections
.
emptySet
();
}
PsiField
field
=
psiClassForPackage
.
findFieldByName
(
name
,
true
);
if
(
field
==
null
)
{
return
Collections
.
emptySet
();
}
if
(!
field
.
hasModifierProperty
(
PsiModifier
.
STATIC
))
{
return
Collections
.
emptySet
();
}
// TODO: cache
return
semanticServices
.
getDescriptorResolver
().
resolveFieldGroupByName
(
containingDescriptor
,
psiClassForPackage
,
name
,
true
);
}
...
...
compiler/testData/readClass/prop/ExtVal.kt
0 → 100644
浏览文件 @
200fd785
package
test
val
Int
.
itIs
:
Int
get
()
=
this
compiler/testData/readClass/prop/ExtValInClass.kt
0 → 100644
浏览文件 @
200fd785
package
test
class
ExtPropInClass
{
val
Int
.
itIs
:
Int
get
()
=
this
}
compiler/testData/readClass/prop/ExtVar.kt
0 → 100644
浏览文件 @
200fd785
package
test
var
Int
.
ggg
:
Int
get
()
=
throw
Exception
()
set
(
p
)
=
throw
Exception
()
compiler/testData/readClass/prop/ExtVarInClass.kt
0 → 100644
浏览文件 @
200fd785
package
test
class
ExtPropInClass
{
var
Int
.
itIs
:
Int
get
()
=
throw
Exception
()
set
(
p
:
Int
)
=
throw
Exception
()
}
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
浏览文件 @
200fd785
...
...
@@ -282,6 +282,10 @@ public class ReadClassDataTest extends TestCaseWithTmpdir {
}
else
{
sb
.
append
(
"val "
);
}
if
(
prop
.
getReceiverParameter
().
exists
())
{
serialize
(
prop
.
getReceiverParameter
().
getType
());
sb
.
append
(
"."
);
}
sb
.
append
(
prop
.
getName
());
sb
.
append
(
": "
);
serialize
(
prop
.
getOutType
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录