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

Use local aliases for Kotlin runtime functions in JS BE

Browse Source
This commit is contained in:
Alexey Andreev
2017-07-17 15:04:48 +03:00
parent 8c256b24dc
commit 7646c2fc72
21 changed files with 539 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/js-ast.proto
+6
View File
@@ -427,6 +427,12 @@ message Name {
optional int32 identifier = 2;
optional int32 local_name_id = 3;
optional bool imported = 4 [default = false];
optional SpecialFunction special_function = 5;
}
enum SpecialFunction {
DEFINE_INLINE_FUNCTION = 1;
WRAP_FUNCTION = 2;
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt
+9
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.serialization.js.ast
import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.backend.ast.metadata.*
import org.jetbrains.kotlin.js.backend.ast.metadata.SpecialFunction
import org.jetbrains.kotlin.protobuf.CodedInputStream
import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.*
import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression.ExpressionCase
@@ -443,6 +444,9 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable<Fi
if (nameProto.hasImported()) {
name.imported = nameProto.imported
}
if (nameProto.hasSpecialFunction()) {
name.specialFunction = map(nameProto.specialFunction)
}
nameCache[id] = name
name
}
@@ -513,6 +517,11 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable<Fi
InlineStrategy.NOT_INLINE -> KotlinInlineStrategy.NOT_INLINE
}
private fun map(specialFunction: JsAstProtoBuf.SpecialFunction) = when(specialFunction) {
JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION -> SpecialFunction.DEFINE_INLINE_FUNCTION
JsAstProtoBuf.SpecialFunction.WRAP_FUNCTION -> SpecialFunction.WRAP_FUNCTION
}
private fun <T : JsNode> withLocation(fileId: Int?, location: Location?, action: () -> T): T {
val deserializedFile = fileId?.let { deserializeString(it) }
val file = deserializedFile ?: fileStack.peek()
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java
+152 -8
View File
@@ -138,6 +138,62 @@ public final class JsAstProtoBuf {
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.ast.InlineStrategy)
}
/**
* Protobuf enum {@code org.jetbrains.kotlin.serialization.js.ast.SpecialFunction}
*/
public enum SpecialFunction
implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
/**
* <code>DEFINE_INLINE_FUNCTION = 1;</code>
*/
DEFINE_INLINE_FUNCTION(0, 1),
/**
* <code>WRAP_FUNCTION = 2;</code>
*/
WRAP_FUNCTION(1, 2),
;
/**
* <code>DEFINE_INLINE_FUNCTION = 1;</code>
*/
public static final int DEFINE_INLINE_FUNCTION_VALUE = 1;
/**
* <code>WRAP_FUNCTION = 2;</code>
*/
public static final int WRAP_FUNCTION_VALUE = 2;
public final int getNumber() { return value; }
public static SpecialFunction valueOf(int value) {
switch (value) {
case 1: return DEFINE_INLINE_FUNCTION;
case 2: return WRAP_FUNCTION;
default: return null;
}
}
public static org.jetbrains.kotlin.protobuf.Internal.EnumLiteMap<SpecialFunction>
internalGetValueMap() {
return internalValueMap;
}
private static org.jetbrains.kotlin.protobuf.Internal.EnumLiteMap<SpecialFunction>
internalValueMap =
new org.jetbrains.kotlin.protobuf.Internal.EnumLiteMap<SpecialFunction>() {
public SpecialFunction findValueByNumber(int number) {
return SpecialFunction.valueOf(number);
}
};
private final int value;
private SpecialFunction(int index, int value) {
this.value = value;
}
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.ast.SpecialFunction)
}
public interface LocationOrBuilder extends
// @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.Location)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
@@ -34765,13 +34821,22 @@ public final class JsAstProtoBuf {
int getLocalNameId();
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
boolean hasImported();
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
boolean getImported();
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
boolean hasSpecialFunction();
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction getSpecialFunction();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Name}
@@ -34843,6 +34908,18 @@ public final class JsAstProtoBuf {
imported_ = input.readBool();
break;
}
case 40: {
int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction value = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction.valueOf(rawValue);
if (value == null) {
unknownFieldsCodedOutput.writeRawVarint32(tag);
unknownFieldsCodedOutput.writeRawVarint32(rawValue);
} else {
bitField0_ |= 0x00000010;
specialFunction_ = value;
}
break;
}
}
}
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
@@ -34925,23 +35002,39 @@ public final class JsAstProtoBuf {
public static final int IMPORTED_FIELD_NUMBER = 4;
private boolean imported_;
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
public boolean hasImported() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
public boolean getImported() {
return imported_;
}
public static final int SPECIAL_FUNCTION_FIELD_NUMBER = 5;
private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction specialFunction_;
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
public boolean hasSpecialFunction() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction getSpecialFunction() {
return specialFunction_;
}
private void initFields() {
temporary_ = false;
identifier_ = 0;
localNameId_ = 0;
imported_ = false;
specialFunction_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -34972,6 +35065,9 @@ public final class JsAstProtoBuf {
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeBool(4, imported_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeEnum(5, specialFunction_.getNumber());
}
output.writeRawBytes(unknownFields);
}
@@ -34997,6 +35093,10 @@ public final class JsAstProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBoolSize(4, imported_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeEnumSize(5, specialFunction_.getNumber());
}
size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -35099,6 +35199,8 @@ public final class JsAstProtoBuf {
bitField0_ = (bitField0_ & ~0x00000004);
imported_ = false;
bitField0_ = (bitField0_ & ~0x00000008);
specialFunction_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION;
bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -35138,6 +35240,10 @@ public final class JsAstProtoBuf {
to_bitField0_ |= 0x00000008;
}
result.imported_ = imported_;
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000010;
}
result.specialFunction_ = specialFunction_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -35156,6 +35262,9 @@ public final class JsAstProtoBuf {
if (other.hasImported()) {
setImported(other.getImported());
}
if (other.hasSpecialFunction()) {
setSpecialFunction(other.getSpecialFunction());
}
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this;
@@ -35286,19 +35395,19 @@ public final class JsAstProtoBuf {
private boolean imported_ ;
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
public boolean hasImported() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
public boolean getImported() {
return imported_;
}
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
public Builder setImported(boolean value) {
bitField0_ |= 0x00000008;
@@ -35307,7 +35416,7 @@ public final class JsAstProtoBuf {
return this;
}
/**
* <code>optional bool imported = 4;</code>
* <code>optional bool imported = 4 [default = false];</code>
*/
public Builder clearImported() {
bitField0_ = (bitField0_ & ~0x00000008);
@@ -35316,6 +35425,41 @@ public final class JsAstProtoBuf {
return this;
}
private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction specialFunction_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION;
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
public boolean hasSpecialFunction() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction getSpecialFunction() {
return specialFunction_;
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
public Builder setSpecialFunction(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000010;
specialFunction_ = value;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.js.ast.SpecialFunction special_function = 5;</code>
*/
public Builder clearSpecialFunction() {
bitField0_ = (bitField0_ & ~0x00000010);
specialFunction_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION;
return this;
}
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.Name)
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt
+10
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.serialization.js.ast
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.backend.ast.metadata.*
import org.jetbrains.kotlin.js.backend.ast.metadata.SpecialFunction
import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.*
import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.BinaryOperation.Type.*
import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.UnaryOperation.Type.*
@@ -552,6 +553,11 @@ class JsAstSerializer(private val pathResolver: (File) -> String) {
KotlinInlineStrategy.NOT_INLINE -> InlineStrategy.NOT_INLINE
}
private fun map(specialFunction: SpecialFunction) = when (specialFunction) {
SpecialFunction.DEFINE_INLINE_FUNCTION -> JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION
SpecialFunction.WRAP_FUNCTION -> JsAstProtoBuf.SpecialFunction.WRAP_FUNCTION
}
private fun serialize(name: JsName): Int = nameMap.getOrPut(name) {
val builder = Name.newBuilder()
builder.identifier = serialize(name.ident)
@@ -564,6 +570,10 @@ class JsAstSerializer(private val pathResolver: (File) -> String) {
builder.imported = true
}
name.specialFunction?.let {
builder.specialFunction = map(it)
}
val result = nameTableBuilder.entryCount
nameTableBuilder.addEntry(builder)
result