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

Use local aliases for char boxing and unboxing in JS BE

Browse Source
This commit is contained in:
Alexey Andreev
2017-07-17 16:01:31 +03:00
parent 7646c2fc72
commit 1260146d25
20 changed files with 137 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/js-ast.proto
+2
View File
@@ -433,6 +433,8 @@ message Name {
enum SpecialFunction {
DEFINE_INLINE_FUNCTION = 1;
WRAP_FUNCTION = 2;
TO_BOXED_CHAR = 3;
UNBOX_CHAR = 4;
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt
+2
View File
@@ -520,6 +520,8 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable<Fi
private fun map(specialFunction: JsAstProtoBuf.SpecialFunction) = when(specialFunction) {
JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION -> SpecialFunction.DEFINE_INLINE_FUNCTION
JsAstProtoBuf.SpecialFunction.WRAP_FUNCTION -> SpecialFunction.WRAP_FUNCTION
JsAstProtoBuf.SpecialFunction.TO_BOXED_CHAR -> SpecialFunction.TO_BOXED_CHAR
JsAstProtoBuf.SpecialFunction.UNBOX_CHAR -> SpecialFunction.UNBOX_CHAR
}
private fun <T : JsNode> withLocation(fileId: Int?, location: Location?, action: () -> T): T {
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java
+18
View File
@@ -151,6 +151,14 @@ public final class JsAstProtoBuf {
* <code>WRAP_FUNCTION = 2;</code>
*/
WRAP_FUNCTION(1, 2),
/**
* <code>TO_BOXED_CHAR = 3;</code>
*/
TO_BOXED_CHAR(2, 3),
/**
* <code>UNBOX_CHAR = 4;</code>
*/
UNBOX_CHAR(3, 4),
;
/**
@@ -161,6 +169,14 @@ public final class JsAstProtoBuf {
* <code>WRAP_FUNCTION = 2;</code>
*/
public static final int WRAP_FUNCTION_VALUE = 2;
/**
* <code>TO_BOXED_CHAR = 3;</code>
*/
public static final int TO_BOXED_CHAR_VALUE = 3;
/**
* <code>UNBOX_CHAR = 4;</code>
*/
public static final int UNBOX_CHAR_VALUE = 4;
public final int getNumber() { return value; }
@@ -169,6 +185,8 @@ public final class JsAstProtoBuf {
switch (value) {
case 1: return DEFINE_INLINE_FUNCTION;
case 2: return WRAP_FUNCTION;
case 3: return TO_BOXED_CHAR;
case 4: return UNBOX_CHAR;
default: return null;
}
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt
+2
View File
@@ -556,6 +556,8 @@ class JsAstSerializer(private val pathResolver: (File) -> String) {
private fun map(specialFunction: SpecialFunction) = when (specialFunction) {
SpecialFunction.DEFINE_INLINE_FUNCTION -> JsAstProtoBuf.SpecialFunction.DEFINE_INLINE_FUNCTION
SpecialFunction.WRAP_FUNCTION -> JsAstProtoBuf.SpecialFunction.WRAP_FUNCTION
SpecialFunction.TO_BOXED_CHAR -> JsAstProtoBuf.SpecialFunction.TO_BOXED_CHAR
SpecialFunction.UNBOX_CHAR -> JsAstProtoBuf.SpecialFunction.UNBOX_CHAR
}
private fun serialize(name: JsName): Int = nameMap.getOrPut(name) {