azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,888 Commits 1 Branch 0 Tags
c73ac97ecfbbdd1dcdeb96aa7acaa4673eb38de5
Commit Graph

85 Commits

Author SHA1 Message Date
Alexander Udalov 8cb1c7f0e6 Pass NameResolver to loadClassAnnotations() 
It's not used at the moment, but will be in the upcoming implementation of
annotation loader (for JS, built-ins and type annotations)
 2014-11-26 17:27:08 +03:00
Alexander Udalov 4e735878cf Minor, add "storageManager" property to context for convenience 2014-11-25 23:16:28 +03:00
Alexander Udalov c35ddc3616 Minor, make ownTypeParameters a property in TypeDeserializer 2014-11-25 23:16:28 +03:00
Alexander Udalov 3a066dfd07 Rename "context" -> "c" in deserialization for brevity 2014-11-25 23:16:27 +03:00
Alexander Udalov 1c04a6052f Get rid of unnecessary list in Interner 2014-11-25 23:16:27 +03:00
Alexander Udalov 1f68c94ce6 Fix several bugs in serialization of inner generic classes 
- Interner was working incorrectly with parents
- nested classes were serialized in codegen out of any context

 #KT-5660 Fixed
 2014-11-25 23:16:26 +03:00
Alexander Udalov 36c65e4264 Minor, drop strange method from SerializerExtension 2014-11-25 23:16:26 +03:00
Alexander Udalov 60662e5831 Fix double laziness of annotations introduced in 149a90d 2014-11-25 23:16:21 +03:00
Alexander Udalov ab6fec1540 Simplify type deserializer construction even more 2014-11-25 23:15:50 +03:00
Alexander Udalov 2b189c5193 Convert TypeDeserializer to Kotlin 2014-11-25 23:15:49 +03:00
Alexander Udalov c9bef09085 Extract DeserializedType to top level and convert to Kotlin 2014-11-25 23:15:49 +03:00
Alexander Udalov 07c3a07ecb Make DeserializedType a static nested class 2014-11-25 23:15:49 +03:00
Alexander Udalov 5907df92db Drop secondary DeserializedPackageMemberScope constructor 
Create package context only once
 2014-11-25 23:15:49 +03:00
Alexander Udalov a4d4d15ca9 Improve code after conversion, fix some warnings 2014-11-25 23:15:48 +03:00
Alexander Udalov d3635de205 Convert MemberDeserializer to Kotlin 2014-11-25 23:15:48 +03:00
Alexander Udalov 9c80801c3a Rename MemberDeserializer.java -> .kt 2014-11-25 23:15:48 +03:00
Alexander Udalov 954678ab2b Minor, simplify MemberDeserializer.getAnnotations() 2014-11-25 23:15:47 +03:00
Alexander Udalov 4df7cb4e72 Major refactoring of deserialization contexts: merge two into one 2014-11-25 23:15:47 +03:00
Alexander Udalov cb5c21e831 Merge DeserializationGlobalContext with DeserializationComponents 2014-11-25 23:15:47 +03:00
Alexander Udalov aa1fa7063e Minor, drop one of "withTypes" in favor of default arguments 2014-11-25 23:15:47 +03:00
Alexander Udalov 1a84ade232 Minor, rename field deserializer -> memberDeserializer 2014-11-25 23:15:46 +03:00
Alexander Udalov cfa484f760 Introduce DeserializationComponents 
Decouple components from the state present in contexts, get rid of duplication
of parameters in each context
 2014-11-25 23:15:46 +03:00
Alexander Udalov fc0f83cbdb Minor, change parameter order, reformat 2014-11-25 23:15:46 +03:00
Alexander Udalov eadf9a13b9 Untangle circular dependency of TypeDeserializer and context 2014-11-25 23:15:46 +03:00
Alexander Udalov ea3778d5be Use outer class context in ClassDeserializer 2014-11-25 23:15:45 +03:00
Andrey Breslav 8f26bc646e Fix containing declarations for deserialized type parameters of top-level functions 2014-11-25 23:15:45 +03:00
Pavel V. Talanov 40addaed13 Fix wrong deserialization order 
For case when property and function have the same name or
extension and non-extension member have the same name
 2014-11-14 17:09:14 +03:00
Pavel V. Talanov c9bdba8e20 Minor: comment 2014-11-14 16:18:34 +03:00
Pavel V. Talanov 2d4d1caf17 Improve filtering descriptors in DeserializedMemberScope 2014-11-14 16:18:33 +03:00
Pavel V. Talanov 8016766b23 Extension/non-Extension members are deserialized in correct order 2014-11-14 16:18:33 +03:00
Pavel V. Talanov 8e1111d690 Deserialized scope descriptor order synced with serialization order 
That introduces implicit dependency of deserialization on MemberComparator
 2014-11-14 16:18:32 +03:00
Pavel V. Talanov 847ccde099 Refactor DeserializedClassDescriptor: separate nested classes and enum entries logic 2014-11-14 16:18:31 +03:00
Pavel V. Talanov 9ddde7ca38 Do not put enum entry names into unordered set in deserialized classes 2014-11-14 16:18:30 +03:00
Pavel V. Talanov 5b009e216f Minor: comment 2014-11-14 16:18:30 +03:00
Pavel V. Talanov 77dd027d69 Use MemberComparator in DescriptorSerializer 2014-11-14 16:18:29 +03:00
Pavel V. Talanov 5ffa66ffc3 Do not put nested class names in unordered set for deserialized classes 2014-11-14 16:18:26 +03:00
Pavel V. Talanov 52f7999bee Stable order of member descriptors in DeserializedMemberScope 2014-11-14 16:18:25 +03:00
Pavel V. Talanov 5be30ab81d Add validation that deserialized members are sorted accordingly 2014-11-14 16:18:25 +03:00
Valentin Kipyatkov b13c0f2248 Renamed methods 2014-11-12 21:57:50 +03:00
Valentin Kipyatkov 5f5d2de5e0 Moved KindFilter and DescriptorKindExclude out of JetScope, moved constants as well and renamed them 2014-11-12 21:57:49 +03:00
Valentin Kipyatkov 95b3885aa5 Refactored filtering by descriptor kind so that no knowledge about SAM-constructors required in core 2014-11-12 21:25:02 +03:00
Valentin Kipyatkov 6f2da4930a Descriptor kind filter replaced with bit mask 2014-11-12 21:24:59 +03:00
Valentin Kipyatkov 43df891515 More precise descriptor kind filtering (preparing to optimize smart completion) 2014-11-12 21:24:59 +03:00
Valentin Kipyatkov d744575000 DeserializedPackageMemberScope uses kind and name filters 2014-11-12 21:24:58 +03:00
Valentin Kipyatkov c7527e4a4d Name filters filter by Name instead of String 2014-11-12 21:24:57 +03:00
Valentin Kipyatkov 760b9c4389 Added JetScope.getDescriptors(nameFilter, kindFilter) but the filters are never used yet 2014-11-12 21:24:55 +03:00
Valentin Kipyatkov 19f50960ca Code improvements after conversion to Kotlin 2014-11-05 21:42:16 +03:00
Valentin Kipyatkov 7a4bd79acc Converted to Kotlin 2014-11-05 21:42:16 +03:00
Valentin Kipyatkov 18c604bdf0 Renamed file to keep history 2014-11-05 21:42:15 +03:00
Valentin Kipyatkov e2e7210b37 Converted DeserializedPackageMemberScope to Kotlin 2014-11-05 21:42:14 +03:00