Stanislav Erokhin
bcaa755c4e
Fix compilation.
...
- rename isFinal extension property to avoid ambiguity with synthetic property in DeserializedClassTypeConstructor
- add explicit parameter to lambda File.listFiles
- return true from lambda Query.forEach
2015-12-18 22:49:26 +03:00
Stanislav Erokhin
c725ed47f5
Replaced ReceiverValue.NO_RECEIVER to null.
2015-12-15 23:09:20 +03:00
Pavel V. Talanov
3f0d71411e
KtDecompiledFile: hack to be able to navigate to builtIns on jvm
...
Which sometimes are loaded differently than they are rendered (see BuiltInClassesAreSerializableOnJvm)
2015-12-15 20:22:06 +03:00
Zalim Bashorov
976fbf32ba
Minor: use List instead of Array as container in chained scopes
2015-12-15 20:07:37 +03:00
Zalim Bashorov
5008a66a5b
ChainedScope -> ChainedMemberScope
2015-12-15 20:07:36 +03:00
Alexander Udalov
6f347f351a
Load annotations on compiled Kotlin enum entries
...
#KT-10339 Fixed
2015-12-13 03:52:42 +03:00
Alexander Udalov
3e2eb8c1a0
Serialize/deserialize annotations on enum entries
...
#KT-10338 Fixed
2015-12-13 03:52:41 +03:00
Denis Zharkov
871fe7680b
Load special override as HIDDEN in case of signature clash
...
#KT-10151 Fixed
2015-12-11 22:41:03 +03:00
Denis Zharkov
45c0bc3610
Add 'subClassDescriptor' parameter to ExternalOverridabilityCondition
2015-12-11 22:41:03 +03:00
Denis Zharkov
417ff281ee
Split getOverriddenBuiltinWithJvmDescriptor into two extensions
2015-12-11 22:41:02 +03:00
Stanislav Erokhin
1dca49cecc
Workaround for tower resolution algorithm in kotlin code. Will be investigated.
2015-12-11 17:01:01 +03:00
Mikhail Glukhikh
521b216602
Migration: Enum.values to Enum.values()
2015-12-11 11:11:38 +03:00
Pavel V. Talanov
280e00981f
Load java: load annotations on enum entries
2015-12-10 11:12:23 +03:00
Mikhail Glukhikh
9a4eb2a368
Refactoring: ClassDescriptor.isFinal, no more Modality.isOverridable
2015-12-09 19:27:47 +03:00
Mikhail Glukhikh
5b72afe8a0
J2K: Modality.kt
2015-12-09 19:19:00 +03:00
Stanislav Erokhin
11c86405bf
Fix ClassKind for Serializable and change ClassKind to INTERFACE for error classes.
2015-12-08 00:16:16 +03:00
Denis Zharkov
95cecdbc42
Support overrides of generic methods with erased version in Java
2015-12-03 18:19:36 +03:00
Denis Zharkov
4f06cece37
Refactor external overidability conditions
...
Before this change they could only negatively affect on result
Now they may force success result
Also refine overridavility condition for java fields:
two java fields having the same name are seen as overrides even
if they have different type
2015-12-03 18:19:36 +03:00
Denis Zharkov
8838e46578
Do not create KotlinTypeImpl with error scope while erasing
...
See assertion in KotlinTypeImpl init block
2015-12-03 18:19:36 +03:00
Denis Zharkov
e2b51f30ed
Extract 'doSubstitute' parameters into SubstitutionConfiguration
2015-12-03 18:19:36 +03:00
Stanislav Erokhin
8807cd828f
Removed MemberScope.getPackage
2015-12-01 15:38:04 +03:00
Denis Zharkov
6292833a69
Refine generic signature for Map.get/remove
...
Before this change generic signature wasn't written because of wrong
assumption about it absence in all cases where we replace generic parameter
with Object
2015-12-01 08:21:00 +03:00
Denis Zharkov
20cbceb56d
Add temporary hack for wildcards in Collections
...
By default we would render 'MutableCollection<String>.addAll(Collection<String>)' as
'(LCollection<String>;)' (without wildcard) because String is final and
effectively it's the same as '(LCollection<? extends String>;)'.
But that's wrong signature in a sense that java.util.Collection has different
signature: '(LCollection<? extends E>)'.
Actually the problem is much wider than collections,
it concerns any Java code that uses Kotlin classes with covariant
parameters without '? extends E' wildcards.
Temporary solution is just to hardcode/enumerate builtin methods
with special signature.
2015-12-01 08:20:59 +03:00
Ilya Gorbunov
e5dd719eec
Fix warning about incompatible types.
2015-12-01 01:35:19 +03:00
Alexander Udalov
9e7e75de12
Rename ExternalSignatureResolver -> SignaturePropagator
2015-11-27 23:34:47 +03:00
Alexander Udalov
57e75a1b28
Drop deprecated code in ModuleMapping, add TODO
2015-11-27 23:34:46 +03:00
Alexander Udalov
fb61dc7e81
Fix potential deadlock on lazy vs storage manager
2015-11-27 21:41:26 +03:00
Alexander Udalov
caa6cdb3f7
Remove obsolete code in KotlinBuilder, rename PackageClassUtils
2015-11-27 21:41:26 +03:00
Alexander Udalov
8594cfca46
Remove kotlin.jvm.internal.KotlinPackage and corresponding code
2015-11-27 21:22:04 +03:00
Alexander Udalov
8a5b63a669
Inline PLATFORM_TYPES = true, simplify signature propagation
2015-11-27 21:22:04 +03:00
Alexander Udalov
417a27f3b1
Minor, get rid of AlternativeMethodSignature in irrelevant place
2015-11-27 21:22:04 +03:00
Alexander Udalov
fa34ebac4a
Delete KotlinSignature and corresponding code
2015-11-27 21:22:04 +03:00
Yan Zhulanow
46ac3571d5
Fix "infix modifier required" errors in project
2015-11-27 15:51:11 +03:00
Zalim Bashorov
d1c5bd4526
Minor: remove unused parameter from LookupTracker.record
2015-11-27 15:08:06 +03:00
Denis Zharkov
a2627431f8
Minor. Cleanup and refine naming
2015-11-17 16:27:02 +03:00
Denis Zharkov
3b2719735e
Setup default values for type-safe bridges
...
#KT-9973 In Progress
2015-11-17 16:27:01 +03:00
Denis Zharkov
f5a086140e
Refine special bridge generating rule
...
Generate special bridge even in case current class has Kotlin superclass implementing
this builtin method, but that super class was generated without special bridge
(e.g. because it would have the same signature)
#KT-9901 Fixed
2015-11-17 15:41:49 +03:00
Valentin Kipyatkov
2e2dfcb4a0
"invoke" from function types do not have any meaningful parameter names
2015-11-16 18:24:37 +03:00
Denis Zharkov
188bcf0a03
Introduce TypeConstructorSubstitution.create
...
After latest changes type constructors of inner classes contains
additional type parameters that are copies of ones from outer class.
Their indices are correct, but they used only for subtyping check,
all entries within inner classes are still refers to original
descriptors having different indices.
Example:
class Outer<E> {
inner class Inner<F> { // Inner's type constructor looks like Inner<F, E>
fun foo(): E // refers to E in outer having index 0
}
}
Indexed substitution does not work here because of intersecting indices,
so we replace it with common map substituion in such cases.
2015-11-13 14:47:29 +03:00
Denis Zharkov
990bd7e71d
Correct parameters of inner's class type constructor
...
Now it contains copies of outer's class constructor parameters
They are appended just after real type parameters
2015-11-13 14:47:28 +03:00
Denis Zharkov
d614adcd2a
Obtain type parameters of constructor from containing class
...
Effectively this commit is just inlining of 'typeParameters' parameter
2015-11-13 14:47:28 +03:00
Denis Zharkov
c9aa75259b
Introduce ClassDescriptor.declaredTypeParameters
...
Should be a subset of type constructor's parameters
2015-11-13 14:47:28 +03:00
Ilya Gorbunov
16d56355c3
Special crafting of ClassId when implClassName is nested DefaultImpls
2015-11-11 03:53:20 +03:00
Dmitry Jemerov
e64a270d1a
more renames to get rid of "Jet" in class and method names
2015-11-09 19:07:11 +01:00
Ilya Gorbunov
f3ff2e2e76
Replace deprecated join with joinToString
2015-11-06 01:12:00 +03:00
Stanislav Erokhin
55157df3eb
Removed MemberScope.ownerDescriptor
2015-11-06 00:01:35 +03:00
Stanislav Erokhin
22f78b148c
Removed usages of MemberScope.ownerDescriptor property.
2015-11-06 00:01:34 +03:00
Stanislav Erokhin
b8e828e040
Minor. Changed signature of SamConversionResolver.resolveSamConstructor
2015-11-06 00:01:33 +03:00
Stanislav Erokhin
c4582d0e0c
Replace function MemberScope.getContainingDeclaration() to property ownerDescriptor
2015-11-06 00:01:30 +03:00
Stanislav Erokhin
2c3f58eeb7
Renamed methods in MemberScope from getSmth to getContributedSmth
2015-11-05 14:34:00 +03:00