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

Write module name as proto extension instead of another annotation argument

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-30 19:17:02 +03:00
parent d4c4515944
commit a4daa08e5c
20 changed files with 171 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+3 -1
View File
@@ -587,7 +587,7 @@ public class DescriptorSerializer {
builder.setTypeTable(typeTableProto);
}
extension.serializePackage(fragments, builder);
extension.serializePackage(builder);
return builder;
}
@@ -610,6 +610,8 @@ public class DescriptorSerializer {
builder.setTypeTable(typeTableProto);
}
extension.serializePackage(builder);
return builder;
}
compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
+1 -3
View File
@@ -20,8 +20,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.types.KotlinType;
import java.util.Collection;
public abstract class SerializerExtension {
@NotNull
public abstract StringTable getStringTable();
@@ -33,7 +31,7 @@ public abstract class SerializerExtension {
public void serializeClass(@NotNull ClassDescriptor descriptor, @NotNull ProtoBuf.Class.Builder proto) {
}
public void serializePackage(@NotNull Collection<PackageFragmentDescriptor> packageFragments, @NotNull ProtoBuf.Package.Builder proto) {
public void serializePackage(@NotNull ProtoBuf.Package.Builder proto) {
}
public void serializeConstructor(@NotNull ConstructorDescriptor descriptor, @NotNull ProtoBuf.Constructor.Builder proto) {