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

Extract module 'deserialization' out of 'serialization'

Browse Source 
'deserialization' stays in core because it's needed both in compiler and
reflection, but 'serialization' is used only in the compiler
This commit is contained in:
Alexander Udalov
2015-03-27 04:24:32 +03:00
parent d09e0e73fa
commit 32c3bb8c7f
60 changed files with 203 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/KotlinPlugin.xml
Generated
+2 -1
View File
@@ -25,7 +25,7 @@
<element id="module-output" name="cli-common" /> <element id="module-output" name="cli-common" />
<element id="module-output" name="idea-jps-common" /> <element id="module-output" name="idea-jps-common" />
<element id="module-output" name="preloader" /> <element id="module-output" name="preloader" />
<element id="module-output" name="serialization" /> <element id="module-output" name="deserialization" />
<element id="module-output" name="backend-common" /> <element id="module-output" name="backend-common" />
<element id="library" level="project" name="builtins" /> <element id="library" level="project" name="builtins" />
<element id="module-output" name="js.dart-ast" /> <element id="module-output" name="js.dart-ast" />
@@ -39,6 +39,7 @@
<element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" /> <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
<element id="module-output" name="kotlin-android-plugin" /> <element id="module-output" name="kotlin-android-plugin" />
<element id="module-output" name="js.serializer" /> <element id="module-output" name="js.serializer" />
<element id="module-output" name="serialization" />
</element> </element>
<element id="library" level="project" name="javax.inject" /> <element id="library" level="project" name="javax.inject" />
<element id="directory" name="jps"> <element id="directory" name="jps">
.idea/modules.xml
Generated
+2 -1
View File
@@ -20,6 +20,7 @@
<module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/deserialization/deserialization.iml" filepath="$PROJECT_DIR$/core/deserialization/deserialization.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" /> <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" /> <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" /> <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
@@ -48,7 +49,7 @@
<module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" /> <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
<module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
</modules> </modules>
build.xml
+19 -16
View File
@@ -90,20 +90,21 @@
</if> </if>
<dirset id="compilerSources.dirset" dir="${basedir}/"> <dirset id="compilerSources.dirset" dir="${basedir}/">
<include name="core/descriptors/src"/>
<include name="core/descriptor.loader.java/src"/> <include name="core/descriptor.loader.java/src"/>
<include name="core/serialization/src"/> <include name="core/descriptors/src"/>
<include name="core/deserialization/src"/>
<include name="core/util.runtime/src"/> <include name="core/util.runtime/src"/>
<include name="compiler/frontend/src"/>
<include name="compiler/frontend.java/src"/>
<include name="compiler/backend-common/src"/>
<include name="compiler/backend/src"/> <include name="compiler/backend/src"/>
<include name="compiler/backend-common/src"/>
<include name="compiler/builtins-serializer/src"/>
<include name="compiler/cli/src"/> <include name="compiler/cli/src"/>
<include name="compiler/cli/cli-common/src"/> <include name="compiler/cli/cli-common/src"/>
<include name="compiler/util/src"/> <include name="compiler/frontend/src"/>
<include name="compiler/frontend.java/src"/>
<include name="compiler/light-classes/src"/> <include name="compiler/light-classes/src"/>
<include name="compiler/plugin-api/src"/> <include name="compiler/plugin-api/src"/>
<include name="compiler/builtins-serializer/src"/> <include name="compiler/serialization/src"/>
<include name="compiler/util/src"/>
<include name="js/js.dart-ast/src"/> <include name="js/js.dart-ast/src"/>
<include name="js/js.translator/src"/> <include name="js/js.translator/src"/>
<include name="js/js.frontend/src"/> <include name="js/js.frontend/src"/>
@@ -116,6 +117,7 @@
<patternset id="compilerClassesFromIDEA.fileset"> <patternset id="compilerClassesFromIDEA.fileset">
<include name="frontend/**"/> <include name="frontend/**"/>
<include name="descriptors/**"/> <include name="descriptors/**"/>
<include name="deserialization/**"/>
<include name="serialization/**"/> <include name="serialization/**"/>
<include name="descriptor.loader.java/**"/> <include name="descriptor.loader.java/**"/>
<include name="frontend.java/**"/> <include name="frontend.java/**"/>
@@ -198,20 +200,21 @@
<target name="compiler-sources"> <target name="compiler-sources">
<jar jarfile="${output}/kotlin-compiler-sources.jar"> <jar jarfile="${output}/kotlin-compiler-sources.jar">
<!-- TODO How to convert it from pathset or dirset ? --> <!-- TODO How to convert it from pathset or dirset ? -->
<fileset dir="core/descriptors/src"/>
<fileset dir="core/descriptor.loader.java/src"/> <fileset dir="core/descriptor.loader.java/src"/>
<fileset dir="core/serialization/src"/> <fileset dir="core/descriptors/src"/>
<fileset dir="core/deserialization/src"/>
<fileset dir="core/util.runtime/src"/> <fileset dir="core/util.runtime/src"/>
<fileset dir="compiler/frontend/src"/>
<fileset dir="compiler/frontend.java/src"/>
<fileset dir="compiler/backend-common/src"/>
<fileset dir="compiler/backend/src"/> <fileset dir="compiler/backend/src"/>
<fileset dir="compiler/backend-common/src"/>
<fileset dir="compiler/builtins-serializer"/>
<fileset dir="compiler/cli/src"/> <fileset dir="compiler/cli/src"/>
<fileset dir="compiler/cli/cli-common/src"/> <fileset dir="compiler/cli/cli-common/src"/>
<fileset dir="compiler/util/src"/> <fileset dir="compiler/frontend/src"/>
<fileset dir="compiler/frontend.java/src"/>
<fileset dir="compiler/light-classes/src"/> <fileset dir="compiler/light-classes/src"/>
<fileset dir="compiler/plugin-api/src"/> <fileset dir="compiler/plugin-api/src"/>
<fileset dir="compiler/builtins-serializer"/> <fileset dir="compiler/serialization/src"/>
<fileset dir="compiler/util/src"/>
<fileset dir="js/js.dart-ast/src"/> <fileset dir="js/js.dart-ast/src"/>
<fileset dir="js/js.translator/src"/> <fileset dir="js/js.translator/src"/>
<fileset dir="js/js.frontend/src"/> <fileset dir="js/js.frontend/src"/>
@@ -805,7 +808,7 @@
<include name="core/descriptor.loader.java/src"/> <include name="core/descriptor.loader.java/src"/>
<include name="core/descriptors/src"/> <include name="core/descriptors/src"/>
<include name="core/descriptors.runtime/src"/> <include name="core/descriptors.runtime/src"/>
<include name="core/serialization/src"/> <include name="core/deserialization/src"/>
<include name="core/util.runtime/src"/> <include name="core/util.runtime/src"/>
</src> </src>
<class-path> <class-path>
@@ -890,9 +893,9 @@
<fileset dir="${basedir}/core/descriptor.loader.java/src" includes="**/*"/> <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="**/*"/>
<fileset dir="${basedir}/core/descriptors/src" includes="**/*"/> <fileset dir="${basedir}/core/descriptors/src" includes="**/*"/>
<fileset dir="${basedir}/core/descriptors.runtime/src" includes="**/*"/> <fileset dir="${basedir}/core/descriptors.runtime/src" includes="**/*"/>
<fileset dir="${basedir}/core/deserialization/src" includes="**/*"/>
<fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/> <fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/>
<fileset dir="${basedir}/core/runtime.jvm/src" includes="**/*"/> <fileset dir="${basedir}/core/runtime.jvm/src" includes="**/*"/>
<fileset dir="${basedir}/core/serialization/src" includes="**/*"/>
<fileset dir="${basedir}/core/util.runtime/src" includes="**/*"/> <fileset dir="${basedir}/core/util.runtime/src" includes="**/*"/>
<fileset dir="${basedir}/libraries/stdlib/src" includes="**/*"/> <fileset dir="${basedir}/libraries/stdlib/src" includes="**/*"/>
</jar-content> </jar-content>
compiler/frontend.java/frontend.java.iml
+1 -1
View File
@@ -10,7 +10,7 @@
<orderEntry type="module" module-name="frontend" exported="" /> <orderEntry type="module" module-name="frontend" exported="" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" /> <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
<orderEntry type="library" name="javax.inject" level="project" /> <orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="serialization" /> <orderEntry type="module" module-name="deserialization" />
<orderEntry type="module" module-name="descriptor.loader.java" exported="" /> <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
</component> </component>
compiler/frontend/frontend.iml
+1 -2
View File
@@ -10,9 +10,8 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" /> <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
<orderEntry type="library" name="javax.inject" level="project" /> <orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="descriptors" exported="" /> <orderEntry type="module" module-name="descriptors" exported="" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="plugin-api" exported="" /> <orderEntry type="module" module-name="plugin-api" exported="" />
</component> </component>
</module> </module>
compiler/serialization/serialization.iml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="protobuf-java" level="project" />
<orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="descriptors" />
<orderEntry type="module" module-name="deserialization" exported="" />
<orderEntry type="module" module-name="util" />
</component>
</module>
core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt → compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java → compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/Interner.java → compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/SerializationUtil.java → compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializationUtil.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java → compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java → compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt → compiler/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
View File
compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+94 -94
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: core/serialization/src/descriptors.debug.proto // source: core/deserialization/src/descriptors.debug.proto
package org.jetbrains.kotlin.serialization; package org.jetbrains.kotlin.serialization;
@@ -16973,100 +16973,100 @@ public final class DebugProtoBuf {
descriptor; descriptor;
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n.core/serialization/src/descriptors.deb" + "\n0core/deserialization/src/descriptors.d" +
"ug.proto\022\"org.jetbrains.kotlin.serializa" + "ebug.proto\022\"org.jetbrains.kotlin.seriali" +
"tion\"\035\n\013StringTable\022\016\n\006string\030\001 \003(\t\"\310\002\n\022" + "zation\"\035\n\013StringTable\022\016\n\006string\030\001 \003(\t\"\310\002" +
"QualifiedNameTable\022\\\n\016qualified_name\030\001 \003" + "\n\022QualifiedNameTable\022\\\n\016qualified_name\030\001" +
"(\0132D.org.jetbrains.kotlin.serialization." + " \003(\0132D.org.jetbrains.kotlin.serializatio" +
"QualifiedNameTable.QualifiedName\032\323\001\n\rQua" + "n.QualifiedNameTable.QualifiedName\032\323\001\n\rQ" +
"lifiedName\022!\n\025parent_qualified_name\030\001 \001(" + "ualifiedName\022!\n\025parent_qualified_name\030\001 " +
"\005:\002-1\022\022\n\nshort_name\030\002 \002(\005\022`\n\004kind\030\003 \001(\0162" + "\001(\005:\002-1\022\022\n\nshort_name\030\002 \002(\005\022`\n\004kind\030\003 \001(" +
"I.org.jetbrains.kotlin.serialization.Qua" + "\0162I.org.jetbrains.kotlin.serialization.Q" +
"lifiedNameTable.QualifiedName.Kind:\007PACK", "ualifiedNameTable.QualifiedName.Kind:\007PA",
"AGE\")\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\022\t\n\005L" + "CKAGE\")\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\022\t\n" +
"OCAL\020\002\"\335\005\n\nAnnotation\022\n\n\002id\030\001 \002(\005\022I\n\010arg" + "\005LOCAL\020\002\"\335\005\n\nAnnotation\022\n\n\002id\030\001 \002(\005\022I\n\010a" +
"ument\030\002 \003(\01327.org.jetbrains.kotlin.seria" + "rgument\030\002 \003(\01327.org.jetbrains.kotlin.ser" +
"lization.Annotation.Argument\032\367\004\n\010Argumen" + "ialization.Annotation.Argument\032\367\004\n\010Argum" +
"t\022\017\n\007name_id\030\001 \002(\005\022L\n\005value\030\002 \002(\0132=.org." + "ent\022\017\n\007name_id\030\001 \002(\005\022L\n\005value\030\002 \002(\0132=.or" +
"jetbrains.kotlin.serialization.Annotatio" + "g.jetbrains.kotlin.serialization.Annotat" +
"n.Argument.Value\032\213\004\n\005Value\022P\n\004type\030\001 \001(\016" + "ion.Argument.Value\032\213\004\n\005Value\022P\n\004type\030\001 \001" +
"2B.org.jetbrains.kotlin.serialization.An" + "(\0162B.org.jetbrains.kotlin.serialization." +
"notation.Argument.Value.Type\022\021\n\tint_valu" + "Annotation.Argument.Value.Type\022\021\n\tint_va" +
"e\030\002 \001(\022\022\023\n\013float_value\030\003 \001(\002\022\024\n\014double_v", "lue\030\002 \001(\022\022\023\n\013float_value\030\003 \001(\002\022\024\n\014double",
"alue\030\004 \001(\001\022\024\n\014string_value\030\005 \001(\005\022\020\n\010clas" + "_value\030\004 \001(\001\022\024\n\014string_value\030\005 \001(\005\022\020\n\010cl" +
"s_id\030\006 \001(\005\022\025\n\renum_value_id\030\007 \001(\005\022B\n\nann" + "ass_id\030\006 \001(\005\022\025\n\renum_value_id\030\007 \001(\005\022B\n\na" +
"otation\030\010 \001(\0132..org.jetbrains.kotlin.ser" + "nnotation\030\010 \001(\0132..org.jetbrains.kotlin.s" +
"ialization.Annotation\022T\n\rarray_element\030\t" + "erialization.Annotation\022T\n\rarray_element" +
" \003(\0132=.org.jetbrains.kotlin.serializatio" + "\030\t \003(\0132=.org.jetbrains.kotlin.serializat" +
"n.Annotation.Argument.Value\"\230\001\n\004Type\022\010\n\004" + "ion.Annotation.Argument.Value\"\230\001\n\004Type\022\010" +
"BYTE\020\000\022\010\n\004CHAR\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010\n\004" + "\n\004BYTE\020\000\022\010\n\004CHAR\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010" +
"LONG\020\004\022\t\n\005FLOAT\020\005\022\n\n\006DOUBLE\020\006\022\013\n\007BOOLEAN" + "\n\004LONG\020\004\022\t\n\005FLOAT\020\005\022\n\n\006DOUBLE\020\006\022\013\n\007BOOLE" +
"\020\007\022\n\n\006STRING\020\010\022\t\n\005CLASS\020\t\022\010\n\004ENUM\020\n\022\016\n\nA" + "AN\020\007\022\n\n\006STRING\020\010\022\t\n\005CLASS\020\t\022\010\n\004ENUM\020\n\022\016\n" +
"NNOTATION\020\013\022\t\n\005ARRAY\020\014\"\377\004\n\004Type\022I\n\013const", "\nANNOTATION\020\013\022\t\n\005ARRAY\020\014\"\377\004\n\004Type\022I\n\013con",
"ructor\030\001 \002(\01324.org.jetbrains.kotlin.seri" + "structor\030\001 \002(\01324.org.jetbrains.kotlin.se" +
"alization.Type.Constructor\022C\n\010argument\030\002" + "rialization.Type.Constructor\022C\n\010argument" +
" \003(\01321.org.jetbrains.kotlin.serializatio" + "\030\002 \003(\01321.org.jetbrains.kotlin.serializat" +
"n.Type.Argument\022\027\n\010nullable\030\003 \001(\010:\005false" + "ion.Type.Argument\022\027\n\010nullable\030\003 \001(\010:\005fal" +
"\022%\n\035flexible_type_capabilities_id\030\004 \001(\005\022" + "se\022%\n\035flexible_type_capabilities_id\030\004 \001(" +
"F\n\024flexible_upper_bound\030\005 \001(\0132(.org.jetb" + "\005\022F\n\024flexible_upper_bound\030\005 \001(\0132(.org.je" +
"rains.kotlin.serialization.Type\032\220\001\n\013Cons" + "tbrains.kotlin.serialization.Type\032\220\001\n\013Co" +
"tructor\022N\n\004kind\030\001 \001(\01629.org.jetbrains.ko" + "nstructor\022N\n\004kind\030\001 \001(\01629.org.jetbrains." +
"tlin.serialization.Type.Constructor.Kind" + "kotlin.serialization.Type.Constructor.Ki" +
":\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000\022\022", "nd:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000",
"\n\016TYPE_PARAMETER\020\001\032\313\001\n\010Argument\022U\n\nproje" + "\022\022\n\016TYPE_PARAMETER\020\001\032\313\001\n\010Argument\022U\n\npro" +
"ction\030\001 \001(\0162<.org.jetbrains.kotlin.seria" + "jection\030\001 \001(\0162<.org.jetbrains.kotlin.ser" +
"lization.Type.Argument.Projection:\003INV\0226" + "ialization.Type.Argument.Projection:\003INV" +
"\n\004type\030\002 \001(\0132(.org.jetbrains.kotlin.seri" + "\0226\n\004type\030\002 \001(\0132(.org.jetbrains.kotlin.se" +
"alization.Type\"0\n\nProjection\022\006\n\002IN\020\000\022\007\n\003" + "rialization.Type\"0\n\nProjection\022\006\n\002IN\020\000\022\007" +
"OUT\020\001\022\007\n\003INV\020\002\022\010\n\004STAR\020\003\"\371\001\n\rTypeParamet" + "\n\003OUT\020\001\022\007\n\003INV\020\002\022\010\n\004STAR\020\003\"\371\001\n\rTypeParam" +
"er\022\n\n\002id\030\001 \002(\005\022\014\n\004name\030\002 \002(\005\022\026\n\007reified\030" + "eter\022\n\n\002id\030\001 \002(\005\022\014\n\004name\030\002 \002(\005\022\026\n\007reifie" +
"\003 \001(\010:\005false\022Q\n\010variance\030\004 \001(\0162:.org.jet" + "d\030\003 \001(\010:\005false\022Q\n\010variance\030\004 \001(\0162:.org.j" +
"brains.kotlin.serialization.TypeParamete" + "etbrains.kotlin.serialization.TypeParame" +
"r.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(.o", "ter.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(",
"rg.jetbrains.kotlin.serialization.Type\"$" + ".org.jetbrains.kotlin.serialization.Type" +
"\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\261\005\n" + "\"$\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\261" +
"\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(" + "\005\n\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 " +
"\005\022\035\n\025companion_object_name\030\004 \001(\005\022I\n\016type" + "\002(\005\022\035\n\025companion_object_name\030\004 \001(\005\022I\n\016ty" +
"_parameter\030\005 \003(\01321.org.jetbrains.kotlin." + "pe_parameter\030\005 \003(\01321.org.jetbrains.kotli" +
"serialization.TypeParameter\022;\n\tsupertype" + "n.serialization.TypeParameter\022;\n\tsuperty" +
"\030\006 \003(\0132(.org.jetbrains.kotlin.serializat" + "pe\030\006 \003(\0132(.org.jetbrains.kotlin.serializ" +
"ion.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n\006m" + "ation.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n" +
"ember\030\013 \003(\0132,.org.jetbrains.kotlin.seria" + "\006member\030\013 \003(\0132,.org.jetbrains.kotlin.ser" +
"lization.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n", "ialization.Callable\022\022\n\nenum_entry\030\014 \003(\005\022",
"\023primary_constructor\030\r \001(\0132<.org.jetbrai" + "Y\n\023primary_constructor\030\r \001(\0132<.org.jetbr" +
"ns.kotlin.serialization.Class.PrimaryCon" + "ains.kotlin.serialization.Class.PrimaryC" +
"structor\022K\n\025secondary_constructor\030\016 \003(\0132" + "onstructor\022K\n\025secondary_constructor\030\016 \003(" +
",.org.jetbrains.kotlin.serialization.Cal" +
"lable\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(" +
"\0132,.org.jetbrains.kotlin.serialization.C" + "\0132,.org.jetbrains.kotlin.serialization.C" +
"allable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n" + "allable\032P\n\022PrimaryConstructor\022:\n\004data\030\001 " +
"\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTAT" + "\001(\0132,.org.jetbrains.kotlin.serialization" +
"ION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020" + ".Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022" +
"\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.or", "\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOT" +
"g.jetbrains.kotlin.serialization.Callabl" + "ATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJEC" +
"e*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014" + "T\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.",
"getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005" + "org.jetbrains.kotlin.serialization.Calla" +
"\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrains" + "ble*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024" +
".kotlin.serialization.TypeParameter\022?\n\rr" + "\n\014getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001" +
"eceiver_type\030\005 \001(\0132(.org.jetbrains.kotli" + "(\005\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrai" +
"n.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017va" + "ns.kotlin.serialization.TypeParameter\022?\n" +
"lue_parameter\030\007 \003(\0132;.org.jetbrains.kotl" + "\rreceiver_type\030\005 \001(\0132(.org.jetbrains.kot" +
"in.serialization.Callable.ValueParameter" + "lin.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017" +
"\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.ko", "value_parameter\030\007 \003(\0132;.org.jetbrains.ko" +
"tlin.serialization.Type\032\263\001\n\016ValueParamet" + "tlin.serialization.Callable.ValueParamet" +
"er\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030" + "er\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.",
"\003 \002(\0132(.org.jetbrains.kotlin.serializati" + "kotlin.serialization.Type\032\263\001\n\016ValueParam" +
"on.Type\022E\n\023vararg_element_type\030\004 \001(\0132(.o" + "eter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004typ" +
"rg.jetbrains.kotlin.serialization.Type*\005" + "e\030\003 \002(\0132(.org.jetbrains.kotlin.serializa" +
"\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\r" + "tion.Type\022E\n\023vararg_element_type\030\004 \001(\0132(" +
"FAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTH" + ".org.jetbrains.kotlin.serialization.Type" +
"ESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL" + "*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021" +
"\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010M" + "\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYN" +
"odality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT", "THESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003V" +
"\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVAT" + "AL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n" +
"E\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVAT" + "\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRA",
"E_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf\210" + "CT\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIV" +
"\001\000" "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIV" +
"ATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBu" +
"f\210\001\000"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+19 -19
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: core/serialization/src/builtins.debug.proto // source: core/deserialization/src/builtins.debug.proto
package org.jetbrains.kotlin.serialization.builtins; package org.jetbrains.kotlin.serialization.builtins;
@@ -77,25 +77,25 @@ public final class DebugBuiltInsProtoBuf {
descriptor; descriptor;
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n+core/serialization/src/builtins.debug." + "\n-core/deserialization/src/builtins.debu" +
"proto\022+org.jetbrains.kotlin.serializatio" + "g.proto\022+org.jetbrains.kotlin.serializat" +
"n.builtins\032.core/serialization/src/descr" + "ion.builtins\0320core/deserialization/src/d" +
"iptors.debug.proto:D\n\nclass_name\022+.org.j" + "escriptors.debug.proto:D\n\nclass_name\022+.o" +
"etbrains.kotlin.serialization.Package\030\226\001" + "rg.jetbrains.kotlin.serialization.Packag" +
" \003(\005B\002\020\001:t\n\020class_annotation\022).org.jetbr" + "e\030\226\001 \003(\005B\002\020\001:t\n\020class_annotation\022).org.j" +
"ains.kotlin.serialization.Class\030\226\001 \003(\0132." + "etbrains.kotlin.serialization.Class\030\226\001 \003" +
".org.jetbrains.kotlin.serialization.Anno" +
"tation:z\n\023callable_annotation\022,.org.jetb" +
"rains.kotlin.serialization.Callable\030\226\001 \003",
"(\0132..org.jetbrains.kotlin.serialization." + "(\0132..org.jetbrains.kotlin.serialization." +
"Annotation:\210\001\n\022compile_time_value\022,.org." + "Annotation:z\n\023callable_annotation\022,.org." +
"jetbrains.kotlin.serialization.Callable\030" + "jetbrains.kotlin.serialization.Callable\030",
"\227\001 \001(\0132=.org.jetbrains.kotlin.serializat" + "\226\001 \003(\0132..org.jetbrains.kotlin.serializat" +
"ion.Annotation.Argument.Value:\212\001\n\024parame" + "ion.Annotation:\210\001\n\022compile_time_value\022,." +
"ter_annotation\022;.org.jetbrains.kotlin.se" + "org.jetbrains.kotlin.serialization.Calla" +
"rialization.Callable.ValueParameter\030\226\001 \003" + "ble\030\227\001 \001(\0132=.org.jetbrains.kotlin.serial" +
"(\0132..org.jetbrains.kotlin.serialization." + "ization.Annotation.Argument.Value:\212\001\n\024pa" +
"AnnotationB\027B\025DebugBuiltInsProtoBuf" "rameter_annotation\022;.org.jetbrains.kotli" +
"n.serialization.Callable.ValueParameter\030" +
"\226\001 \003(\0132..org.jetbrains.kotlin.serializat" +
"ion.AnnotationB\027B\025DebugBuiltInsProtoBuf"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+36 -36
View File
@@ -3804,42 +3804,42 @@ public final class DebugJvmProtoBuf {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n;core/descriptor.loader.java/src/jvm_de" + "\n;core/descriptor.loader.java/src/jvm_de" +
"scriptors.debug.proto\022&org.jetbrains.kot" + "scriptors.debug.proto\022&org.jetbrains.kot" +
"lin.serialization.jvm\032.core/serializatio" + "lin.serialization.jvm\0320core/deserializat" +
"n/src/descriptors.debug.proto\"\204\002\n\007JvmTyp" + "ion/src/descriptors.debug.proto\"\204\002\n\007JvmT" +
"e\022U\n\016primitive_type\030\001 \001(\0162=.org.jetbrain" + "ype\022U\n\016primitive_type\030\001 \001(\0162=.org.jetbra" +
"s.kotlin.serialization.jvm.JvmType.Primi" + "ins.kotlin.serialization.jvm.JvmType.Pri" +
"tiveType\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017array" + "mitiveType\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017arr" +
"_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010\n\004" + "ay_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010" +
"VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022" + "\n\004VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020" +
"\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007", "\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG",
"\022\n\n\006DOUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n\004n" + "\020\007\022\n\n\006DOUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n" +
"ame\030\001 \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.jet" + "\004name\030\001 \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.j" +
"brains.kotlin.serialization.jvm.JvmType\022" + "etbrains.kotlin.serialization.jvm.JvmTyp" +
"G\n\016parameter_type\030\003 \003(\0132/.org.jetbrains." + "e\022G\n\016parameter_type\030\003 \003(\0132/.org.jetbrain" +
"kotlin.serialization.jvm.JvmType\"\203\001\n\021Jvm" + "s.kotlin.serialization.jvm.JvmType\"\203\001\n\021J" +
"FieldSignature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002 \002" + "vmFieldSignature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002" +
"(\0132/.org.jetbrains.kotlin.serialization." + " \002(\0132/.org.jetbrains.kotlin.serializatio" +
"jvm.JvmType\022!\n\022is_static_in_outer\030\003 \001(\010:" + "n.jvm.JvmType\022!\n\022is_static_in_outer\030\003 \001(" +
"\005false\"\316\002\n\024JvmPropertySignature\022H\n\005field" + "\010:\005false\"\316\002\n\024JvmPropertySignature\022H\n\005fie" +
"\030\001 \001(\01329.org.jetbrains.kotlin.serializat", "ld\030\001 \001(\01329.org.jetbrains.kotlin.serializ",
"ion.jvm.JvmFieldSignature\022T\n\020synthetic_m" + "ation.jvm.JvmFieldSignature\022T\n\020synthetic" +
"ethod\030\002 \001(\0132:.org.jetbrains.kotlin.seria" + "_method\030\002 \001(\0132:.org.jetbrains.kotlin.ser" +
"lization.jvm.JvmMethodSignature\022J\n\006gette" + "ialization.jvm.JvmMethodSignature\022J\n\006get" +
"r\030\003 \001(\0132:.org.jetbrains.kotlin.serializa" + "ter\030\003 \001(\0132:.org.jetbrains.kotlin.seriali" +
"tion.jvm.JvmMethodSignature\022J\n\006setter\030\004 " + "zation.jvm.JvmMethodSignature\022J\n\006setter\030" +
"\001(\0132:.org.jetbrains.kotlin.serialization" + "\004 \001(\0132:.org.jetbrains.kotlin.serializati" +
".jvm.JvmMethodSignature:\202\001\n\020method_signa" + "on.jvm.JvmMethodSignature:\202\001\n\020method_sig" +
"ture\022,.org.jetbrains.kotlin.serializatio" + "nature\022,.org.jetbrains.kotlin.serializat" +
"n.Callable\030d \001(\0132:.org.jetbrains.kotlin." + "ion.Callable\030d \001(\0132:.org.jetbrains.kotli" +
"serialization.jvm.JvmMethodSignature:\206\001\n", "n.serialization.jvm.JvmMethodSignature:\206",
"\022property_signature\022,.org.jetbrains.kotl" + "\001\n\022property_signature\022,.org.jetbrains.ko" +
"in.serialization.Callable\030e \001(\0132<.org.je" + "tlin.serialization.Callable\030e \001(\0132<.org." +
"tbrains.kotlin.serialization.jvm.JvmProp" + "jetbrains.kotlin.serialization.jvm.JvmPr" +
"ertySignature:E\n\017impl_class_name\022,.org.j" + "opertySignature:E\n\017impl_class_name\022,.org" +
"etbrains.kotlin.serialization.Callable\030f" + ".jetbrains.kotlin.serialization.Callable" +
" \001(\005:J\n\005index\022;.org.jetbrains.kotlin.ser" + "\030f \001(\005:J\n\005index\022;.org.jetbrains.kotlin.s" +
"ialization.Callable.ValueParameter\030d \001(\005" + "erialization.Callable.ValueParameter\030d \001" +
"B\022B\020DebugJvmProtoBuf" "(\005B\022B\020DebugJvmProtoBuf"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
core/descriptor.loader.java/descriptor.loader.java.iml
+1 -1
View File
@@ -8,7 +8,7 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="javax.inject" level="project" /> <orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="serialization" /> <orderEntry type="module" module-name="deserialization" />
<orderEntry type="module" module-name="util.runtime" /> <orderEntry type="module" module-name="util.runtime" />
</component> </component>
</module> </module>
core/descriptor.loader.java/src/jvm_descriptors.proto
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.serialization.jvm; package org.jetbrains.kotlin.serialization.jvm;
import "core/serialization/src/descriptors.proto"; import "core/deserialization/src/descriptors.proto";
option java_outer_classname = "JvmProtoBuf"; option java_outer_classname = "JvmProtoBuf";
option optimize_for = LITE_RUNTIME; option optimize_for = LITE_RUNTIME;
core/descriptors.runtime/descriptors.runtime.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="descriptor.loader.java" exported="" /> <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
<orderEntry type="module" module-name="descriptors" exported="" /> <orderEntry type="module" module-name="descriptors" exported="" />
<orderEntry type="module" module-name="serialization" exported="" /> <orderEntry type="module" module-name="deserialization" exported="" />
<orderEntry type="module" module-name="util.runtime" /> <orderEntry type="module" module-name="util.runtime" />
</component> </component>
</module> </module>
core/descriptors/descriptors.iml
+2 -3
View File
@@ -8,8 +8,7 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="util.runtime" /> <orderEntry type="module" module-name="util.runtime" />
<orderEntry type="module" module-name="serialization" /> <orderEntry type="module" module-name="deserialization" />
<orderEntry type="library" exported="" name="builtins" level="project" /> <orderEntry type="library" exported="" name="builtins" level="project" />
</component> </component>
</module> </module>
core/serialization/serialization.iml → core/deserialization/deserialization.iml
View File
core/serialization/src/builtins.proto → core/deserialization/src/builtins.proto
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.serialization.builtins; package org.jetbrains.kotlin.serialization.builtins;
import "core/serialization/src/descriptors.proto"; import "core/deserialization/src/descriptors.proto";
option java_outer_classname = "BuiltInsProtoBuf"; option java_outer_classname = "BuiltInsProtoBuf";
option optimize_for = LITE_RUNTIME; option optimize_for = LITE_RUNTIME;
core/serialization/src/descriptors.proto → core/deserialization/src/descriptors.proto
View File
core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.java → core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java → core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.java → core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java → core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+1 -1
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: core/serialization/src/descriptors.proto // source: core/deserialization/src/descriptors.proto
package org.jetbrains.kotlin.serialization; package org.jetbrains.kotlin.serialization;
core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java → core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+1 -1
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: core/serialization/src/builtins.proto // source: core/deserialization/src/builtins.proto
package org.jetbrains.kotlin.serialization.builtins; package org.jetbrains.kotlin.serialization.builtins;
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ErrorReporter.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ErrorReporter.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolver.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolver.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
View File
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt → core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
View File
generators/generators.iml
+1 -2
View File
@@ -16,7 +16,7 @@
<orderEntry type="module" module-name="frontend.java" scope="TEST" /> <orderEntry type="module" module-name="frontend.java" scope="TEST" />
<orderEntry type="module" module-name="injector-generator" scope="TEST" /> <orderEntry type="module" module-name="injector-generator" scope="TEST" />
<orderEntry type="module" module-name="cli" scope="TEST" /> <orderEntry type="module" module-name="cli" scope="TEST" />
<orderEntry type="module" module-name="serialization" scope="TEST" /> <orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
<orderEntry type="module" module-name="descriptors.runtime" scope="TEST" /> <orderEntry type="module" module-name="descriptors.runtime" scope="TEST" />
<orderEntry type="module" module-name="js.tests" scope="TEST" /> <orderEntry type="module" module-name="js.tests" scope="TEST" />
<orderEntry type="module" module-name="jps-plugin" scope="TEST" /> <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
@@ -28,6 +28,5 @@
<orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" /> <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-idea-plugin" scope="TEST" /> <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-jps-plugin" scope="TEST" /> <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="descriptor.loader.java" />
</component> </component>
</module> </module>
generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+2 -2
View File
@@ -47,8 +47,8 @@ public class ProtoPath(public val file: String) {
} }
public val PROTO_PATHS: List<ProtoPath> = listOf( public val PROTO_PATHS: List<ProtoPath> = listOf(
ProtoPath("core/serialization/src/descriptors.proto"), ProtoPath("core/deserialization/src/descriptors.proto"),
ProtoPath("core/serialization/src/builtins.proto"), ProtoPath("core/deserialization/src/builtins.proto"),
ProtoPath("js/js.serializer/src/js.proto"), ProtoPath("js/js.serializer/src/js.proto"),
ProtoPath("core/descriptor.loader.java/src/jvm_descriptors.proto") ProtoPath("core/descriptor.loader.java/src/jvm_descriptors.proto")
) )
idea/idea-analysis/idea-analysis.iml
-1
View File
@@ -14,7 +14,6 @@
<orderEntry type="library" scope="PROVIDED" name="properties" level="project" /> <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
<orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" /> <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
<orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" /> <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="eval4j" /> <orderEntry type="module" module-name="eval4j" />
<orderEntry type="library" name="intellij-core-analysis" level="project" /> <orderEntry type="library" name="intellij-core-analysis" level="project" />
<orderEntry type="module-library"> <orderEntry type="module-library">
idea/idea.iml
-1
View File
@@ -34,7 +34,6 @@
<orderEntry type="library" scope="PROVIDED" name="properties" level="project" /> <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
<orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" /> <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
<orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" /> <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
<orderEntry type="module" module-name="serialization" />
<orderEntry type="library" scope="PROVIDED" name="maven" level="project" /> <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
<orderEntry type="module" module-name="eval4j" /> <orderEntry type="module" module-name="eval4j" />
<orderEntry type="module" module-name="idea-analysis" exported="" /> <orderEntry type="module" module-name="idea-analysis" exported="" />
jps-plugin/jps-plugin.iml
+1 -1
View File
@@ -16,7 +16,7 @@
<orderEntry type="module" module-name="backend" scope="TEST" /> <orderEntry type="module" module-name="backend" scope="TEST" />
<orderEntry type="module" module-name="descriptors" /> <orderEntry type="module" module-name="descriptors" />
<orderEntry type="module" module-name="frontend.java" /> <orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="serialization" /> <orderEntry type="module" module-name="deserialization" />
<orderEntry type="module" module-name="compiler-tests" scope="TEST" /> <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
<orderEntry type="library" name="asm" level="project" /> <orderEntry type="library" name="asm" level="project" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
js/js.frontend/js.frontend.iml
-1
View File
@@ -12,7 +12,6 @@
<orderEntry type="module" module-name="js.dart-ast" exported="" /> <orderEntry type="module" module-name="js.dart-ast" exported="" />
<orderEntry type="module" module-name="js.parser" exported="" /> <orderEntry type="module" module-name="js.parser" exported="" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="js.serializer" /> <orderEntry type="module" module-name="js.serializer" />
</component> </component>
</module> </module>
libraries/tools/kotlin-reflect/pom.xml
+1 -1
View File
@@ -54,8 +54,8 @@
<fileset dir="${basedir}/../../../core/descriptor.loader.java/src"/> <fileset dir="${basedir}/../../../core/descriptor.loader.java/src"/>
<fileset dir="${basedir}/../../../core/descriptors/src"/> <fileset dir="${basedir}/../../../core/descriptors/src"/>
<fileset dir="${basedir}/../../../core/descriptors.runtime/src"/> <fileset dir="${basedir}/../../../core/descriptors.runtime/src"/>
<fileset dir="${basedir}/../../../core/deserialization/src"/>
<fileset dir="${basedir}/../../../core/reflection.jvm/src"/> <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
<fileset dir="${basedir}/../../../core/serialization/src"/>
<fileset dir="${basedir}/../../../core/util.runtime/src"/> <fileset dir="${basedir}/../../../core/util.runtime/src"/>
</copy> </copy>
</target> </target>