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

Optimize temporary variable declarations in dynamic context, also introduce some hacky apis.

Browse Source 
Adapted from https://github.com/develar/kotlin/commit/d3521123a6e4d551b30743b68b6bb23b9678553b.
This commit is contained in:
Pavel V. Talanov
2012-08-09 19:23:19 +04:00
parent 2eca6c836e
commit 4c316011db
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java
+19 -6
View File
@@ -17,14 +17,14 @@
package org.jetbrains.k2js.translate.context;
import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.jetbrains.k2js.translate.utils.JsAstUtils.addVarDeclaration;
import static org.jetbrains.k2js.translate.utils.JsAstUtils.newVar;
import static com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
//TODO: consider renaming to scoping context
public final class DynamicContext {
@NotNull
public static DynamicContext rootContext(@NotNull JsScope rootScope, @NotNull JsBlock globalBlock) {
return new DynamicContext(rootScope, globalBlock);
@@ -41,6 +41,9 @@ public final class DynamicContext {
@NotNull
private final JsBlock currentBlock;
@Nullable
private JsVars vars;
private DynamicContext(@NotNull JsScope scope, @NotNull JsBlock block) {
this.currentScope = scope;
this.currentBlock = block;
@@ -52,13 +55,23 @@ public final class DynamicContext {
}
@NotNull
public TemporaryVariable declareTemporary(@NotNull JsExpression initExpression) {
public TemporaryVariable declareTemporary(@Nullable JsExpression initExpression) {
if (vars == null) {
vars = new JsVars();
currentBlock.getStatements().add(vars);
}
JsName temporaryName = currentScope.declareTemporary();
JsVars temporaryDeclaration = newVar(temporaryName, /*no value for init expression */ null);
addVarDeclaration(jsBlock(), temporaryDeclaration);
vars.add(new JsVar(temporaryName, null));
return new TemporaryVariable(temporaryName, initExpression);
}
@NotNull
public Pair<JsVar, JsNameRef> createTemporary(@Nullable JsExpression initExpression) {
JsVar var = new JsVar(currentScope.declareTemporary(), initExpression);
return new Pair<JsVar, JsNameRef>(var, var.getName().makeRef());
}
@NotNull
public JsScope getScope() {
return currentScope;