From b7746cbee77937a515b619acfe13f70125af5cc2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 29 Apr 2014 21:32:08 +0400 Subject: [PATCH] Move module 'serialization' to core/ --- .idea/modules.xml | 2 +- build.xml | 2 +- .../serialization/DebugJavaProtoBuf.java | 78 ++++---- .../serialization/DebugProtoBuf.java | 166 +++++++++--------- .../src/java_descriptors.proto | 2 +- .../serialization/serialization.iml | 1 - .../serialization/src/descriptors.proto | 0 .../AbstractDescriptorFinder.java | 0 .../descriptors/serialization/ClassData.java | 0 .../descriptors/serialization/ClassId.java | 0 .../serialization/DescriptorDeserializer.java | 0 .../serialization/DescriptorFinder.java | 0 .../serialization/DescriptorSerializer.java | 0 .../jet/descriptors/serialization/Flags.java | 0 .../descriptors/serialization/Interner.java | 0 .../serialization/NameResolver.java | 0 .../serialization/NameSerializationUtil.java | 0 .../descriptors/serialization/NameTable.java | 0 .../serialization/PackageData.java | 0 .../descriptors/serialization/ProtoBuf.java | 10 +- .../serialization/SerializerExtension.java | 0 .../serialization/TypeDeserializer.java | 0 .../descriptors/AnnotationDeserializer.java | 0 .../descriptors/ConstantDeserializer.java | 0 .../DeserializedCallableMemberDescriptor.kt | 0 .../DeserializedClassDescriptor.java | 0 .../descriptors/DeserializedMemberScope.java | 0 .../DeserializedPackageMemberScope.java | 0 .../DeserializedPropertyDescriptor.kt | 0 .../DeserializedSimpleFunctionDescriptor.java | 0 .../DeserializedTypeParameterDescriptor.java | 0 .../descriptors/Deserializers.java | 0 .../serialization/descriptors/MemberFilter.kt | 0 .../generators/protobuf/GenerateProtoBuf.kt | 4 +- 34 files changed, 140 insertions(+), 125 deletions(-) rename {compiler/frontend => core}/serialization/serialization.iml (90%) rename {compiler/frontend => core}/serialization/src/descriptors.proto (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorFinder.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java (99%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ConstantDeserializer.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/Deserializers.java (100%) rename {compiler/frontend => core}/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/MemberFilter.kt (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 830d9ea81f9..6c8c0174592 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -36,7 +36,7 @@ - + diff --git a/build.xml b/build.xml index 25eeb38c3bc..aa6edb1dcbe 100644 --- a/build.xml +++ b/build.xml @@ -61,7 +61,7 @@ - + diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java index 69e40086b29..6fa69b02566 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java @@ -3796,45 +3796,45 @@ public final class DebugJavaProtoBuf { java.lang.String[] descriptorData = { "\n8core/serialization.java/src/java_descr" + "iptors.debug.proto\022+org.jetbrains.jet.de" + - "scriptors.serialization\032;compiler/fronte" + - "nd/serialization/src/descriptors.debug.p" + - "roto\"\213\002\n\010JavaType\022[\n\016primitive_type\030\001 \001(" + - "\0162C.org.jetbrains.jet.descriptors.serial" + - "ization.JavaType.PrimitiveType\022\025\n\rclass_" + - "fq_name\030\002 \001(\005\022\032\n\017array_dimension\030\003 \001(\005:\001" + - "0\"o\n\rPrimitiveType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020" + - "\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020", - "\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023J" + - "avaMethodSignature\022\014\n\004name\030\001 \002(\005\022J\n\013retu" + - "rn_type\030\002 \002(\01325.org.jetbrains.jet.descri" + - "ptors.serialization.JavaType\022M\n\016paramete" + - "r_type\030\003 \003(\01325.org.jetbrains.jet.descrip" + - "tors.serialization.JavaType\"\212\001\n\022JavaFiel" + - "dSignature\022\014\n\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325" + - ".org.jetbrains.jet.descriptors.serializa" + - "tion.JavaType\022!\n\022is_static_in_outer\030\003 \001(" + - "\010:\005false\"\347\002\n\025JavaPropertySignature\022N\n\005fi", - "eld\030\001 \001(\0132?.org.jetbrains.jet.descriptor" + - "s.serialization.JavaFieldSignature\022Z\n\020sy" + - "nthetic_method\030\002 \001(\0132@.org.jetbrains.jet" + - ".descriptors.serialization.JavaMethodSig" + - "nature\022P\n\006getter\030\003 \001(\0132@.org.jetbrains.j" + - "et.descriptors.serialization.JavaMethodS" + - "ignature\022P\n\006setter\030\004 \001(\0132@.org.jetbrains" + - ".jet.descriptors.serialization.JavaMetho" + - "dSignature:\221\001\n\020method_signature\0225.org.je" + - "tbrains.jet.descriptors.serialization.Ca", - "llable\030d \001(\0132@.org.jetbrains.jet.descrip" + - "tors.serialization.JavaMethodSignature:\225" + - "\001\n\022property_signature\0225.org.jetbrains.je" + - "t.descriptors.serialization.Callable\030e \001" + - "(\0132B.org.jetbrains.jet.descriptors.seria" + - "lization.JavaPropertySignature:N\n\017impl_c" + - "lass_name\0225.org.jetbrains.jet.descriptor" + - "s.serialization.Callable\030f \001(\005:S\n\005index\022" + - "D.org.jetbrains.jet.descriptors.serializ" + - "ation.Callable.ValueParameter\030d \001(\005B\023B\021D", - "ebugJavaProtoBuf" + "scriptors.serialization\032.core/serializat" + + "ion/src/descriptors.debug.proto\"\213\002\n\010Java" + + "Type\022[\n\016primitive_type\030\001 \001(\0162C.org.jetbr" + + "ains.jet.descriptors.serialization.JavaT" + + "ype.PrimitiveType\022\025\n\rclass_fq_name\030\002 \001(\005" + + "\022\032\n\017array_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiv" + + "eType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010" + + "\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022", + "\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023JavaMethodSign" + + "ature\022\014\n\004name\030\001 \002(\005\022J\n\013return_type\030\002 \002(\013" + + "25.org.jetbrains.jet.descriptors.seriali" + + "zation.JavaType\022M\n\016parameter_type\030\003 \003(\0132" + + "5.org.jetbrains.jet.descriptors.serializ" + + "ation.JavaType\"\212\001\n\022JavaFieldSignature\022\014\n" + + "\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325.org.jetbrain" + + "s.jet.descriptors.serialization.JavaType" + + "\022!\n\022is_static_in_outer\030\003 \001(\010:\005false\"\347\002\n\025" + + "JavaPropertySignature\022N\n\005field\030\001 \001(\0132?.o", + "rg.jetbrains.jet.descriptors.serializati" + + "on.JavaFieldSignature\022Z\n\020synthetic_metho" + + "d\030\002 \001(\0132@.org.jetbrains.jet.descriptors." + + "serialization.JavaMethodSignature\022P\n\006get" + + "ter\030\003 \001(\0132@.org.jetbrains.jet.descriptor" + + "s.serialization.JavaMethodSignature\022P\n\006s" + + "etter\030\004 \001(\0132@.org.jetbrains.jet.descript" + + "ors.serialization.JavaMethodSignature:\221\001" + + "\n\020method_signature\0225.org.jetbrains.jet.d" + + "escriptors.serialization.Callable\030d \001(\0132", + "@.org.jetbrains.jet.descriptors.serializ" + + "ation.JavaMethodSignature:\225\001\n\022property_s" + + "ignature\0225.org.jetbrains.jet.descriptors" + + ".serialization.Callable\030e \001(\0132B.org.jetb" + + "rains.jet.descriptors.serialization.Java" + + "PropertySignature:N\n\017impl_class_name\0225.o" + + "rg.jetbrains.jet.descriptors.serializati" + + "on.Callable\030f \001(\005:S\n\005index\022D.org.jetbrai" + + "ns.jet.descriptors.serialization.Callabl" + + "e.ValueParameter\030d \001(\005B\023B\021DebugJavaProto", + "Buf" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java index a9eca1a0f22..73d1f262c82 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compiler/frontend/serialization/src/descriptors.debug.proto +// source: core/serialization/src/descriptors.debug.proto package org.jetbrains.jet.descriptors.serialization; @@ -10307,6 +10307,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ boolean hasFlags(); @@ -10322,6 +10323,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ int getFlags(); @@ -11852,6 +11854,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public boolean hasFlags() { @@ -11869,6 +11872,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public int getFlags() { @@ -12667,6 +12671,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public boolean hasFlags() { @@ -12684,6 +12689,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public int getFlags() { @@ -12701,6 +12707,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public Builder setFlags(int value) { @@ -12721,6 +12728,7 @@ public final class DebugProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public Builder clearFlags() { @@ -13830,85 +13838,85 @@ public final class DebugProtoBuf { descriptor; static { java.lang.String[] descriptorData = { - "\n;compiler/frontend/serialization/src/de" + - "scriptors.debug.proto\022+org.jetbrains.jet" + - ".descriptors.serialization\"\037\n\017SimpleName" + - "Table\022\014\n\004name\030\001 \003(\t\"\317\002\n\022QualifiedNameTab" + - "le\022e\n\016qualified_name\030\001 \003(\0132M.org.jetbrai" + - "ns.jet.descriptors.serialization.Qualifi" + - "edNameTable.QualifiedName\032\321\001\n\rQualifiedN" + - "ame\022!\n\025parent_qualified_name\030\001 \001(\005:\002-1\022\022" + - "\n\nshort_name\030\002 \002(\005\022i\n\004kind\030\003 \001(\0162R.org.j" + - "etbrains.jet.descriptors.serialization.Q", - "ualifiedNameTable.QualifiedName.Kind:\007PA" + - "CKAGE\"\036\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\263\004" + - "\n\004Type\022R\n\013constructor\030\001 \002(\0132=.org.jetbra" + - "ins.jet.descriptors.serialization.Type.C" + - "onstructor\022L\n\010argument\030\002 \003(\0132:.org.jetbr" + - "ains.jet.descriptors.serialization.Type." + - "Argument\022\027\n\010nullable\030\003 \001(\010:\005false\032\231\001\n\013Co" + - "nstructor\022W\n\004kind\030\001 \001(\0162B.org.jetbrains." + - "jet.descriptors.serialization.Type.Const" + - "ructor.Kind:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t", - "\n\005CLASS\020\000\022\022\n\016TYPE_PARAMETER\020\001\032\323\001\n\010Argume" + - "nt\022^\n\nprojection\030\001 \001(\0162E.org.jetbrains.j" + - "et.descriptors.serialization.Type.Argume" + - "nt.Projection:\003INV\022?\n\004type\030\002 \002(\01321.org.j" + - "etbrains.jet.descriptors.serialization.T" + - "ype\"&\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003IN" + - "V\020\002\"\213\002\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022\014\n\004nam" + - "e\030\002 \002(\005\022\026\n\007reified\030\003 \001(\010:\005false\022Z\n\010varia" + - "nce\030\004 \001(\0162C.org.jetbrains.jet.descriptor" + - "s.serialization.TypeParameter.Variance:\003", - "INV\022F\n\013upper_bound\030\005 \003(\01321.org.jetbrains" + - ".jet.descriptors.serialization.Type\"$\n\010V" + - "ariance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\254\006\n\005Cl" + - "ass\022\020\n\005flags\030\001 \001(\005:\0010\022\030\n\020extra_visibilit" + - "y\030\002 \001(\t\022\017\n\007fq_name\030\003 \002(\005\022T\n\014class_object" + - "\030\004 \001(\0132>.org.jetbrains.jet.descriptors.s" + - "erialization.Class.ClassObject\022R\n\016type_p" + - "arameter\030\005 \003(\0132:.org.jetbrains.jet.descr" + - "iptors.serialization.TypeParameter\022D\n\tsu" + - "pertype\030\006 \003(\01321.org.jetbrains.jet.descri", - "ptors.serialization.Type\022\031\n\021nested_class" + - "_name\030\007 \003(\005\022E\n\006member\030\013 \003(\01325.org.jetbra" + - "ins.jet.descriptors.serialization.Callab" + - "le\022\022\n\nenum_entry\030\014 \003(\005\022b\n\023primary_constr" + - "uctor\030\r \001(\0132E.org.jetbrains.jet.descript" + - "ors.serialization.Class.PrimaryConstruct" + - "or\032O\n\013ClassObject\022@\n\004data\030\001 \001(\01322.org.je" + - "tbrains.jet.descriptors.serialization.Cl" + - "ass\032Y\n\022PrimaryConstructor\022C\n\004data\030\001 \001(\0132" + - "5.org.jetbrains.jet.descriptors.serializ", - "ation.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRA" + - "IT\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020" + - "ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_" + - "OBJECT\020\006\"P\n\007Package\022E\n\006member\030\001 \003(\01325.or" + - "g.jetbrains.jet.descriptors.serializatio" + - "n.Callable\"\220\006\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\030" + - "\n\020extra_visibility\030\002 \001(\t\022\024\n\014getter_flags" + - "\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022R\n\016type_par" + - "ameter\030\004 \003(\0132:.org.jetbrains.jet.descrip" + - "tors.serialization.TypeParameter\022H\n\rrece", - "iver_type\030\005 \001(\01321.org.jetbrains.jet.desc" + - "riptors.serialization.Type\022\014\n\004name\030\006 \002(\005" + - "\022]\n\017value_parameter\030\007 \003(\0132D.org.jetbrain" + - "s.jet.descriptors.serialization.Callable" + - ".ValueParameter\022F\n\013return_type\030\010 \002(\01321.o" + + "\n.core/serialization/src/descriptors.deb" + + "ug.proto\022+org.jetbrains.jet.descriptors." + + "serialization\"\037\n\017SimpleNameTable\022\014\n\004name" + + "\030\001 \003(\t\"\317\002\n\022QualifiedNameTable\022e\n\016qualifi" + + "ed_name\030\001 \003(\0132M.org.jetbrains.jet.descri" + + "ptors.serialization.QualifiedNameTable.Q" + + "ualifiedName\032\321\001\n\rQualifiedName\022!\n\025parent" + + "_qualified_name\030\001 \001(\005:\002-1\022\022\n\nshort_name\030" + + "\002 \002(\005\022i\n\004kind\030\003 \001(\0162R.org.jetbrains.jet." + + "descriptors.serialization.QualifiedNameT", + "able.QualifiedName.Kind:\007PACKAGE\"\036\n\004Kind" + + "\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\263\004\n\004Type\022R\n\013con" + + "structor\030\001 \002(\0132=.org.jetbrains.jet.descr" + + "iptors.serialization.Type.Constructor\022L\n" + + "\010argument\030\002 \003(\0132:.org.jetbrains.jet.desc" + + "riptors.serialization.Type.Argument\022\027\n\010n" + + "ullable\030\003 \001(\010:\005false\032\231\001\n\013Constructor\022W\n\004" + + "kind\030\001 \001(\0162B.org.jetbrains.jet.descripto" + + "rs.serialization.Type.Constructor.Kind:\005" + + "CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000\022\022\n\016", + "TYPE_PARAMETER\020\001\032\323\001\n\010Argument\022^\n\nproject" + + "ion\030\001 \001(\0162E.org.jetbrains.jet.descriptor" + + "s.serialization.Type.Argument.Projection" + + ":\003INV\022?\n\004type\030\002 \002(\01321.org.jetbrains.jet." + + "descriptors.serialization.Type\"&\n\nProjec" + + "tion\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\213\002\n\rTypeP" + + "arameter\022\n\n\002id\030\001 \002(\005\022\014\n\004name\030\002 \002(\005\022\026\n\007re" + + "ified\030\003 \001(\010:\005false\022Z\n\010variance\030\004 \001(\0162C.o" + "rg.jetbrains.jet.descriptors.serializati" + - "on.Type\032\305\001\n\016ValueParameter\022\r\n\005flags\030\001 \001(" + - "\005\022\014\n\004name\030\002 \002(\005\022?\n\004type\030\003 \002(\01321.org.jetb" + - "rains.jet.descriptors.serialization.Type" + - "\022N\n\023vararg_element_type\030\004 \001(\01321.org.jetb", - "rains.jet.descriptors.serialization.Type" + - "*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021" + - "\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYN" + - "THESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003V" + - "AL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n" + - "\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRA" + - "CT\020\002*M\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIV" + - "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\t\n\005EXTR" + - "A\020\004B\022B\rDebugProtoBuf\210\001\000" + "on.TypeParameter.Variance:\003INV\022F\n\013upper_", + "bound\030\005 \003(\01321.org.jetbrains.jet.descript" + + "ors.serialization.Type\"$\n\010Variance\022\006\n\002IN" + + "\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\254\006\n\005Class\022\020\n\005flags\030" + + "\001 \001(\005:\0010\022\030\n\020extra_visibility\030\002 \001(\t\022\017\n\007fq" + + "_name\030\003 \002(\005\022T\n\014class_object\030\004 \001(\0132>.org." + + "jetbrains.jet.descriptors.serialization." + + "Class.ClassObject\022R\n\016type_parameter\030\005 \003(" + + "\0132:.org.jetbrains.jet.descriptors.serial" + + "ization.TypeParameter\022D\n\tsupertype\030\006 \003(\013" + + "21.org.jetbrains.jet.descriptors.seriali", + "zation.Type\022\031\n\021nested_class_name\030\007 \003(\005\022E" + + "\n\006member\030\013 \003(\01325.org.jetbrains.jet.descr" + + "iptors.serialization.Callable\022\022\n\nenum_en" + + "try\030\014 \003(\005\022b\n\023primary_constructor\030\r \001(\0132E" + + ".org.jetbrains.jet.descriptors.serializa" + + "tion.Class.PrimaryConstructor\032O\n\013ClassOb" + + "ject\022@\n\004data\030\001 \001(\01322.org.jetbrains.jet.d" + + "escriptors.serialization.Class\032Y\n\022Primar" + + "yConstructor\022C\n\004data\030\001 \001(\01325.org.jetbrai" + + "ns.jet.descriptors.serialization.Callabl", + "e\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n\nENUM_" + + "CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_CL" + + "ASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020\006\"P\n\007P" + + "ackage\022E\n\006member\030\001 \003(\01325.org.jetbrains.j" + + "et.descriptors.serialization.Callable\"\220\006" + + "\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\030\n\020extra_visib" + + "ility\030\002 \001(\t\022\024\n\014getter_flags\030\t \001(\005\022\024\n\014set" + + "ter_flags\030\n \001(\005\022R\n\016type_parameter\030\004 \003(\0132" + + ":.org.jetbrains.jet.descriptors.serializ" + + "ation.TypeParameter\022H\n\rreceiver_type\030\005 \001", + "(\01321.org.jetbrains.jet.descriptors.seria" + + "lization.Type\022\014\n\004name\030\006 \002(\005\022]\n\017value_par" + + "ameter\030\007 \003(\0132D.org.jetbrains.jet.descrip" + + "tors.serialization.Callable.ValueParamet" + + "er\022F\n\013return_type\030\010 \002(\01321.org.jetbrains." + + "jet.descriptors.serialization.Type\032\305\001\n\016V" + + "alueParameter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002" + + "(\005\022?\n\004type\030\003 \002(\01321.org.jetbrains.jet.des" + + "criptors.serialization.Type\022N\n\023vararg_el" + + "ement_type\030\004 \001(\01321.org.jetbrains.jet.des", + "criptors.serialization.Type*\005\010d\020\310\001\"Q\n\nMe" + + "mberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRI" + + "DE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003\":\n" + + "\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001\022\007\n\003VAR\020\002" + + "\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Modality\022\t\n\005" + + "FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002*M\n\nVisib" + + "ility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROT" + + "ECTED\020\002\022\n\n\006PUBLIC\020\003\022\t\n\005EXTRA\020\004B\022B\rDebugP" + + "rotoBuf\210\001\000" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/core/serialization.java/src/java_descriptors.proto b/core/serialization.java/src/java_descriptors.proto index 548e99d7e41..d7ecab1ce15 100644 --- a/core/serialization.java/src/java_descriptors.proto +++ b/core/serialization.java/src/java_descriptors.proto @@ -16,7 +16,7 @@ package org.jetbrains.jet.descriptors.serialization; -import "compiler/frontend/serialization/src/descriptors.proto"; +import "core/serialization/src/descriptors.proto"; option java_outer_classname = "JavaProtoBuf"; option optimize_for = LITE_RUNTIME; diff --git a/compiler/frontend/serialization/serialization.iml b/core/serialization/serialization.iml similarity index 90% rename from compiler/frontend/serialization/serialization.iml rename to core/serialization/serialization.iml index fb40f79a0b6..dbe8b500275 100644 --- a/compiler/frontend/serialization/serialization.iml +++ b/core/serialization/serialization.iml @@ -4,7 +4,6 @@ - diff --git a/compiler/frontend/serialization/src/descriptors.proto b/core/serialization/src/descriptors.proto similarity index 100% rename from compiler/frontend/serialization/src/descriptors.proto rename to core/serialization/src/descriptors.proto diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorFinder.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorFinder.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorFinder.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorFinder.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java similarity index 99% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java index babdfe1cc19..f2b70d29826 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compiler/frontend/serialization/src/descriptors.proto +// source: core/serialization/src/descriptors.proto package org.jetbrains.jet.descriptors.serialization; @@ -7834,6 +7834,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ boolean hasFlags(); @@ -7849,6 +7850,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ int getFlags(); @@ -9056,6 +9058,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public boolean hasFlags() { @@ -9073,6 +9076,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public int getFlags() { @@ -9748,6 +9752,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public boolean hasFlags() { @@ -9765,6 +9770,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public int getFlags() { @@ -9782,6 +9788,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public Builder setFlags(int value) { @@ -9802,6 +9809,7 @@ public final class ProtoBuf { *MemberKind *hasGetter *hasSetter + *hasConstant * */ public Builder clearFlags() { diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ConstantDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ConstantDeserializer.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ConstantDeserializer.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ConstantDeserializer.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/Deserializers.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/Deserializers.java similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/Deserializers.java rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/Deserializers.java diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/MemberFilter.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/MemberFilter.kt similarity index 100% rename from compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/MemberFilter.kt rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/MemberFilter.kt diff --git a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt index c5869f2192e..0fedd36c0f3 100644 --- a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt +++ b/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt @@ -36,10 +36,10 @@ fun main(args: Array) { try { checkVersion() - val commonProto = "compiler/frontend/serialization/src/descriptors.proto" + val commonProto = "core/serialization/src/descriptors.proto" val javaProto = "core/serialization.java/src/java_descriptors.proto" - execProtoc(commonProto, "compiler/frontend/serialization/src") + execProtoc(commonProto, "core/serialization/src") execProtoc(javaProto, "core/serialization.java/src") modifyAndExecProtoc(commonProto, "compiler/tests")