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

Cleanup descriptors.proto, regenerate

Browse Source 
- move enums and messages nested in Callable to top level, since they're likely
  to be reused in other messages soon
- delete obsolete comments: some did not any value, some became obsolete with
  custom options ("id in StringTable" -> name_id_in_table)
This commit is contained in:
Alexander Udalov
2015-09-29 18:37:00 +03:00
parent b09e727462
commit e4090d3f30
30 changed files with 2490 additions and 3365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+1328 -1771
View File
File diff suppressed because it is too large Load Diff
compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+7 -7
View File
@@ -59,11 +59,11 @@ public final class DebugBuiltInsProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
/**
* <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
@@ -91,11 +91,11 @@ public final class DebugBuiltInsProtoBuf {
"ion.Annotation:\210\001\n\022compile_time_value\022,." +
"org.jetbrains.kotlin.serialization.Calla" +
"ble\030\227\001 \001(\0132=.org.jetbrains.kotlin.serial" +
"ization.Annotation.Argument.Value:\212\001\n\024pa" +
"rameter_annotation\022;.org.jetbrains.kotli" +
"n.serialization.Callable.ValueParameter\030" +
"\226\001 \003(\0132..org.jetbrains.kotlin.serializat" +
"ion.AnnotationB\027B\025DebugBuiltInsProtoBuf"
"ization.Annotation.Argument.Value:\201\001\n\024pa" +
"rameter_annotation\0222.org.jetbrains.kotli" +
"n.serialization.ValueParameter\030\226\001 \003(\0132.." +
"org.jetbrains.kotlin.serialization.Annot" +
"ationB\027B\025DebugBuiltInsProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+10 -10
View File
@@ -1836,11 +1836,11 @@ public final class DebugJsProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
/**
* <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
@@ -1896,14 +1896,14 @@ public final class DebugJsProtoBuf {
".Annotation:\210\001\n\022compile_time_value\022,.org" +
".jetbrains.kotlin.serialization.Callable" +
"\030\203\001 \001(\0132=.org.jetbrains.kotlin.serializa" +
"tion.Annotation.Argument.Value:\212\001\n\024param" +
"eter_annotation\022;.org.jetbrains.kotlin.s" +
"erialization.Callable.ValueParameter\030\202\001 " +
"\003(\0132..org.jetbrains.kotlin.serialization",
".Annotation:r\n\017type_annotation\022(.org.jet" +
"brains.kotlin.serialization.Type\030\202\001 \003(\0132" +
"..org.jetbrains.kotlin.serialization.Ann" +
"otationB\021B\017DebugJsProtoBuf"
"tion.Annotation.Argument.Value:\201\001\n\024param" +
"eter_annotation\0222.org.jetbrains.kotlin.s" +
"erialization.ValueParameter\030\202\001 \003(\0132..org" +
".jetbrains.kotlin.serialization.Annotati",
"on:r\n\017type_annotation\022(.org.jetbrains.ko" +
"tlin.serialization.Type\030\202\001 \003(\0132..org.jet" +
"brains.kotlin.serialization.AnnotationB\021" +
"B\017DebugJsProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+8 -8
View File
@@ -4578,11 +4578,11 @@ public final class DebugJvmProtoBuf {
null);
public static final int INDEX_FIELD_NUMBER = 100;
/**
* <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
java.lang.Integer> index = com.google.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.Integer.class,
@@ -4672,12 +4672,12 @@ public final class DebugJvmProtoBuf {
"rains.kotlin.serialization.Type\030d \003(\0132.." +
"org.jetbrains.kotlin.serialization.Annot" +
"ation:8\n\006is_raw\022(.org.jetbrains.kotlin.s",
"erialization.Type\030e \001(\010:J\n\005index\022;.org.j" +
"etbrains.kotlin.serialization.Callable.V" +
"alueParameter\030d \001(\005:s\n\020class_annotation\022" +
").org.jetbrains.kotlin.serialization.Cla" +
"ss\030d \003(\0132..org.jetbrains.kotlin.serializ" +
"ation.AnnotationB\022B\020DebugJvmProtoBuf"
"erialization.Type\030e \001(\010:A\n\005index\0222.org.j" +
"etbrains.kotlin.serialization.ValueParam" +
"eter\030d \001(\005:s\n\020class_annotation\022).org.jet" +
"brains.kotlin.serialization.Class\030d \003(\0132" +
"..org.jetbrains.kotlin.serialization.Ann" +
"otationB\022B\020DebugJvmProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {