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

Add default value to js_code_binary_version in js.proto

Browse Source 
By default, assume the version is 1.0.0
This commit is contained in:
Alexander Udalov
2017-01-31 15:10:21 +03:00
parent a03ed6f742
commit 57877bb007
3 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+71 -71
View File
@@ -43,7 +43,7 @@ public final class DebugJsProtoBuf {
int getFlags(); int getFlags();
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -51,7 +51,7 @@ public final class DebugJsProtoBuf {
*/ */
boolean hasJsCodeBinaryVersion(); boolean hasJsCodeBinaryVersion();
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -207,7 +207,7 @@ public final class DebugJsProtoBuf {
public static final int JS_CODE_BINARY_VERSION_FIELD_NUMBER = 2; public static final int JS_CODE_BINARY_VERSION_FIELD_NUMBER = 2;
private int jsCodeBinaryVersion_; private int jsCodeBinaryVersion_;
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -217,7 +217,7 @@ public final class DebugJsProtoBuf {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -271,7 +271,7 @@ public final class DebugJsProtoBuf {
private void initFields() { private void initFields() {
flags_ = 0; flags_ = 0;
jsCodeBinaryVersion_ = 0; jsCodeBinaryVersion_ = 1;
packageFqName_ = ""; packageFqName_ = "";
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -436,7 +436,7 @@ public final class DebugJsProtoBuf {
super.clear(); super.clear();
flags_ = 0; flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
jsCodeBinaryVersion_ = 0; jsCodeBinaryVersion_ = 1;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
packageFqName_ = ""; packageFqName_ = "";
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -582,9 +582,9 @@ public final class DebugJsProtoBuf {
return this; return this;
} }
private int jsCodeBinaryVersion_ ; private int jsCodeBinaryVersion_ = 1;
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -594,7 +594,7 @@ public final class DebugJsProtoBuf {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -604,7 +604,7 @@ public final class DebugJsProtoBuf {
return jsCodeBinaryVersion_; return jsCodeBinaryVersion_;
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -617,7 +617,7 @@ public final class DebugJsProtoBuf {
return this; return this;
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -625,7 +625,7 @@ public final class DebugJsProtoBuf {
*/ */
public Builder clearJsCodeBinaryVersion() { public Builder clearJsCodeBinaryVersion() {
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
jsCodeBinaryVersion_ = 0; jsCodeBinaryVersion_ = 1;
onChanged(); onChanged();
return this; return this;
} }
@@ -5478,65 +5478,65 @@ public final class DebugJsProtoBuf {
"\n#js/js.serializer/src/js.debug.proto\022%o" + "\n#js/js.serializer/src/js.debug.proto\022%o" +
"rg.jetbrains.kotlin.serialization.js\0320co" + "rg.jetbrains.kotlin.serialization.js\0320co" +
"re/deserialization/src/descriptors.debug" + "re/deserialization/src/descriptors.debug" +
".proto\"P\n\006Header\022\r\n\005flags\030\001 \001(\005\022\036\n\026js_co" + ".proto\"S\n\006Header\022\r\n\005flags\030\001 \001(\005\022!\n\026js_co" +
"de_binary_version\030\002 \001(\005\022\027\n\017package_fq_na" + "de_binary_version\030\002 \001(\005:\0011\022\027\n\017package_fq" +
"me\030\003 \001(\t\"V\n\004File\022\n\n\002id\030\001 \001(\005\022B\n\nannotati" + "_name\030\003 \001(\t\"V\n\004File\022\n\n\002id\030\001 \001(\005\022B\n\nannot" +
"on\030\002 \003(\0132..org.jetbrains.kotlin.serializ" + "ation\030\002 \003(\0132..org.jetbrains.kotlin.seria" +
"ation.Annotation\"B\n\005Files\0229\n\004file\030\001 \003(\0132" + "lization.Annotation\"B\n\005Files\0229\n\004file\030\001 \003" +
"+.org.jetbrains.kotlin.serialization.js." + "(\0132+.org.jetbrains.kotlin.serialization." +
"File\"!\n\007Classes\022\026\n\nclass_name\030\001 \003(\005B\002\020\001\"", "js.File\"!\n\007Classes\022\026\n\nclass_name\030\001 \003(\005B\002",
"\265\004\n\007Library\022H\n\004kind\030\001 \001(\01623.org.jetbrain" + "\020\001\"\265\004\n\007Library\022H\n\004kind\030\001 \001(\01623.org.jetbr" +
"s.kotlin.serialization.js.Library.Kind:\005" + "ains.kotlin.serialization.js.Library.Kin" +
"PLAIN\022A\n\004part\030\002 \003(\01323.org.jetbrains.kotl" + "d:\005PLAIN\022A\n\004part\030\002 \003(\01323.org.jetbrains.k" +
"in.serialization.js.Library.Part\022\027\n\017impo" + "otlin.serialization.js.Library.Part\022\027\n\017i" +
"rted_module\030\003 \003(\t\032\317\002\n\004Part\022@\n\007strings\030\001 " + "mported_module\030\003 \003(\t\032\317\002\n\004Part\022@\n\007strings" +
"\001(\0132/.org.jetbrains.kotlin.serialization" + "\030\001 \001(\0132/.org.jetbrains.kotlin.serializat" +
".StringTable\022O\n\017qualified_names\030\002 \001(\01326." + "ion.StringTable\022O\n\017qualified_names\030\002 \001(\013" +
"org.jetbrains.kotlin.serialization.Quali" + "26.org.jetbrains.kotlin.serialization.Qu" +
"fiedNameTable\022<\n\007package\030\003 \001(\0132+.org.jet" + "alifiedNameTable\022<\n\007package\030\003 \001(\0132+.org." +
"brains.kotlin.serialization.Package\0228\n\005c", "jetbrains.kotlin.serialization.Package\0228",
"lass\030\004 \003(\0132).org.jetbrains.kotlin.serial" + "\n\005class\030\004 \003(\0132).org.jetbrains.kotlin.ser" +
"ization.Class\022<\n\005files\030\202\001 \001(\0132,.org.jetb" + "ialization.Class\022<\n\005files\030\202\001 \001(\0132,.org.j" +
"rains.kotlin.serialization.js.Files\"2\n\004K" + "etbrains.kotlin.serialization.js.Files\"2" +
"ind\022\t\n\005PLAIN\020\001\022\007\n\003AMD\020\002\022\r\n\tCOMMON_JS\020\003\022\007" + "\n\004Kind\022\t\n\005PLAIN\020\001\022\007\n\003AMD\020\002\022\r\n\tCOMMON_JS\020" +
"\n\003UMD\020\004:E\n\017package_fq_name\022+.org.jetbrai" + "\003\022\007\n\003UMD\020\004:E\n\017package_fq_name\022+.org.jetb" +
"ns.kotlin.serialization.Package\030\203\001 \001(\005:t" + "rains.kotlin.serialization.Package\030\203\001 \001(" +
"\n\020class_annotation\022).org.jetbrains.kotli" + "\005:t\n\020class_annotation\022).org.jetbrains.ko" +
"n.serialization.Class\030\202\001 \003(\0132..org.jetbr" + "tlin.serialization.Class\030\202\001 \003(\0132..org.je" +
"ains.kotlin.serialization.Annotation:L\n\030" + "tbrains.kotlin.serialization.Annotation:" +
"class_containing_file_id\022).org.jetbrains", "L\n\030class_containing_file_id\022).org.jetbra",
".kotlin.serialization.Class\030\207\001 \001(\005:\200\001\n\026c" + "ins.kotlin.serialization.Class\030\207\001 \001(\005:\200\001" +
"onstructor_annotation\022/.org.jetbrains.ko" + "\n\026constructor_annotation\022/.org.jetbrains" +
"tlin.serialization.Constructor\030\202\001 \003(\0132.." + ".kotlin.serialization.Constructor\030\202\001 \003(\013" +
"org.jetbrains.kotlin.serialization.Annot" + "2..org.jetbrains.kotlin.serialization.An" +
"ation:z\n\023function_annotation\022,.org.jetbr" + "notation:z\n\023function_annotation\022,.org.je" +
"ains.kotlin.serialization.Function\030\202\001 \003(" + "tbrains.kotlin.serialization.Function\030\202\001" +
"\0132..org.jetbrains.kotlin.serialization.A" + " \003(\0132..org.jetbrains.kotlin.serializatio" +
"nnotation:R\n\033function_containing_file_id" + "n.Annotation:R\n\033function_containing_file" +
"\022,.org.jetbrains.kotlin.serialization.Fu" + "_id\022,.org.jetbrains.kotlin.serialization" +
"nction\030\207\001 \001(\005:z\n\023property_annotation\022,.o", ".Function\030\207\001 \001(\005:z\n\023property_annotation\022",
"rg.jetbrains.kotlin.serialization.Proper" + ",.org.jetbrains.kotlin.serialization.Pro" +
"ty\030\202\001 \003(\0132..org.jetbrains.kotlin.seriali" + "perty\030\202\001 \003(\0132..org.jetbrains.kotlin.seri" +
"zation.Annotation:\210\001\n\022compile_time_value" + "alization.Annotation:\210\001\n\022compile_time_va" +
"\022,.org.jetbrains.kotlin.serialization.Pr" + "lue\022,.org.jetbrains.kotlin.serialization" +
"operty\030\203\001 \001(\0132=.org.jetbrains.kotlin.ser" + ".Property\030\203\001 \001(\0132=.org.jetbrains.kotlin." +
"ialization.Annotation.Argument.Value:R\n\033" + "serialization.Annotation.Argument.Value:" +
"property_containing_file_id\022,.org.jetbra" + "R\n\033property_containing_file_id\022,.org.jet" +
"ins.kotlin.serialization.Property\030\207\001 \001(\005" + "brains.kotlin.serialization.Property\030\207\001 " +
":}\n\025enum_entry_annotation\022-.org.jetbrain" + "\001(\005:}\n\025enum_entry_annotation\022-.org.jetbr" +
"s.kotlin.serialization.EnumEntry\030\202\001 \003(\0132", "ains.kotlin.serialization.EnumEntry\030\202\001 \003",
"..org.jetbrains.kotlin.serialization.Ann" + "(\0132..org.jetbrains.kotlin.serialization." +
"otation:\201\001\n\024parameter_annotation\0222.org.j" + "Annotation:\201\001\n\024parameter_annotation\0222.or" +
"etbrains.kotlin.serialization.ValueParam" + "g.jetbrains.kotlin.serialization.ValuePa" +
"eter\030\202\001 \003(\0132..org.jetbrains.kotlin.seria" + "rameter\030\202\001 \003(\0132..org.jetbrains.kotlin.se" +
"lization.Annotation:r\n\017type_annotation\022(" + "rialization.Annotation:r\n\017type_annotatio" +
".org.jetbrains.kotlin.serialization.Type" + "n\022(.org.jetbrains.kotlin.serialization.T" +
"\030\202\001 \003(\0132..org.jetbrains.kotlin.serializa" + "ype\030\202\001 \003(\0132..org.jetbrains.kotlin.serial" +
"tion.Annotation:\205\001\n\031type_parameter_annot" + "ization.Annotation:\205\001\n\031type_parameter_an" +
"ation\0221.org.jetbrains.kotlin.serializati" + "notation\0221.org.jetbrains.kotlin.serializ" +
"on.TypeParameter\030\202\001 \003(\0132..org.jetbrains.", "ation.TypeParameter\030\202\001 \003(\0132..org.jetbrai",
"kotlin.serialization.AnnotationB\021B\017Debug" + "ns.kotlin.serialization.AnnotationB\021B\017De" +
"JsProtoBuf" "bugJsProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
js/js.serializer/src/js.proto
+1 -1
View File
@@ -28,7 +28,7 @@ message Header {
optional int32 flags = 1; optional int32 flags = 1;
// (patch << 16) + (minor << 8) + major // (patch << 16) + (minor << 8) + major
optional int32 js_code_binary_version = 2; optional int32 js_code_binary_version = 2 [default = 1];
optional string package_fq_name = 3; optional string package_fq_name = 3;
} }
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+12 -12
View File
@@ -43,7 +43,7 @@ public final class JsProtoBuf {
int getFlags(); int getFlags();
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -51,7 +51,7 @@ public final class JsProtoBuf {
*/ */
boolean hasJsCodeBinaryVersion(); boolean hasJsCodeBinaryVersion();
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -199,7 +199,7 @@ public final class JsProtoBuf {
public static final int JS_CODE_BINARY_VERSION_FIELD_NUMBER = 2; public static final int JS_CODE_BINARY_VERSION_FIELD_NUMBER = 2;
private int jsCodeBinaryVersion_; private int jsCodeBinaryVersion_;
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -209,7 +209,7 @@ public final class JsProtoBuf {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -263,7 +263,7 @@ public final class JsProtoBuf {
private void initFields() { private void initFields() {
flags_ = 0; flags_ = 0;
jsCodeBinaryVersion_ = 0; jsCodeBinaryVersion_ = 1;
packageFqName_ = ""; packageFqName_ = "";
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -405,7 +405,7 @@ public final class JsProtoBuf {
super.clear(); super.clear();
flags_ = 0; flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
jsCodeBinaryVersion_ = 0; jsCodeBinaryVersion_ = 1;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
packageFqName_ = ""; packageFqName_ = "";
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -537,9 +537,9 @@ public final class JsProtoBuf {
return this; return this;
} }
private int jsCodeBinaryVersion_ ; private int jsCodeBinaryVersion_ = 1;
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -549,7 +549,7 @@ public final class JsProtoBuf {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -559,7 +559,7 @@ public final class JsProtoBuf {
return jsCodeBinaryVersion_; return jsCodeBinaryVersion_;
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -572,7 +572,7 @@ public final class JsProtoBuf {
return this; return this;
} }
/** /**
* <code>optional int32 js_code_binary_version = 2;</code> * <code>optional int32 js_code_binary_version = 2 [default = 1];</code>
* *
* <pre> * <pre>
* (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major * (patch &lt;&lt; 16) + (minor &lt;&lt; 8) + major
@@ -580,7 +580,7 @@ public final class JsProtoBuf {
*/ */
public Builder clearJsCodeBinaryVersion() { public Builder clearJsCodeBinaryVersion() {
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
jsCodeBinaryVersion_ = 0; jsCodeBinaryVersion_ = 1;
return this; return this;
} }