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

Minor, move BuiltInsSerializerExtension to module builtins-serializer

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-16 17:33:24 +03:00
parent 7cc416ed12
commit 04b8991bdd
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt → compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
+6 -7
View File
@@ -21,12 +21,11 @@ import org.jetbrains.kotlin.resolve.constants.NullValue
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.serialization.*
public class BuiltInsSerializerExtension() : SerializerExtension() { public class BuiltInsSerializerExtension : SerializerExtension() {
private val annotationSerializer = AnnotationSerializer() private val annotationSerializer = AnnotationSerializer()
override fun serializeClass(descriptor: ClassDescriptor, proto: ProtoBuf.Class.Builder, stringTable: StringTable) { override fun serializeClass(descriptor: ClassDescriptor, proto: ProtoBuf.Class.Builder, stringTable: StringTable) {
for (annotation in descriptor.getAnnotations()) { for (annotation in descriptor.annotations) {
proto.addExtension(BuiltInsProtoBuf.classAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable)) proto.addExtension(BuiltInsProtoBuf.classAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable))
} }
} }
@@ -41,7 +40,7 @@ public class BuiltInsSerializerExtension() : SerializerExtension() {
} }
for (descriptor in DescriptorSerializer.sort(classes)) { for (descriptor in DescriptorSerializer.sort(classes)) {
proto.addExtension(BuiltInsProtoBuf.className, stringTable.getSimpleNameIndex(descriptor.getName())) proto.addExtension(BuiltInsProtoBuf.className, stringTable.getSimpleNameIndex(descriptor.name))
} }
} }
@@ -50,11 +49,11 @@ public class BuiltInsSerializerExtension() : SerializerExtension() {
proto: ProtoBuf.Callable.Builder, proto: ProtoBuf.Callable.Builder,
stringTable: StringTable stringTable: StringTable
) { ) {
for (annotation in callable.getAnnotations()) { for (annotation in callable.annotations) {
proto.addExtension(BuiltInsProtoBuf.callableAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable)) proto.addExtension(BuiltInsProtoBuf.callableAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable))
} }
val propertyDescriptor = callable as? PropertyDescriptor ?: return val propertyDescriptor = callable as? PropertyDescriptor ?: return
val compileTimeConstant = propertyDescriptor.getCompileTimeInitializer() val compileTimeConstant = propertyDescriptor.compileTimeInitializer
if (compileTimeConstant != null && compileTimeConstant !is NullValue) { if (compileTimeConstant != null && compileTimeConstant !is NullValue) {
val valueProto = annotationSerializer.valueProto(compileTimeConstant, compileTimeConstant.type, stringTable) val valueProto = annotationSerializer.valueProto(compileTimeConstant, compileTimeConstant.type, stringTable)
proto.setExtension(BuiltInsProtoBuf.compileTimeValue, valueProto.build()) proto.setExtension(BuiltInsProtoBuf.compileTimeValue, valueProto.build())
@@ -66,7 +65,7 @@ public class BuiltInsSerializerExtension() : SerializerExtension() {
proto: ProtoBuf.Callable.ValueParameter.Builder, proto: ProtoBuf.Callable.ValueParameter.Builder,
stringTable: StringTable stringTable: StringTable
) { ) {
for (annotation in descriptor.getAnnotations()) { for (annotation in descriptor.annotations) {
proto.addExtension(BuiltInsProtoBuf.parameterAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable)) proto.addExtension(BuiltInsProtoBuf.parameterAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable))
} }
} }