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

Minor in JS backend:

Browse Source 
- use constants from Namer in JsAstUtils#createPackage;
  - dropped extra JsInvoke node when create IIF;
  - create new JsName for Kotlin object in IIF scope.
This commit is contained in:
Zalim Bashorov
2014-03-31 14:56:45 +04:00
parent 0a546ebb40
commit fd165f055f
2 changed files with 7 additions and 3 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
@@ -32,6 +32,7 @@ import static org.jetbrains.jet.lang.descriptors.ClassKind.TRAIT;
public final class Namer { public final class Namer {
public static final String KOTLIN_NAME = JetLanguage.NAME; public static final String KOTLIN_NAME = JetLanguage.NAME;
public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase(); public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase();
public static final JsNameRef KOTLIN_OBJECT_REF = new JsNameRef(KOTLIN_NAME);
public static final String CALLEE_NAME = "$fun"; public static final String CALLEE_NAME = "$fun";
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
+6 -3
View File
@@ -30,7 +30,6 @@ import java.util.List;
public final class JsAstUtils { public final class JsAstUtils {
private static final JsNameRef DEFINE_PROPERTY = new JsNameRef("defineProperty"); private static final JsNameRef DEFINE_PROPERTY = new JsNameRef("defineProperty");
public static final JsNameRef CREATE_OBJECT = new JsNameRef("create"); public static final JsNameRef CREATE_OBJECT = new JsNameRef("create");
private static final JsNameRef EMPTY_REF = new JsNameRef("");
private static final JsNameRef VALUE = new JsNameRef("value"); private static final JsNameRef VALUE = new JsNameRef("value");
private static final JsPropertyInitializer WRITABLE = new JsPropertyInitializer(new JsNameRef("writable"), JsLiteral.TRUE); private static final JsPropertyInitializer WRITABLE = new JsPropertyInitializer(new JsNameRef("writable"), JsLiteral.TRUE);
@@ -232,8 +231,12 @@ public final class JsAstUtils {
@NotNull @NotNull
public static JsFunction createPackage(@NotNull List<JsStatement> to, @NotNull JsScope scope) { public static JsFunction createPackage(@NotNull List<JsStatement> to, @NotNull JsScope scope) {
JsFunction packageBlockFunction = createFunctionWithEmptyBody(scope); JsFunction packageBlockFunction = createFunctionWithEmptyBody(scope);
packageBlockFunction.getParameters().add(new JsParameter(scope.findName("Kotlin")));
to.add(new JsInvocation(EMPTY_REF, new JsInvocation(packageBlockFunction, new JsNameRef("Kotlin"))).makeStmt()); JsName kotlinObjectAsParameter = packageBlockFunction.getScope().declareName(Namer.KOTLIN_NAME);
packageBlockFunction.getParameters().add(new JsParameter(kotlinObjectAsParameter));
to.add(new JsInvocation(packageBlockFunction, Namer.KOTLIN_OBJECT_REF).makeStmt());
return packageBlockFunction; return packageBlockFunction;
} }