Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
225c9b4f
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,发现更多精彩内容 >>
提交
225c9b4f
编写于
4月 27, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
java classes should extend java.lang.Object
#KT-1121 fixed
上级
d67cc468
变更
57
隐藏空白更改
内联
并排
Showing
57 changed file
with
122 addition
and
71 deletion
+122
-71
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+29
-4
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
...ava/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
+26
-0
compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
+1
-1
compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
+1
-1
compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
+1
-1
compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
+1
-1
compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
...ler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
+1
-1
compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
...er/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
+1
-1
compiler/testData/readJavaBinaryClass/FieldAsVar.kt
compiler/testData/readJavaBinaryClass/FieldAsVar.kt
+1
-1
compiler/testData/readJavaBinaryClass/FieldAsVar.txt
compiler/testData/readJavaBinaryClass/FieldAsVar.txt
+1
-1
compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
+1
-1
compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
+1
-1
compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
+1
-1
compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
+1
-1
compiler/testData/readJavaBinaryClass/InnerClass.kt
compiler/testData/readJavaBinaryClass/InnerClass.kt
+2
-2
compiler/testData/readJavaBinaryClass/InnerClass.txt
compiler/testData/readJavaBinaryClass/InnerClass.txt
+2
-2
compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
...stData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
+2
-2
compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
...tData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
+2
-2
compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
...ler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
+3
-3
compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
...er/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
+3
-3
compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
...tData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
+2
-2
compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
...Data/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
+2
-2
compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
+1
-1
compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
+1
-1
compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
+1
-1
compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
+1
-1
compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
.../testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
+1
-1
compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
...testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
+1
-1
compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
+1
-1
compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
+1
-1
compiler/testData/readJavaBinaryClass/MyException.kt
compiler/testData/readJavaBinaryClass/MyException.kt
+1
-1
compiler/testData/readJavaBinaryClass/MyException.txt
compiler/testData/readJavaBinaryClass/MyException.txt
+1
-1
compiler/testData/readJavaBinaryClass/Simple.kt
compiler/testData/readJavaBinaryClass/Simple.kt
+1
-1
compiler/testData/readJavaBinaryClass/Simple.txt
compiler/testData/readJavaBinaryClass/Simple.txt
+1
-1
compiler/testData/readJavaBinaryClass/TwoFields.kt
compiler/testData/readJavaBinaryClass/TwoFields.kt
+1
-1
compiler/testData/readJavaBinaryClass/TwoFields.txt
compiler/testData/readJavaBinaryClass/TwoFields.txt
+1
-1
compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
...estData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
+1
-1
compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
...stData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
.../readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
...readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
...ta/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
...a/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
...iler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
...ler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
...iler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
...ler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
.../readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
...readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
+1
-1
compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
...iler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
+1
-1
compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt
...iler/testData/readJavaBinaryClass/notNull/NotNullField.kt
+1
-1
compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt
...ler/testData/readJavaBinaryClass/notNull/NotNullField.txt
+1
-1
compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
...ler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
+1
-1
compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
...er/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
+1
-1
compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt
.../testData/readJavaBinaryClass/notNull/NotNullParameter.kt
+1
-1
compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt
...testData/readJavaBinaryClass/notNull/NotNullParameter.txt
+1
-1
libraries/stdlib/src/kotlin/Ordering.kt
libraries/stdlib/src/kotlin/Ordering.kt
+3
-3
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
225c9b4f
...
...
@@ -356,6 +356,15 @@ public class JavaDescriptorResolver {
@Nullable
private
ClassDescriptor
resolveJavaLangObject
()
{
ClassDescriptor
clazz
=
resolveClass
(
JdkNames
.
JL_OBJECT
.
getFqName
(),
DescriptorSearchRule
.
IGNORE_IF_FOUND_IN_KOTLIN
);
if
(
clazz
==
null
)
{
// TODO: warning
}
return
clazz
;
}
@Nullable
public
ClassDescriptor
resolveClass
(
@NotNull
FqName
qualifiedName
,
@NotNull
DescriptorSearchRule
searchRule
)
{
List
<
Runnable
>
tasks
=
Lists
.
newArrayList
();
...
...
@@ -466,7 +475,7 @@ public class JavaDescriptorResolver {
"class "
+
psiClass
.
getQualifiedName
());
// TODO: ugly hack: tests crash if initializeTypeParameters called with class containing proper supertypes
supertypes
.
addAll
(
getSupertypes
(
new
PsiClassWrapper
(
psiClass
),
classData
.
classDescriptor
,
classData
.
getTypeParameters
()));
supertypes
.
addAll
(
getSupertypes
(
new
PsiClassWrapper
(
psiClass
),
classData
,
classData
.
getTypeParameters
()));
PsiMethod
[]
psiConstructors
=
psiClass
.
getConstructors
();
...
...
@@ -599,7 +608,7 @@ public class JavaDescriptorResolver {
classDescriptorCache
.
put
(
fqName
,
classData
);
classData
.
classDescriptor
.
setSupertypes
(
getSupertypes
(
new
PsiClassWrapper
(
classObjectPsiClass
),
classData
.
classDescriptor
,
new
ArrayList
<
TypeParameterDescriptor
>(
0
)));
classData
.
classDescriptor
.
setSupertypes
(
getSupertypes
(
new
PsiClassWrapper
(
classObjectPsiClass
),
classData
,
new
ArrayList
<
TypeParameterDescriptor
>(
0
)));
classData
.
classDescriptor
.
setName
(
JetPsiUtil
.
NO_NAME_PROVIDED
);
// TODO
classData
.
classDescriptor
.
setModality
(
Modality
.
FINAL
);
classData
.
classDescriptor
.
setVisibility
(
containing
.
getVisibility
());
...
...
@@ -862,7 +871,9 @@ public class JavaDescriptorResolver {
}
}
private
Collection
<
JetType
>
getSupertypes
(
PsiClassWrapper
psiClass
,
ClassDescriptor
classDescriptor
,
List
<
TypeParameterDescriptor
>
typeParameters
)
{
private
Collection
<
JetType
>
getSupertypes
(
PsiClassWrapper
psiClass
,
ResolverBinaryClassData
classData
,
List
<
TypeParameterDescriptor
>
typeParameters
)
{
ClassDescriptor
classDescriptor
=
classData
.
classDescriptor
;
final
List
<
JetType
>
result
=
new
ArrayList
<
JetType
>();
String
context
=
"class "
+
psiClass
.
getQualifiedName
();
...
...
@@ -908,7 +919,21 @@ public class JavaDescriptorResolver {
}
if
(
result
.
isEmpty
())
{
result
.
add
(
JetStandardClasses
.
getAnyType
());
if
(
classData
.
kotlin
||
psiClass
.
getQualifiedName
().
equals
(
JdkNames
.
JL_OBJECT
.
getFqName
().
getFqName
())
// TODO: annotations
||
classDescriptor
.
getKind
()
==
ClassKind
.
ANNOTATION_CLASS
)
{
result
.
add
(
JetStandardClasses
.
getAnyType
());
}
else
{
ClassDescriptor
object
=
resolveJavaLangObject
();
if
(
object
!=
null
)
{
result
.
add
(
object
.
getDefaultType
());
}
else
{
result
.
add
(
JetStandardClasses
.
getAnyType
());
}
}
}
return
result
;
}
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
0 → 100644
浏览文件 @
225c9b4f
/*
* Copyright 2010-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jetbrains.jet.lang.resolve.java
;
/**
* @author Stepan Koltsov
*/
public
class
JdkNames
{
public
static
final
JvmClassName
JL_OBJECT
=
new
JvmClassName
(
"java.lang.Object"
);
}
compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
浏览文件 @
225c9b4f
package
test
class
ClassWithTypeParameter
<
erased
P
>()
{
class
ClassWithTypeParameter
<
erased
P
>()
:
java
.
lang
.
Object
()
{
}
compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
浏览文件 @
225c9b4f
namespace test
final class test.ClassWithTypeParameter</*0*/ P : jet.Any?> : j
et.Any
{
final class test.ClassWithTypeParameter</*0*/ P : jet.Any?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeParameter<P>
}
compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
浏览文件 @
225c9b4f
package
test
class
ClassWithTypeParameter
<
erased
P
,
erased
Q
:
P
>()
{
class
ClassWithTypeParameter
<
erased
P
,
erased
Q
:
P
>()
:
java
.
lang
.
Object
()
{
}
compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
浏览文件 @
225c9b4f
namespace test
final class test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P> : j
et.Any
{
final class test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypeParameter<P, Q>
}
compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
浏览文件 @
225c9b4f
package
test
class
ClassWithTypePRefSelf
<
erased
P
:
java
.
lang
.
Enum
<
P
>?>()
{
class
ClassWithTypePRefSelf
<
erased
P
:
java
.
lang
.
Enum
<
P
>?>()
:
java
.
lang
.
Object
()
{
}
compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
浏览文件 @
225c9b4f
namespace test
final class test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?> : j
et.Any
{
final class test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : java.lang.Enum<P>?><init>(): test.ClassWithTypePRefSelf<P>
}
compiler/testData/readJavaBinaryClass/FieldAsVar.kt
浏览文件 @
225c9b4f
package
test
class
FieldAsVar
()
{
class
FieldAsVar
()
:
java
.
lang
.
Object
()
{
var
f
:
Int
=
1
}
compiler/testData/readJavaBinaryClass/FieldAsVar.txt
浏览文件 @
225c9b4f
namespace test
final class test.FieldAsVar : j
et.Any
{
final class test.FieldAsVar : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.FieldAsVar
final var f: jet.Int
}
compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
浏览文件 @
225c9b4f
package
test
open
class
FieldOfArrayType
()
{
open
class
FieldOfArrayType
()
:
java
.
lang
.
Object
()
{
var
files
:
Array
<
java.io.
File
?
>?
=
null
}
compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
浏览文件 @
225c9b4f
namespace test
open class test.FieldOfArrayType : j
et.Any
{
open class test.FieldOfArrayType : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.FieldOfArrayType
final var files: jet.Array<java.io.File?>?
}
compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
浏览文件 @
225c9b4f
package
test
class
FinalFieldAsVal
()
{
class
FinalFieldAsVal
()
:
java
.
lang
.
Object
()
{
val
f
:
Int
=
1
}
compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
浏览文件 @
225c9b4f
namespace test
final class test.FinalFieldAsVal : j
et.Any
{
final class test.FinalFieldAsVal : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.FinalFieldAsVal
final val f: jet.Int
}
compiler/testData/readJavaBinaryClass/InnerClass.kt
浏览文件 @
225c9b4f
package
test
open
class
Outer
()
{
open
class
Inner
()
open
class
Outer
()
:
java
.
lang
.
Object
()
{
open
class
Inner
()
:
java
.
lang
.
Object
()
}
compiler/testData/readJavaBinaryClass/InnerClass.txt
浏览文件 @
225c9b4f
namespace test
open class test.Outer : j
et.Any
{
open class test.Outer : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.Outer
open class test.Outer.Inner : j
et.Any
{
open class test.Outer.Inner : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.Outer.Inner
}
}
compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
浏览文件 @
225c9b4f
package
test
open
class
Outer
<
erased
P
>()
{
open
class
Inner
<
erased
Q
:
P
>()
open
class
Outer
<
erased
P
>()
:
java
.
lang
.
Object
()
{
open
class
Inner
<
erased
Q
:
P
>()
:
java
.
lang
.
Object
()
}
compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
浏览文件 @
225c9b4f
namespace test
open class test.Outer</*0*/ P : jet.Any?> : j
et.Any
{
open class test.Outer</*0*/ P : jet.Any?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer<P>
open class test.Outer.Inner</*0*/ Q : P> : j
et.Any
{
open class test.Outer.Inner</*0*/ Q : P> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ Q : P><init>(): test.Outer.Inner<Q>
}
}
compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
浏览文件 @
225c9b4f
package
test
trait
Trait
<
erased
P
>
trait
Trait
<
erased
P
>
:
java
.
lang
.
Object
open
class
Outer
<
erased
P
,
erased
Q
>()
{
open
class
Inner
()
{
open
class
Outer
<
erased
P
,
erased
Q
>()
:
java
.
lang
.
Object
()
{
open
class
Inner
()
:
java
.
lang
.
Object
()
{
}
open
class
Inner2
()
:
Inner
(),
Trait
<
P
>
{
...
...
compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
浏览文件 @
225c9b4f
namespace test
open class test.Outer</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : j
et.Any
{
open class test.Outer</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.Outer<P, Q>
open class test.Outer.Inner : j
et.Any
{
open class test.Outer.Inner : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.Outer.Inner
}
open class test.Outer.Inner2 : test.Outer.Inner, test.Trait<P> {
final /*constructor*/ fun <init>(): test.Outer.Inner2
}
}
abstract trait test.Trait</*0*/ P : jet.Any?> : j
et.Any
{
abstract trait test.Trait</*0*/ P : jet.Any?> : j
ava.lang.Object
{
}
compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
浏览文件 @
225c9b4f
package
test
class
Outer
<
erased
P
>()
{
class
Inner
()
{
class
Outer
<
erased
P
>()
:
java
.
lang
.
Object
()
{
class
Inner
()
:
java
.
lang
.
Object
()
{
fun
f
<
erased
Q
:
P
>()
{}
}
}
compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
浏览文件 @
225c9b4f
namespace test
final class test.Outer</*0*/ P : jet.Any?> : j
et.Any
{
final class test.Outer</*0*/ P : jet.Any?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer<P>
final class test.Outer.Inner : j
et.Any
{
final class test.Outer.Inner : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.Outer.Inner
final fun </*0*/ Q : P>f(): jet.Tuple0
}
...
...
compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
浏览文件 @
225c9b4f
package
test
class
MethodWithTypeP
()
{
class
MethodWithTypeP
()
:
java
.
lang
.
Object
()
{
fun
<
erased
P
>
f
()
=
#
()
}
compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
浏览文件 @
225c9b4f
namespace test
final class test.MethodWithTypeP : j
et.Any
{
final class test.MethodWithTypeP : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.MethodWithTypeP
final fun </*0*/ P : jet.Any?>f(): jet.Tuple0
}
compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
浏览文件 @
225c9b4f
package
test
class
MethodWithTypePP
()
{
class
MethodWithTypePP
()
:
java
.
lang
.
Object
()
{
fun
<
erased
P
,
erased
Q
:
P
>
f
()
=
#
()
}
compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
浏览文件 @
225c9b4f
namespace test
final class test.MethodWithTypePP : j
et.Any
{
final class test.MethodWithTypePP : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.MethodWithTypePP
final fun </*0*/ P : jet.Any?, /*1*/ Q : P>f(): jet.Tuple0
}
compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
浏览文件 @
225c9b4f
package
test
open
class
MethodWithTypePRefClassP
<
erased
P
>()
{
open
class
MethodWithTypePRefClassP
<
erased
P
>()
:
java
.
lang
.
Object
()
{
fun
<
erased
Q
:
P
>
f
()
=
#
()
}
compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
浏览文件 @
225c9b4f
namespace test
open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : j
et.Any
{
open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP<P>
final fun </*0*/ Q : P>f(): jet.Tuple0
}
compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
浏览文件 @
225c9b4f
package
test
final
class
MethosWithPRefTP
()
{
final
class
MethosWithPRefTP
()
:
java
.
lang
.
Object
()
{
fun
<
erased
P
>
f
(
p0
:
P
?)
=
#
()
}
compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
浏览文件 @
225c9b4f
namespace test
final class test.MethosWithPRefTP : j
et.Any
{
final class test.MethosWithPRefTP : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.MethosWithPRefTP
final fun </*0*/ P : jet.Any?>f(/*0*/ p0: P?): jet.Tuple0
}
compiler/testData/readJavaBinaryClass/MyException.kt
浏览文件 @
225c9b4f
package
test
open
class
MyException
(
p0
:
String
?,
p1
:
Throwable
?)
open
class
MyException
(
p0
:
String
?,
p1
:
Throwable
?)
:
java
.
lang
.
Object
()
compiler/testData/readJavaBinaryClass/MyException.txt
浏览文件 @
225c9b4f
namespace test
open class test.MyException : j
et.Any
{
open class test.MyException : j
ava.lang.Object
{
final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?): test.MyException
}
compiler/testData/readJavaBinaryClass/Simple.kt
浏览文件 @
225c9b4f
package
test
class
Simple
()
class
Simple
()
:
java
.
lang
.
Object
()
compiler/testData/readJavaBinaryClass/Simple.txt
浏览文件 @
225c9b4f
namespace test
final class test.Simple : j
et.Any
{
final class test.Simple : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.Simple
}
compiler/testData/readJavaBinaryClass/TwoFields.kt
浏览文件 @
225c9b4f
package
test
class
TwoFields
()
{
class
TwoFields
()
:
java
.
lang
.
Object
()
{
var
a
:
Int
=
1
var
b
:
Short
=
2
;
}
compiler/testData/readJavaBinaryClass/TwoFields.txt
浏览文件 @
225c9b4f
namespace test
final class test.TwoFields : j
et.Any
{
final class test.TwoFields : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.TwoFields
final var a: jet.Int
final var b: jet.Short
...
...
compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
浏览文件 @
225c9b4f
...
...
@@ -2,6 +2,6 @@ package test
annotation
class
Aaa
open
class
HasAnnotatedMethod
()
{
open
class
HasAnnotatedMethod
()
:
java
.
lang
.
Object
()
{
open
Aaa
fun
f
():
Unit
{
}
}
compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
浏览文件 @
225c9b4f
namespace test
open class test.HasAnnotatedMethod : j
et.Any
{
open class test.HasAnnotatedMethod : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.HasAnnotatedMethod
open test.Aaa() fun f(): jet.Tuple0
}
...
...
compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
浏览文件 @
225c9b4f
package
test
open
class
DifferentGetterAndSetter
()
{
open
class
DifferentGetterAndSetter
()
:
java
.
lang
.
Object
()
{
open
fun
setSomething
(
p0
:
String
?):
Unit
{
}
open
fun
getSomething
()
=
17
}
compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
浏览文件 @
225c9b4f
namespace test
open class test.DifferentGetterAndSetter : j
et.Any
{
open class test.DifferentGetterAndSetter : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.DifferentGetterAndSetter
open fun getSomething(): jet.Int
open fun setSomething(/*0*/ p0: jet.String?): jet.Tuple0
...
...
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
浏览文件 @
225c9b4f
package
test
trait
JavaBeanAbstractGetter
{
trait
JavaBeanAbstractGetter
:
java
.
lang
.
Object
{
//final val red: Int
abstract
fun
getRed
():
Int
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
浏览文件 @
225c9b4f
namespace test
abstract trait test.JavaBeanAbstractGetter : j
et.Any
{
abstract trait test.JavaBeanAbstractGetter : j
ava.lang.Object
{
abstract fun getRed(): jet.Int
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
浏览文件 @
225c9b4f
package
test
open
class
JavaBeanVal
()
{
open
class
JavaBeanVal
()
:
java
.
lang
.
Object
()
{
open
fun
getColor
():
String
?
=
""
//val color: String? = ""
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
浏览文件 @
225c9b4f
namespace test
open class test.JavaBeanVal : j
et.Any
{
open class test.JavaBeanVal : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.JavaBeanVal
open fun getColor(): jet.String?
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
浏览文件 @
225c9b4f
package
test
open
class
JavaBeanVal
()
{
open
class
JavaBeanVal
()
:
java
.
lang
.
Object
()
{
open
fun
getColor
():
String
?
=
""
open
fun
setColor
(
p0
:
String
?):
Unit
{
}
//var color: String? = ""
...
...
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
浏览文件 @
225c9b4f
namespace test
open class test.JavaBeanVal : j
et.Any
{
open class test.JavaBeanVal : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.JavaBeanVal
open fun getColor(): jet.String?
open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0
...
...
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
浏览文件 @
225c9b4f
...
...
@@ -2,7 +2,7 @@ package test
import
java.util.ArrayList
open
class
JavaBeanVarOfGenericType
<
erased
P
>
{
open
class
JavaBeanVarOfGenericType
<
erased
P
>
()
:
java
.
lang
.
Object
()
{
open
fun
getCharacters
():
ArrayList
<
P
>?
=
null
open
fun
setCharacters
(
p0
:
ArrayList
<
P
>?)
{
}
//var characters: ArrayList<P>? = null
...
...
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
浏览文件 @
225c9b4f
namespace test
open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : j
et.Any
{
open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : j
ava.lang.Object
{
final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType<P>
open fun getCharacters(): java.util.ArrayList<P>?
open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
...
...
compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
浏览文件 @
225c9b4f
package
test
open
class
TwoSetters
()
{
open
class
TwoSetters
()
:
java
.
lang
.
Object
()
{
open
fun
setSize
(
p0
:
String
?)
{
}
open
fun
setSize
(
p0
:
Int
)
{
}
}
compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
浏览文件 @
225c9b4f
namespace test
open class test.TwoSetters : j
et.Any
{
open class test.TwoSetters : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.TwoSetters
open fun setSize(/*0*/ p0: jet.Int): jet.Tuple0
open fun setSize(/*0*/ p0: jet.String?): jet.Tuple0
...
...
compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt
浏览文件 @
225c9b4f
package
test;
open
class
NotNullField
()
{
open
class
NotNullField
()
:
java
.
lang
.
Object
()
{
var
hi
:
String
=
""
;
}
compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt
浏览文件 @
225c9b4f
namespace test
open class test.NotNullField : j
et.Any
{
open class test.NotNullField : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.NotNullField
final var hi: jet.String
}
compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
浏览文件 @
225c9b4f
package
test
open
class
NotNullMethod
()
{
open
class
NotNullMethod
()
:
java
.
lang
.
Object
()
{
open
fun
hi
():
String
=
""
}
compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
浏览文件 @
225c9b4f
namespace test
open class test.NotNullMethod : j
et.Any
{
open class test.NotNullMethod : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.NotNullMethod
open fun hi(): jet.String
}
compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt
浏览文件 @
225c9b4f
package
test
open
class
NotNullParameter
()
{
open
class
NotNullParameter
()
:
java
.
lang
.
Object
()
{
open
fun
hi
(
p0
:
String
):
Unit
{
}
}
compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt
浏览文件 @
225c9b4f
namespace test
open class test.NotNullParameter : j
et.Any
{
open class test.NotNullParameter : j
ava.lang.Object
{
final /*constructor*/ fun <init>(): test.NotNullParameter
open fun hi(/*0*/ p0: jet.String): jet.Tuple0
}
libraries/stdlib/src/kotlin/Ordering.kt
浏览文件 @
225c9b4f
...
...
@@ -54,7 +54,7 @@ public inline fun <T> comparator(vararg functions: Function1<T,Any?>): Comparato
private
class
FunctionComparator
<
T
>(
val
functions
:
Array
<
Function1
<
T
,
Any
?
>>):
Comparator
<
T
>
{
public
fun
toString
():
String
{
public
override
fun
toString
():
String
{
return
"FunctionComparator${functions.toList()}"
}
...
...
@@ -75,7 +75,7 @@ public inline fun <T> comparator(fn: (T,T) -> Int): Comparator<T> {
}
private
class
Function2Comparator
<
T
>(
val
compareFn
:
(
T
,
T
)
->
Int
):
Comparator
<
T
>
{
public
fun
toString
():
String
{
public
override
fun
toString
():
String
{
return
"Function2Comparator${compareFn}"
}
...
...
@@ -89,4 +89,4 @@ private class Function2Comparator<T>(val compareFn: (T,T) -> Int): Comparator<T
public
override
fun
equals
(
obj
:
Any
?):
Boolean
{
return
this
==
obj
}
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录