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

Move ClassSerializationUtil to 'compiler-tests' module

Browse Source 
It's not used in 'serialization'
This commit is contained in:
Alexander Udalov
2013-09-23 17:52:59 +04:00
parent ee92ebe941
commit 91cbe3e239
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java → compiler/tests/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java
+9 -19
View File
@@ -20,8 +20,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import java.util.Collection; import java.util.Collection;
@@ -34,7 +32,11 @@ public class ClassSerializationUtil {
void writeClass(@NotNull ClassDescriptor classDescriptor, @NotNull ProtoBuf.Class classProto); void writeClass(@NotNull ClassDescriptor classDescriptor, @NotNull ProtoBuf.Class classProto);
} }
public static void serializeClass(@NotNull ClassDescriptor classDescriptor, @NotNull DescriptorSerializer serializer, @NotNull Sink sink) { private static void serializeClass(
@NotNull ClassDescriptor classDescriptor,
@NotNull DescriptorSerializer serializer,
@NotNull Sink sink
) {
ProtoBuf.Class classProto = serializer.classProto(classDescriptor).build(); ProtoBuf.Class classProto = serializer.classProto(classDescriptor).build();
sink.writeClass(classDescriptor, classProto); sink.writeClass(classDescriptor, classProto);
@@ -62,22 +64,10 @@ public class ClassSerializationUtil {
@NotNull @NotNull
public static ClassId getClassId(@NotNull ClassDescriptor classDescriptor) { public static ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
DeclarationDescriptor containingDeclaration = classDescriptor.getContainingDeclaration(); DeclarationDescriptor owner = classDescriptor.getContainingDeclaration();
if (containingDeclaration instanceof NamespaceDescriptor) { if (owner instanceof NamespaceDescriptor) {
NamespaceDescriptor namespaceDescriptor = (NamespaceDescriptor) containingDeclaration; return new ClassId(((NamespaceDescriptor) owner).getFqName(), FqNameUnsafe.topLevel(classDescriptor.getName()));
return new ClassId(getPackageFqName(namespaceDescriptor), FqNameUnsafe.topLevel(classDescriptor.getName()));
} }
// it must be a nested class return getClassId((ClassDescriptor) owner).createNestedClassId(classDescriptor.getName());
ClassDescriptor outer = (ClassDescriptor) containingDeclaration;
ClassId outerId = getClassId(outer);
return outerId.createNestedClassId(classDescriptor.getName());
}
@NotNull
public static FqName getPackageFqName(@NotNull NamespaceDescriptor namespaceDescriptor) {
if (DescriptorUtils.isRootNamespace(namespaceDescriptor)) return FqName.ROOT;
NamespaceDescriptor parent = (NamespaceDescriptor) namespaceDescriptor.getContainingDeclaration();
return getPackageFqName(parent).child(namespaceDescriptor.getName());
} }
} }