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

JS: use string table for module names and inline function tags

Browse Source
This commit is contained in:
Anton Bannykh
2019-02-01 15:13:26 +03:00
parent d7499363bc
commit a35fc4fa3c
5 changed files with 108 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/js-ast.proto
+2 -2
View File
@@ -32,7 +32,7 @@ enum SideEffects {
}
message JsImportedModule {
required string external_name = 1;
required int32 external_name = 1;
required int32 internal_name = 2;
optional Expression plain_reference = 3;
}
@@ -398,7 +398,7 @@ message Fragment {
}
message InlinedLocalDeclarations {
required string tag = 1;
required int32 tag = 1;
required GlobalBlock block = 2;
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt
+2 -2
View File
@@ -108,7 +108,7 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable<Fi
}
proto.inlinedLocalDeclarationsList.forEach {
fragment.inlinedLocalDeclarations[it.tag] = deserializeGlobalBlock(it.block)
fragment.inlinedLocalDeclarations[deserializeString(it.tag)] = deserializeGlobalBlock(it.block)
}
return fragment
@@ -292,7 +292,7 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable<Fi
}
private fun deserializeJsImportedModule(proto: JsAstProtoBuf.JsImportedModule): JsImportedModule {
return JsImportedModule(proto.externalName, deserializeName(proto.internalName), if (proto.hasPlainReference()) deserialize(proto.plainReference!!) else null)
return JsImportedModule(deserializeString(proto.externalName), deserializeName(proto.internalName), if (proto.hasPlainReference()) deserialize(proto.plainReference!!) else null)
}
private fun deserializeNoMetadata(proto: Expression): JsExpression = when (proto.expressionCase) {
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java
+50 -208
View File
@@ -708,18 +708,13 @@ public final class JsAstProtoBuf {
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
boolean hasExternalName();
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
java.lang.String getExternalName();
/**
* <code>required string external_name = 1;</code>
*/
org.jetbrains.kotlin.protobuf.ByteString
getExternalNameBytes();
int getExternalName();
/**
* <code>required int32 internal_name = 2;</code>
@@ -789,10 +784,9 @@ public final class JsAstProtoBuf {
}
break;
}
case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
case 8: {
bitField0_ |= 0x00000001;
externalName_ = bs;
externalName_ = input.readInt32();
break;
}
case 16: {
@@ -848,45 +842,18 @@ public final class JsAstProtoBuf {
private int bitField0_;
public static final int EXTERNAL_NAME_FIELD_NUMBER = 1;
private java.lang.Object externalName_;
private int externalName_;
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
public boolean hasExternalName() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
public java.lang.String getExternalName() {
java.lang.Object ref = externalName_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
org.jetbrains.kotlin.protobuf.ByteString bs =
(org.jetbrains.kotlin.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
externalName_ = s;
}
return s;
}
}
/**
* <code>required string external_name = 1;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getExternalNameBytes() {
java.lang.Object ref = externalName_;
if (ref instanceof java.lang.String) {
org.jetbrains.kotlin.protobuf.ByteString b =
org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
externalName_ = b;
return b;
} else {
return (org.jetbrains.kotlin.protobuf.ByteString) ref;
}
public int getExternalName() {
return externalName_;
}
public static final int INTERNAL_NAME_FIELD_NUMBER = 2;
@@ -920,7 +887,7 @@ public final class JsAstProtoBuf {
}
private void initFields() {
externalName_ = "";
externalName_ = 0;
internalName_ = 0;
plainReference_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression.getDefaultInstance();
}
@@ -952,7 +919,7 @@ public final class JsAstProtoBuf {
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getExternalNameBytes());
output.writeInt32(1, externalName_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, internalName_);
@@ -971,7 +938,7 @@ public final class JsAstProtoBuf {
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSize(1, getExternalNameBytes());
.computeInt32Size(1, externalName_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -1075,7 +1042,7 @@ public final class JsAstProtoBuf {
public Builder clear() {
super.clear();
externalName_ = "";
externalName_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
internalName_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
@@ -1123,9 +1090,7 @@ public final class JsAstProtoBuf {
public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.JsImportedModule other) {
if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.JsImportedModule.getDefaultInstance()) return this;
if (other.hasExternalName()) {
bitField0_ |= 0x00000001;
externalName_ = other.externalName_;
setExternalName(other.getExternalName());
}
if (other.hasInternalName()) {
setInternalName(other.getInternalName());
@@ -1175,78 +1140,34 @@ public final class JsAstProtoBuf {
}
private int bitField0_;
private java.lang.Object externalName_ = "";
private int externalName_ ;
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
public boolean hasExternalName() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
public java.lang.String getExternalName() {
java.lang.Object ref = externalName_;
if (!(ref instanceof java.lang.String)) {
org.jetbrains.kotlin.protobuf.ByteString bs =
(org.jetbrains.kotlin.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
externalName_ = s;
}
return s;
} else {
return (java.lang.String) ref;
}
public int getExternalName() {
return externalName_;
}
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getExternalNameBytes() {
java.lang.Object ref = externalName_;
if (ref instanceof String) {
org.jetbrains.kotlin.protobuf.ByteString b =
org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
externalName_ = b;
return b;
} else {
return (org.jetbrains.kotlin.protobuf.ByteString) ref;
}
}
/**
* <code>required string external_name = 1;</code>
*/
public Builder setExternalName(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
public Builder setExternalName(int value) {
bitField0_ |= 0x00000001;
externalName_ = value;
return this;
}
/**
* <code>required string external_name = 1;</code>
* <code>required int32 external_name = 1;</code>
*/
public Builder clearExternalName() {
bitField0_ = (bitField0_ & ~0x00000001);
externalName_ = getDefaultInstance().getExternalName();
return this;
}
/**
* <code>required string external_name = 1;</code>
*/
public Builder setExternalNameBytes(
org.jetbrains.kotlin.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
externalName_ = value;
externalName_ = 0;
return this;
}
@@ -32926,18 +32847,13 @@ public final class JsAstProtoBuf {
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
boolean hasTag();
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
java.lang.String getTag();
/**
* <code>required string tag = 1;</code>
*/
org.jetbrains.kotlin.protobuf.ByteString
getTagBytes();
int getTag();
/**
* <code>required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2;</code>
@@ -32998,10 +32914,9 @@ public final class JsAstProtoBuf {
}
break;
}
case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
case 8: {
bitField0_ |= 0x00000001;
tag_ = bs;
tag_ = input.readInt32();
break;
}
case 18: {
@@ -33052,45 +32967,18 @@ public final class JsAstProtoBuf {
private int bitField0_;
public static final int TAG_FIELD_NUMBER = 1;
private java.lang.Object tag_;
private int tag_;
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
public boolean hasTag() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
public java.lang.String getTag() {
java.lang.Object ref = tag_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
org.jetbrains.kotlin.protobuf.ByteString bs =
(org.jetbrains.kotlin.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
tag_ = s;
}
return s;
}
}
/**
* <code>required string tag = 1;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getTagBytes() {
java.lang.Object ref = tag_;
if (ref instanceof java.lang.String) {
org.jetbrains.kotlin.protobuf.ByteString b =
org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
tag_ = b;
return b;
} else {
return (org.jetbrains.kotlin.protobuf.ByteString) ref;
}
public int getTag() {
return tag_;
}
public static final int BLOCK_FIELD_NUMBER = 2;
@@ -33109,7 +32997,7 @@ public final class JsAstProtoBuf {
}
private void initFields() {
tag_ = "";
tag_ = 0;
block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
@@ -33138,7 +33026,7 @@ public final class JsAstProtoBuf {
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getTagBytes());
output.writeInt32(1, tag_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, block_);
@@ -33154,7 +33042,7 @@ public final class JsAstProtoBuf {
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSize(1, getTagBytes());
.computeInt32Size(1, tag_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -33254,7 +33142,7 @@ public final class JsAstProtoBuf {
public Builder clear() {
super.clear();
tag_ = "";
tag_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002);
@@ -33296,9 +33184,7 @@ public final class JsAstProtoBuf {
public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations other) {
if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()) return this;
if (other.hasTag()) {
bitField0_ |= 0x00000001;
tag_ = other.tag_;
setTag(other.getTag());
}
if (other.hasBlock()) {
mergeBlock(other.getBlock());
@@ -33343,78 +33229,34 @@ public final class JsAstProtoBuf {
}
private int bitField0_;
private java.lang.Object tag_ = "";
private int tag_ ;
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
public boolean hasTag() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
public java.lang.String getTag() {
java.lang.Object ref = tag_;
if (!(ref instanceof java.lang.String)) {
org.jetbrains.kotlin.protobuf.ByteString bs =
(org.jetbrains.kotlin.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
tag_ = s;
}
return s;
} else {
return (java.lang.String) ref;
}
public int getTag() {
return tag_;
}
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getTagBytes() {
java.lang.Object ref = tag_;
if (ref instanceof String) {
org.jetbrains.kotlin.protobuf.ByteString b =
org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
tag_ = b;
return b;
} else {
return (org.jetbrains.kotlin.protobuf.ByteString) ref;
}
}
/**
* <code>required string tag = 1;</code>
*/
public Builder setTag(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
public Builder setTag(int value) {
bitField0_ |= 0x00000001;
tag_ = value;
return this;
}
/**
* <code>required string tag = 1;</code>
* <code>required int32 tag = 1;</code>
*/
public Builder clearTag() {
bitField0_ = (bitField0_ & ~0x00000001);
tag_ = getDefaultInstance().getTag();
return this;
}
/**
* <code>required string tag = 1;</code>
*/
public Builder setTagBytes(
org.jetbrains.kotlin.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
tag_ = value;
tag_ = 0;
return this;
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt
+2 -2
View File
@@ -117,7 +117,7 @@ class JsAstSerializer(private val jsAstValidator: ((JsProgramFragment, Set<JsNam
fragment.inlinedLocalDeclarations.forEach { (tag, block) ->
val builder = InlinedLocalDeclarations.newBuilder().apply {
setTag(tag)
setTag(serialize(tag))
setBlock(serializeBlock(block))
}
@@ -474,7 +474,7 @@ class JsAstSerializer(private val jsAstValidator: ((JsProgramFragment, Set<JsNam
private fun serialize(module: JsImportedModule): JsAstProtoBuf.JsImportedModule {
val moduleBuilder = JsAstProtoBuf.JsImportedModule.newBuilder()
moduleBuilder.externalName = module.externalName
moduleBuilder.externalName = serialize(module.externalName)
moduleBuilder.internalName = serialize(module.internalName)
module.plainReference?.let {
moduleBuilder.plainReference = serialize(it)