azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename source set "descriptor.loader.java" -> "descriptors.jvm"

Browse Source 
The new name is more convenient and precise because this module is no
longer only about loading declarations from Java, it also contains
implementation of loading Kotlin declarations from .class files, as well
as type mapping abstractions, JVM ABI specifications, etc.
This commit is contained in:
Alexander Udalov
2017-11-07 13:43:44 +01:00
parent 51e00eb05e
commit 328e906b57
104 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
+16 -16
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: core/descriptor.loader.java/src/jvm_package_table.debug.proto
// source: core/descriptors.jvm/src/jvm_package_table.debug.proto
package org.jetbrains.kotlin.serialization.jvm;
@@ -3379,21 +3379,21 @@ public final class DebugJvmPackageTable {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n=core/descriptor.loader.java/src/jvm_pa" +
"ckage_table.debug.proto\022&org.jetbrains.k" +
"otlin.serialization.jvm\"\303\001\n\014PackageTable" +
"\022K\n\rpackage_parts\030\001 \003(\01324.org.jetbrains." +
"kotlin.serialization.jvm.PackageParts\022L\n" +
"\016metadata_parts\030\002 \003(\01324.org.jetbrains.ko" +
"tlin.serialization.jvm.PackageParts\022\030\n\020j" +
"vm_package_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027" +
"\n\017package_fq_name\030\001 \002(\t\022\030\n\020short_class_n" +
"ame\030\002 \003(\t\022*\n\036multifile_facade_short_name",
"_id\030\003 \003(\005B\002\020\001\022#\n\033multifile_facade_short_" +
"name\030\004 \003(\t\022.\n&class_with_jvm_package_nam" +
"e_short_name\030\005 \003(\t\0222\n&class_with_jvm_pac" +
"kage_name_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJ" +
"vmPackageTable"
"\n6core/descriptors.jvm/src/jvm_package_t" +
"able.debug.proto\022&org.jetbrains.kotlin.s" +
"erialization.jvm\"\303\001\n\014PackageTable\022K\n\rpac" +
"kage_parts\030\001 \003(\01324.org.jetbrains.kotlin." +
"serialization.jvm.PackageParts\022L\n\016metada" +
"ta_parts\030\002 \003(\01324.org.jetbrains.kotlin.se" +
"rialization.jvm.PackageParts\022\030\n\020jvm_pack" +
"age_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027\n\017packa" +
"ge_fq_name\030\001 \002(\t\022\030\n\020short_class_name\030\002 \003" +
"(\t\022*\n\036multifile_facade_short_name_id\030\003 \003",
"(\005B\002\020\001\022#\n\033multifile_facade_short_name\030\004 " +
"\003(\t\022.\n&class_with_jvm_package_name_short" +
"_name\030\005 \003(\t\0222\n&class_with_jvm_package_na" +
"me_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJvmPacka" +
"geTable"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+57 -57
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: core/descriptor.loader.java/src/jvm_descriptors.debug.proto
// source: core/descriptors.jvm/src/jvm_descriptors.debug.proto
package org.jetbrains.kotlin.serialization.jvm;
@@ -4655,62 +4655,62 @@ public final class DebugJvmProtoBuf {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n;core/descriptor.loader.java/src/jvm_de" +
"scriptors.debug.proto\022&org.jetbrains.kot" +
"lin.serialization.jvm\0320core/deserializat" +
"ion/src/ext_options.debug.proto\0320core/de" +
"serialization/src/descriptors.debug.prot" +
"o\"\244\003\n\020StringTableTypes\022O\n\006record\030\001 \003(\0132?" +
".org.jetbrains.kotlin.serialization.jvm." +
"StringTableTypes.Record\022\026\n\nlocal_name\030\005 " +
"\003(\005B\002\020\001\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020" +
"predefined_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b",
"\n\toperation\030\003 \001(\0162I.org.jetbrains.kotlin" +
".serialization.jvm.StringTableTypes.Reco" +
"rd.Operation:\004NONE\022\033\n\017substring_index\030\004 " +
"\003(\005B\002\020\001\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOpe" +
"ration\022\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID" +
"\020\001\022\024\n\020DESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSig" +
"nature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005" +
"B\004\230\265\030\001\";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(" +
"\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPrope" +
"rtySignature\022H\n\005field\030\001 \001(\01329.org.jetbra",
"ins.kotlin.serialization.jvm.JvmFieldSig" +
"nature\022T\n\020synthetic_method\030\002 \001(\0132:.org.j" +
"etbrains.kotlin.serialization.jvm.JvmMet" +
"hodSignature\022J\n\006getter\030\003 \001(\0132:.org.jetbr" +
"ains.kotlin.serialization.jvm.JvmMethodS" +
"ignature\022J\n\006setter\030\004 \001(\0132:.org.jetbrains" +
".kotlin.serialization.jvm.JvmMethodSigna" +
"ture:\212\001\n\025constructor_signature\022/.org.jet" +
"brains.kotlin.serialization.Constructor\030" +
"d \001(\0132:.org.jetbrains.kotlin.serializati",
"on.jvm.JvmMethodSignature:\202\001\n\020method_sig" +
"nature\022,.org.jetbrains.kotlin.serializat" +
"ion.Function\030d \001(\0132:.org.jetbrains.kotli" +
"n.serialization.jvm.JvmMethodSignature:\206" +
"\001\n\022property_signature\022,.org.jetbrains.ko" +
"tlin.serialization.Property\030d \001(\0132<.org." +
"jetbrains.kotlin.serialization.jvm.JvmPr" +
"opertySignature:q\n\017type_annotation\022(.org" +
".jetbrains.kotlin.serialization.Type\030d \003" +
"(\0132..org.jetbrains.kotlin.serialization.",
"Annotation:8\n\006is_raw\022(.org.jetbrains.kot" +
"lin.serialization.Type\030e \001(\010:\204\001\n\031type_pa" +
"rameter_annotation\0221.org.jetbrains.kotli" +
"n.serialization.TypeParameter\030d \003(\0132..or" +
"g.jetbrains.kotlin.serialization.Annotat" +
"ion:J\n\021class_module_name\022).org.jetbrains" +
".kotlin.serialization.Class\030e \001(\005B\004\230\265\030\001:" +
"u\n\024class_local_variable\022).org.jetbrains." +
"kotlin.serialization.Class\030f \003(\0132,.org.j" +
"etbrains.kotlin.serialization.Property:N",
"\n\023package_module_name\022+.org.jetbrains.ko" +
"tlin.serialization.Package\030e \001(\005B\004\230\265\030\001:y" +
"\n\026package_local_variable\022+.org.jetbrains" +
".kotlin.serialization.Package\030f \003(\0132,.or" +
"g.jetbrains.kotlin.serialization.Propert" +
"yB\022B\020DebugJvmProtoBuf"
"\n4core/descriptors.jvm/src/jvm_descripto" +
"rs.debug.proto\022&org.jetbrains.kotlin.ser" +
"ialization.jvm\0320core/deserialization/src" +
"/ext_options.debug.proto\0320core/deseriali" +
"zation/src/descriptors.debug.proto\"\244\003\n\020S" +
"tringTableTypes\022O\n\006record\030\001 \003(\0132?.org.je" +
"tbrains.kotlin.serialization.jvm.StringT" +
"ableTypes.Record\022\026\n\nlocal_name\030\005 \003(\005B\002\020\001" +
"\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020predefi" +
"ned_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b\n\topera",
"tion\030\003 \001(\0162I.org.jetbrains.kotlin.serial" +
"ization.jvm.StringTableTypes.Record.Oper" +
"ation:\004NONE\022\033\n\017substring_index\030\004 \003(\005B\002\020\001" +
"\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOperation\022" +
"\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID\020\001\022\024\n\020D" +
"ESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSignature\022" +
"\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"" +
";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001" +
"\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPropertySign" +
"ature\022H\n\005field\030\001 \001(\01329.org.jetbrains.kot",
"lin.serialization.jvm.JvmFieldSignature\022" +
"T\n\020synthetic_method\030\002 \001(\0132:.org.jetbrain" +
"s.kotlin.serialization.jvm.JvmMethodSign" +
"ature\022J\n\006getter\030\003 \001(\0132:.org.jetbrains.ko" +
"tlin.serialization.jvm.JvmMethodSignatur" +
"e\022J\n\006setter\030\004 \001(\0132:.org.jetbrains.kotlin" +
".serialization.jvm.JvmMethodSignature:\212\001" +
"\n\025constructor_signature\022/.org.jetbrains." +
"kotlin.serialization.Constructor\030d \001(\0132:" +
".org.jetbrains.kotlin.serialization.jvm.",
"JvmMethodSignature:\202\001\n\020method_signature\022" +
",.org.jetbrains.kotlin.serialization.Fun" +
"ction\030d \001(\0132:.org.jetbrains.kotlin.seria" +
"lization.jvm.JvmMethodSignature:\206\001\n\022prop" +
"erty_signature\022,.org.jetbrains.kotlin.se" +
"rialization.Property\030d \001(\0132<.org.jetbrai" +
"ns.kotlin.serialization.jvm.JvmPropertyS" +
"ignature:q\n\017type_annotation\022(.org.jetbra" +
"ins.kotlin.serialization.Type\030d \003(\0132..or" +
"g.jetbrains.kotlin.serialization.Annotat",
"ion:8\n\006is_raw\022(.org.jetbrains.kotlin.ser" +
"ialization.Type\030e \001(\010:\204\001\n\031type_parameter" +
"_annotation\0221.org.jetbrains.kotlin.seria" +
"lization.TypeParameter\030d \003(\0132..org.jetbr" +
"ains.kotlin.serialization.Annotation:J\n\021" +
"class_module_name\022).org.jetbrains.kotlin" +
".serialization.Class\030e \001(\005B\004\230\265\030\001:u\n\024clas" +
"s_local_variable\022).org.jetbrains.kotlin." +
"serialization.Class\030f \003(\0132,.org.jetbrain" +
"s.kotlin.serialization.Property:N\n\023packa",
"ge_module_name\022+.org.jetbrains.kotlin.se" +
"rialization.Package\030e \001(\005B\004\230\265\030\001:y\n\026packa" +
"ge_local_variable\022+.org.jetbrains.kotlin" +
".serialization.Package\030f \003(\0132,.org.jetbr" +
"ains.kotlin.serialization.PropertyB\022B\020De" +
"bugJvmProtoBuf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {