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

JS backend: minor: move constant to Namer

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-10 16:43:47 +04:00
parent ee33c09714
commit e5c77d1242
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
+1
View File
@@ -34,6 +34,7 @@ public final class Namer {
public static final String KOTLIN_NAME = JetLanguage.NAME;
public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase();
public static final JsNameRef KOTLIN_OBJECT_REF = new JsNameRef(KOTLIN_NAME);
public static final JsNameRef KOTLIN_LONG_NAME_REF = new JsNameRef("Long", KOTLIN_OBJECT_REF);
public static final String EQUALS_METHOD_NAME = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getAny(), "equals");
public static final String COMPARE_TO_METHOD_NAME = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getComparable(), "compareTo");
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
+4 -8
View File
@@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.TranslationContext;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -197,12 +196,9 @@ public final class JsAstUtils {
return rangeTo(Namer.CHAR_RANGE, rangeStart, rangeEnd);
}
@NotNull
public static final JsNameRef kotlinLongNameRef = new JsNameRef("Long", Namer.KOTLIN_OBJECT_REF);
@NotNull
public static JsExpression isLong(@NotNull JsExpression expression) {
return instanceOf(expression, kotlinLongNameRef);
return instanceOf(expression, Namer.KOTLIN_LONG_NAME_REF);
}
public static JsExpression newLong(long value, @NotNull TranslationContext context) {
@@ -212,7 +208,7 @@ public final class JsAstUtils {
List<JsExpression> args = new SmartList<JsExpression>();
args.add(context.program().getNumberLiteral(low));
args.add(context.program().getNumberLiteral(high));
return new JsNew(kotlinLongNameRef, args);
return new JsNew(Namer.KOTLIN_LONG_NAME_REF, args);
}
else {
return longFromInt(context.program().getNumberLiteral((int) value));
@@ -221,12 +217,12 @@ public final class JsAstUtils {
@NotNull
public static JsExpression longFromInt(@NotNull JsExpression expression) {
return invokeMethod(kotlinLongNameRef, Namer.LONG_FROM_INT, expression);
return invokeMethod(Namer.KOTLIN_LONG_NAME_REF, Namer.LONG_FROM_INT, expression);
}
@NotNull
public static JsExpression longFromNumber(@NotNull JsExpression expression) {
return invokeMethod(kotlinLongNameRef, Namer.LONG_FROM_NUMBER, expression);
return invokeMethod(Namer.KOTLIN_LONG_NAME_REF, Namer.LONG_FROM_NUMBER, expression);
}
@NotNull