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

JS backend: added wraping to object the local vars which captured in closure.

Browse Source 
Moved local functions and function literals to class/namespace definition.

(cherry picked from commit 36c954b)
This commit is contained in:
develar
2013-07-18 15:46:45 +04:00
committed by Zalim Bashorov
parent e292034141
commit 12d19dd9d8
31 changed files with 568 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/AliasingContext.java
+39 -105
View File
@@ -18,46 +18,18 @@ package org.jetbrains.k2js.translate.context;
import com.google.common.collect.Maps;
import com.google.dart.compiler.backend.js.ast.JsExpression;
import com.google.dart.compiler.backend.js.ast.JsLiteral;
import com.google.dart.compiler.backend.js.ast.JsName;
import com.google.dart.compiler.backend.js.ast.JsNameRef;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.scopes.receivers.*;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver;
import java.util.Map;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getDeclarationDescriptorForReceiver;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedReceiverDescriptor;
import java.util.*;
public class AliasingContext {
private static final ThisAliasProvider EMPTY_THIS_ALIAS_PROVIDER = new ThisAliasProvider() {
@Nullable
private static final AliasingContext ROOT = new AliasingContext(null) {
@Override
public JsNameRef get(@NotNull DeclarationDescriptor descriptor) {
return null;
}
@Nullable
@Override
public JsExpression get(@NotNull ResolvedCall<?> call) {
ReceiverValue callThisObject = call.getThisObject();
return callThisObject.exists() && (callThisObject instanceof ClassReceiver || callThisObject instanceof ExtensionReceiver)
? JsLiteral.THIS
: null;
}
};
private static final AliasingContext ROOT = new AliasingContext(null, EMPTY_THIS_ALIAS_PROVIDER) {
@Override
public JsName getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
public JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
return null;
}
@@ -68,114 +40,76 @@ public class AliasingContext {
};
public static AliasingContext getCleanContext() {
return new AliasingContext(ROOT, ROOT.thisAliasProvider);
return new AliasingContext(ROOT);
}
@NotNull
private final Map<DeclarationDescriptor, JsName> aliasesForDescriptors = Maps.newHashMap();
@Nullable
private Map<DeclarationDescriptor, JsExpression> aliasesForDescriptors;
@NotNull
final ThisAliasProvider thisAliasProvider;
@NotNull
private final Map<JetExpression, JsName> aliasesForExpressions = Maps.newHashMap();
@Nullable
private final AliasingContext parent;
private AliasingContext(@Nullable AliasingContext parent, @NotNull ThisAliasProvider thisAliasProvider) {
private AliasingContext(@Nullable AliasingContext parent) {
this(parent, null);
}
private AliasingContext(@Nullable AliasingContext parent, @Nullable Map<DeclarationDescriptor, JsExpression> aliasesForDescriptors) {
this.parent = parent;
this.thisAliasProvider = thisAliasProvider;
}
public interface ThisAliasProvider {
@Nullable
JsNameRef get(@NotNull DeclarationDescriptor descriptor);
@Nullable
JsExpression get(@NotNull ResolvedCall<?> call);
}
public abstract static class AbstractThisAliasProvider implements ThisAliasProvider {
@NotNull
protected static DeclarationDescriptor normalize(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof ClassOrNamespaceDescriptor) {
return descriptor;
}
else if (descriptor instanceof CallableDescriptor) {
DeclarationDescriptor receiverDescriptor = getExpectedReceiverDescriptor((CallableDescriptor) descriptor);
assert receiverDescriptor != null;
return receiverDescriptor;
}
return descriptor;
}
@Nullable
@Override
public JsExpression get(@NotNull ResolvedCall<?> call) {
ReceiverValue thisObject = call.getThisObject();
if (!thisObject.exists()) {
return null;
}
if (thisObject instanceof ExtensionReceiver || thisObject instanceof ClassReceiver) {
JsNameRef ref = get(((ThisReceiver) thisObject).getDeclarationDescriptor());
if (ref != null) {
return ref;
}
}
JsNameRef ref = get(getDeclarationDescriptorForReceiver(thisObject));
return ref == null ? JsLiteral.THIS : ref;
}
this.aliasesForDescriptors = aliasesForDescriptors;
}
@NotNull
public AliasingContext inner(@NotNull ThisAliasProvider thisAliasProvider) {
return new AliasingContext(this, thisAliasProvider);
}
@NotNull
public AliasingContext inner(@NotNull final DeclarationDescriptor correspondingDescriptor, @NotNull final JsName alias) {
return inner(new AbstractThisAliasProvider() {
@Nullable
@Override
public JsNameRef get(@NotNull DeclarationDescriptor descriptor) {
return correspondingDescriptor == normalize(descriptor) ? alias.makeRef() : null;
}
});
public AliasingContext inner(@NotNull DeclarationDescriptor descriptor, @NotNull JsExpression alias) {
return new AliasingContext(this, Collections.singletonMap(descriptor, alias));
}
@NotNull
public AliasingContext withAliasesForExpressions(@NotNull Map<JetExpression, JsName> aliasesForExpressions) {
AliasingContext newContext = new AliasingContext(this, thisAliasProvider);
AliasingContext newContext = new AliasingContext(this);
newContext.aliasesForExpressions.putAll(aliasesForExpressions);
return newContext;
}
@NotNull
public AliasingContext withDescriptorsAliased(@NotNull Map<DeclarationDescriptor, JsName> aliases) {
AliasingContext newContext = new AliasingContext(this, thisAliasProvider);
newContext.aliasesForDescriptors.putAll(aliases);
return newContext;
public AliasingContext withDescriptorsAliased(@NotNull Map<DeclarationDescriptor, JsExpression> aliases) {
return new AliasingContext(this, aliases);
}
@Nullable
public JsName getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
JsName alias = aliasesForDescriptors.get(descriptor.getOriginal());
public JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
if (aliasesForDescriptors == null) {
return null;
}
JsExpression alias = aliasesForDescriptors.get(descriptor.getOriginal());
if (alias != null) {
return alias;
}
assert parent != null;
return parent.getAliasForDescriptor(descriptor);
}
@Nullable
public JsName getAliasForExpression(@NotNull JetExpression element) {
JsName alias = aliasesForExpressions.get(element);
if (alias != null) {
return alias;
return alias != null ? alias : parent.getAliasForExpression(element);
}
public void registerAlias(@NotNull DeclarationDescriptor descriptor, @NotNull JsExpression alias) {
if (aliasesForDescriptors == null) {
aliasesForDescriptors = Collections.singletonMap(descriptor, alias);
}
else {
if (aliasesForDescriptors.size() == 1) {
Map<DeclarationDescriptor, JsExpression> singletonMap = aliasesForDescriptors;
aliasesForDescriptors = new HashMap<DeclarationDescriptor, JsExpression>();
aliasesForDescriptors.put(singletonMap.keySet().iterator().next(), singletonMap.values().iterator().next());
}
JsExpression prev = aliasesForDescriptors.put(descriptor, alias);
assert prev == null;
}
assert parent != null;
return parent.getAliasForExpression(element);
}
}
js/js.translator/src/org/jetbrains/k2js/translate/context/TraceableThisAliasProvider.java
-54
View File
@@ -1,54 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.translate.context;
import com.google.dart.compiler.backend.js.ast.JsNameRef;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
public class TraceableThisAliasProvider extends AliasingContext.AbstractThisAliasProvider {
private final ClassOrNamespaceDescriptor descriptor;
private final JsNameRef thisRef;
private boolean thisWasCaptured;
public boolean wasThisCaptured() {
return thisWasCaptured;
}
public TraceableThisAliasProvider(@NotNull ClassOrNamespaceDescriptor descriptor, @NotNull JsNameRef thisRef) {
this.descriptor = descriptor;
this.thisRef = thisRef;
}
@Nullable
public JsNameRef getRefIfWasCaptured() {
return thisWasCaptured ? thisRef : null;
}
@Nullable
@Override
public JsNameRef get(@NotNull DeclarationDescriptor unnormalizedDescriptor) {
if (descriptor == normalize(unnormalizedDescriptor)) {
thisWasCaptured = true;
return thisRef;
}
return null;
}
}
js/js.translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
+48 -37
View File
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.Named;
import org.jetbrains.jet.lang.psi.JetExpression;
@@ -32,6 +33,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForElement;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedReceiverDescriptor;
/**
* All the info about the state of the translation process.
@@ -43,15 +45,15 @@ public class TranslationContext {
private final StaticContext staticContext;
@NotNull
private final AliasingContext aliasingContext;
@Nullable
private final UsageTracker usageTracker;
@NotNull
public static TranslationContext rootContext(@NotNull StaticContext staticContext) {
JsProgram program = staticContext.getProgram();
JsBlock globalBlock = program.getGlobalBlock();
DynamicContext rootDynamicContext = DynamicContext.rootContext(staticContext.getRootScope(), globalBlock);
public static TranslationContext rootContext(@NotNull StaticContext staticContext, JsFunction rootFunction) {
DynamicContext rootDynamicContext =
DynamicContext.rootContext(rootFunction.getScope(), rootFunction.getBody());
AliasingContext rootAliasingContext = AliasingContext.getCleanContext();
return new TranslationContext(staticContext,
rootDynamicContext, rootAliasingContext);
return new TranslationContext(staticContext, rootDynamicContext, rootAliasingContext, null);
}
private final HashMap<JsExpression, TemporaryConstVariable> expressionToTempConstVariableCache = new HashMap<JsExpression, TemporaryConstVariable>();
@@ -62,55 +64,60 @@ public class TranslationContext {
private TranslationContext(@NotNull StaticContext staticContext,
@NotNull DynamicContext dynamicContext,
@NotNull AliasingContext aliasingContext) {
@NotNull AliasingContext aliasingContext,
@Nullable UsageTracker usageTracker) {
this.dynamicContext = dynamicContext;
this.staticContext = staticContext;
this.aliasingContext = aliasingContext;
this.usageTracker = usageTracker;
}
private TranslationContext(@NotNull TranslationContext parent, @NotNull AliasingContext aliasingContext) {
dynamicContext = parent.dynamicContext;
staticContext = parent.staticContext;
this.aliasingContext = aliasingContext;
usageTracker = parent.usageTracker;
}
public UsageTracker usageTracker() {
return usageTracker;
}
public DynamicContext dynamicContext() {
return dynamicContext;
}
@NotNull
private TranslationContext contextWithScope(@NotNull JsScope newScope, @NotNull JsBlock block) {
return contextWithScope(newScope, block, aliasingContext);
}
@NotNull
public TranslationContext contextWithScope(@NotNull JsFunction fun) {
return contextWithScope(fun, aliasingContext);
return contextWithScope(fun, aliasingContext, usageTracker);
}
@NotNull
protected TranslationContext contextWithScope(@NotNull JsScope newScope, @NotNull JsBlock block, @NotNull AliasingContext aliasingContext) {
return new TranslationContext(staticContext, DynamicContext.newContext(newScope, block), aliasingContext);
private TranslationContext contextWithScope(@NotNull JsScope newScope,
@NotNull JsBlock block,
@NotNull AliasingContext aliasingContext,
@Nullable UsageTracker usageTracker) {
return new TranslationContext(staticContext, DynamicContext.newContext(newScope, block), aliasingContext, usageTracker);
}
@NotNull
public TranslationContext contextWithScope(@NotNull JsFunction fun, @NotNull AliasingContext aliasingContext) {
return contextWithScope(fun.getScope(), fun.getBody(), aliasingContext);
public TranslationContext contextWithScope(@NotNull JsFunction fun, @NotNull AliasingContext aliasingContext, @Nullable UsageTracker usageTracker) {
return contextWithScope(fun.getScope(), fun.getBody(), aliasingContext, usageTracker);
}
@NotNull
public TranslationContext innerBlock(@NotNull JsBlock block) {
return new TranslationContext(staticContext, dynamicContext.innerBlock(block), aliasingContext);
return new TranslationContext(staticContext, dynamicContext.innerBlock(block), aliasingContext, usageTracker);
}
@NotNull
public TranslationContext newDeclaration(@NotNull DeclarationDescriptor descriptor) {
return contextWithScope(getScopeForDescriptor(descriptor), getBlockForDescriptor(descriptor));
return contextWithScope(getScopeForDescriptor(descriptor), getBlockForDescriptor(descriptor), aliasingContext, usageTracker);
}
@NotNull
public TranslationContext innerContextWithThisAliased(@NotNull DeclarationDescriptor correspondingDescriptor, @NotNull JsName alias) {
return new TranslationContext(this, aliasingContext.inner(correspondingDescriptor, alias));
return new TranslationContext(this, aliasingContext.inner(correspondingDescriptor, alias.makeRef()));
}
@NotNull
@@ -119,7 +126,7 @@ public class TranslationContext {
}
@NotNull
public TranslationContext innerContextWithDescriptorsAliased(@NotNull Map<DeclarationDescriptor, JsName> aliases) {
public TranslationContext innerContextWithDescriptorsAliased(@NotNull Map<DeclarationDescriptor, JsExpression> aliases) {
return new TranslationContext(this, aliasingContext.withDescriptorsAliased(aliases));
}
@@ -133,11 +140,6 @@ public class TranslationContext {
}
}
@NotNull
public TranslationContext newDeclaration(@NotNull PsiElement element) {
return newDeclaration(getDescriptorForElement(bindingContext(), element));
}
@NotNull
public BindingContext bindingContext() {
return staticContext.getBindingContext();
@@ -156,14 +158,9 @@ public class TranslationContext {
@NotNull
public JsName getNameForDescriptor(@NotNull DeclarationDescriptor descriptor) {
JsName alias = aliasingContext.getAliasForDescriptor(descriptor);
if (alias != null) {
return alias;
}
return staticContext.getNameForDescriptor(descriptor);
}
//TODO: util
@NotNull
public JsStringLiteral nameToLiteral(@NotNull Named named) {
return program().getStringLiteral(named.getName().asString());
@@ -174,7 +171,6 @@ public class TranslationContext {
return staticContext.getQualifierForDescriptor(descriptor);
}
//TODO: review all invocation with notnull parameters
@NotNull
public TemporaryVariable declareTemporary(@Nullable JsExpression initExpression) {
return dynamicContext.declareTemporary(initExpression);
@@ -240,14 +236,29 @@ public class TranslationContext {
dynamicContext.jsBlock().getStatements().add(statement);
}
@NotNull
public AliasingContext.ThisAliasProvider thisAliasProvider() {
return aliasingContext().thisAliasProvider;
public JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
if (usageTracker != null && descriptor instanceof ClassDescriptor) {
usageTracker.triggerUsed(descriptor);
}
return aliasingContext.getAliasForDescriptor(descriptor);
}
@NotNull
public JsExpression getThisObject(@NotNull DeclarationDescriptor descriptor) {
JsNameRef ref = thisAliasProvider().get(descriptor);
return ref == null ? JsLiteral.THIS : ref;
DeclarationDescriptor effectiveDescriptor;
if (descriptor instanceof CallableDescriptor) {
effectiveDescriptor = getExpectedReceiverDescriptor((CallableDescriptor) descriptor);
assert effectiveDescriptor != null;
}
else {
effectiveDescriptor = descriptor;
}
if (usageTracker != null) {
usageTracker.triggerUsed(effectiveDescriptor);
}
JsExpression alias = aliasingContext.getAliasForDescriptor(effectiveDescriptor);
return alias == null ? JsLiteral.THIS : alias;
}
}
js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.java
+38
View File
@@ -0,0 +1,38 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.translate.context;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
public class UsageTracker {
private final DeclarationDescriptor trackedDescriptor;
private boolean used;
public UsageTracker(DeclarationDescriptor trackedDescriptor) {
this.trackedDescriptor = trackedDescriptor;
}
public boolean isUsed() {
return used;
}
public void triggerUsed(DeclarationDescriptor descriptor) {
if (trackedDescriptor == descriptor) {
used = true;
}
}
}
js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
+8 -6
View File
@@ -38,7 +38,6 @@ import java.util.*;
import static com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType;
import static org.jetbrains.k2js.translate.general.Translation.translateClassDeclaration;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor;
/**
@@ -86,11 +85,13 @@ public final class ClassDeclarationTranslator extends AbstractTranslator {
}
private static class OpenClassInfo {
private final ClassDescriptor descriptor;
private final JetClass declaration;
private final JsNameRef label;
private final JsNameRef qualifiedLabel;
private OpenClassInfo(JetClass declaration, JsNameRef label, JsNameRef qualifiedLabel) {
private OpenClassInfo(JetClass declaration, ClassDescriptor descriptor, JsNameRef label, JsNameRef qualifiedLabel) {
this.descriptor = descriptor;
this.declaration = declaration;
this.label = label;
this.qualifiedLabel = qualifiedLabel;
@@ -151,7 +152,8 @@ public final class ClassDeclarationTranslator extends AbstractTranslator {
Iterator<OpenClassInfo> it = sortedOpenClasses.descendingIterator();
while (it.hasNext()) {
OpenClassInfo item = it.next();
JsExpression translatedDeclaration = translateClassDeclaration(item.declaration, classDescriptorToLabel, context());
JsExpression translatedDeclaration =
new ClassTranslator(item.declaration, item.descriptor, classDescriptorToLabel, context()).translate();
generate(item, propertyInitializers, translatedDeclaration, vars);
}
}
@@ -166,7 +168,7 @@ public final class ClassDeclarationTranslator extends AbstractTranslator {
};
for (Pair<JetClassOrObject, JsInvocation> item : finalList) {
new ClassTranslator(item.first, aliasingMap, context()).translateClassOrObjectCreation(item.second);
new ClassTranslator(item.first, aliasingMap, context()).translate(item.second);
}
}
@@ -199,8 +201,8 @@ public final class ClassDeclarationTranslator extends AbstractTranslator {
else {
String label = localLabelGenerator.generate();
JsNameRef labelRef = dummyFunction.getScope().declareName(label).makeRef();
OpenClassInfo
item = new OpenClassInfo((JetClass) declaration, labelRef, new JsNameRef(labelRef.getIdent(), declarationsObjectRef));
OpenClassInfo item = new OpenClassInfo((JetClass) declaration, descriptor, labelRef,
new JsNameRef(labelRef.getIdent(), declarationsObjectRef));
openList.add(item);
openClassDescriptorToItem.put(descriptor, item);
js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
+80 -54
View File
@@ -17,6 +17,8 @@
package org.jetbrains.k2js.translate.declaration;
import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.openapi.util.NotNullLazyValue;
import com.intellij.openapi.util.Trinity;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -27,10 +29,11 @@ import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetObjectLiteralExpression;
import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.k2js.translate.LabelGenerator;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator;
import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
import java.util.ArrayList;
@@ -38,8 +41,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isNotAny;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
import static org.jetbrains.k2js.translate.expression.LiteralFunctionTranslator.createPlace;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getContainingClass;
@@ -50,9 +53,6 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.getQualifiedRe
* Generates a definition of a single class.
*/
public final class ClassTranslator extends AbstractTranslator {
@NotNull
private final DeclarationBodyVisitor declarationBodyVisitor = new DeclarationBodyVisitor();
@NotNull
private final JetClassOrObject classDeclaration;
@@ -62,23 +62,16 @@ public final class ClassTranslator extends AbstractTranslator {
@Nullable
private final ClassAliasingMap aliasingMap;
@NotNull
public static JsExpression generateClassCreation(@NotNull JetClassOrObject classDeclaration,
@NotNull ClassAliasingMap aliasingMap,
@NotNull TranslationContext context) {
return new ClassTranslator(classDeclaration, aliasingMap, context).translateClassOrObjectCreation(context);
}
@NotNull
public static JsExpression generateClassCreation(@NotNull JetClassOrObject classDeclaration, @NotNull TranslationContext context) {
return new ClassTranslator(classDeclaration, null, context).translateClassOrObjectCreation(context);
return new ClassTranslator(classDeclaration, null, context).translate(context);
}
@NotNull
public static JsExpression generateClassCreation(@NotNull JetClassOrObject classDeclaration,
@NotNull ClassDescriptor descriptor,
@NotNull TranslationContext context) {
return new ClassTranslator(classDeclaration, descriptor, null, context).translateClassOrObjectCreation(context);
return new ClassTranslator(classDeclaration, descriptor, null, context).translate(context);
}
@NotNull
@@ -107,28 +100,28 @@ public final class ClassTranslator extends AbstractTranslator {
private JsExpression translateObjectLiteralExpression() {
ClassDescriptor containingClass = getContainingClass(descriptor);
if (containingClass == null) {
return translateClassOrObjectCreation(context());
return translate(context());
}
return translateAsObjectCreationExpressionWithEnclosingThisSaved(containingClass);
}
@NotNull
private JsExpression translateAsObjectCreationExpressionWithEnclosingThisSaved(@NotNull ClassDescriptor containingClass) {
return context().literalFunctionTranslator().translate(containingClass, classDeclaration, descriptor, this);
}
@NotNull
public JsExpression translateClassOrObjectCreation(@NotNull TranslationContext declarationContext) {
public JsExpression translate() {
return translate(context());
}
@NotNull
public JsExpression translate(@NotNull TranslationContext declarationContext) {
JsInvocation createInvocation = context().namer().classCreateInvocation(descriptor);
translateClassOrObjectCreation(createInvocation, declarationContext);
translate(createInvocation, declarationContext);
return createInvocation;
}
public void translateClassOrObjectCreation(@NotNull JsInvocation createInvocation) {
translateClassOrObjectCreation(createInvocation, context());
public void translate(@NotNull JsInvocation createInvocation) {
translate(createInvocation, context());
}
private void translateClassOrObjectCreation(@NotNull JsInvocation createInvocation, @NotNull TranslationContext context) {
private void translate(@NotNull JsInvocation createInvocation, @NotNull TranslationContext context) {
addSuperclassReferences(createInvocation);
addClassOwnDeclarations(createInvocation, context);
}
@@ -137,40 +130,80 @@ public final class ClassTranslator extends AbstractTranslator {
return descriptor.getKind().equals(ClassKind.TRAIT);
}
private void addClassOwnDeclarations(@NotNull JsInvocation jsClassDeclaration, @NotNull TranslationContext classDeclarationContext) {
JsObjectLiteral properties = new JsObjectLiteral(true);
List<JsPropertyInitializer> propertyList = properties.getPropertyInitializers();
private void addClassOwnDeclarations(@NotNull JsInvocation jsClassDeclaration, @NotNull final TranslationContext declarationContext) {
final List<JsPropertyInitializer> properties = new SmartList<JsPropertyInitializer>();
final List<JsPropertyInitializer> staticProperties;
boolean isTopLevelDeclaration = context() == declarationContext;
if (!isTopLevelDeclaration) {
staticProperties = null;
}
else if (descriptor.getKind().isObject()) {
staticProperties = null;
declarationContext.literalFunctionTranslator()
.setDefinitionPlace(new NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>>() {
@Override
@NotNull
public Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression> compute() {
return createPlace(properties, context().getThisObject(descriptor));
}
});
}
else {
staticProperties = new SmartList<JsPropertyInitializer>();
declarationContext.literalFunctionTranslator()
.setDefinitionPlace(new NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>>() {
@Override
@NotNull
public Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression> compute() {
return createPlace(staticProperties, getQualifiedReference(declarationContext, descriptor));
}
});
}
if (!isTrait()) {
JsFunction initializer = Translation.generateClassInitializerMethod(classDeclaration, classDeclarationContext);
JsFunction initializer = new ClassInitializerTranslator(classDeclaration, declarationContext).generateInitializeMethod();
if (context().isEcma5()) {
jsClassDeclaration.getArguments().add(initializer.getBody().getStatements().isEmpty() ? JsLiteral.NULL : initializer);
}
else {
propertyList.add(new JsPropertyInitializer(Namer.initializeMethodReference(), initializer));
properties.add(new JsPropertyInitializer(Namer.initializeMethodReference(), initializer));
}
}
propertyList.addAll(translatePropertiesAsConstructorParameters(classDeclarationContext));
propertyList.addAll(declarationBodyVisitor.traverseClass(classDeclaration, classDeclarationContext));
translatePropertiesAsConstructorParameters(declarationContext, properties);
new DeclarationBodyVisitor(properties).traverseContainer(classDeclaration, declarationContext);
if (!propertyList.isEmpty() || !context().isEcma5()) {
jsClassDeclaration.getArguments().add(properties);
if (isTopLevelDeclaration) {
declarationContext.literalFunctionTranslator().setDefinitionPlace(null);
}
boolean hasStaticProperties = staticProperties != null && !staticProperties.isEmpty();
if (!properties.isEmpty() || hasStaticProperties) {
jsClassDeclaration.getArguments().add(properties.isEmpty() ? JsLiteral.NULL : new JsObjectLiteral(properties, true));
}
if (hasStaticProperties) {
jsClassDeclaration.getArguments().add(new JsObjectLiteral(staticProperties, true));
}
}
private void addSuperclassReferences(@NotNull JsInvocation jsClassDeclaration) {
List<JsExpression> superClassReferences = getSupertypesNameReferences();
List<JsExpression> expressions = jsClassDeclaration.getArguments();
if (context().isEcma5()) {
if (superClassReferences.isEmpty()) {
if (superClassReferences.isEmpty()) {
if (!isTrait() || context().isEcma5()) {
jsClassDeclaration.getArguments().add(JsLiteral.NULL);
return;
}
else if (superClassReferences.size() > 1) {
JsArrayLiteral arrayLiteral = new JsArrayLiteral();
jsClassDeclaration.getArguments().add(arrayLiteral);
expressions = arrayLiteral.getExpressions();
}
return;
}
List<JsExpression> expressions;
if (superClassReferences.size() > 1) {
JsArrayLiteral arrayLiteral = new JsArrayLiteral();
jsClassDeclaration.getArguments().add(arrayLiteral);
expressions = arrayLiteral.getExpressions();
}
else {
expressions = jsClassDeclaration.getArguments();
}
for (JsExpression superClassReference : superClassReferences) {
@@ -231,20 +264,13 @@ public final class ClassTranslator extends AbstractTranslator {
return getQualifiedReference(context(), superClassDescriptor);
}
@NotNull
private List<JsPropertyInitializer> translatePropertiesAsConstructorParameters(@NotNull TranslationContext classDeclarationContext) {
List<JetParameter> parameters = getPrimaryConstructorParameters(classDeclaration);
if (parameters.isEmpty()) {
return Collections.emptyList();
}
List<JsPropertyInitializer> result = new SmartList<JsPropertyInitializer>();
for (JetParameter parameter : parameters) {
private void translatePropertiesAsConstructorParameters(@NotNull TranslationContext classDeclarationContext,
@NotNull List<JsPropertyInitializer> result) {
for (JetParameter parameter : getPrimaryConstructorParameters(classDeclaration)) {
PropertyDescriptor descriptor = getPropertyDescriptorForConstructorParameter(bindingContext(), parameter);
if (descriptor != null) {
PropertyTranslator.translateAccessors(descriptor, result, classDeclarationContext);
}
}
return result;
}
}
js/js.translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java
+6 -10
View File
@@ -36,9 +36,14 @@ import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescrip
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForObjectDeclaration;
public class DeclarationBodyVisitor extends TranslatorVisitor<Void> {
protected final List<JsPropertyInitializer> result = new SmartList<JsPropertyInitializer>();
protected final List<JsPropertyInitializer> result;
public DeclarationBodyVisitor() {
this(new SmartList<JsPropertyInitializer>());
}
public DeclarationBodyVisitor(List<JsPropertyInitializer> result) {
this.result = result;
}
@NotNull
@@ -46,15 +51,6 @@ public class DeclarationBodyVisitor extends TranslatorVisitor<Void> {
return result;
}
@NotNull
public List<JsPropertyInitializer> traverseClass(@NotNull JetClassOrObject jetClass,
@NotNull TranslationContext context) {
for (JetDeclaration declaration : jetClass.getDeclarations()) {
declaration.accept(this, context);
}
return result;
}
@Override
public Void visitClass(@NotNull JetClass expression, @NotNull TranslationContext context) {
return null;
js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceDeclarationTranslator.java
+1 -2
View File
@@ -62,7 +62,7 @@ public final class NamespaceDeclarationTranslator extends AbstractTranslator {
if (rootNamespaceDefinition == null) {
rootNamespaceDefinition = getRootPackage(descriptorToDefineInvocation, descriptor);
}
translator = new NamespaceTranslator(descriptor, classDeclarationTranslator, context());
translator = new NamespaceTranslator(descriptor, classDeclarationTranslator, descriptorToDefineInvocation, context());
descriptorToTranslator.put(descriptor, translator);
}
@@ -88,7 +88,6 @@ public final class NamespaceDeclarationTranslator extends AbstractTranslator {
translator.add(descriptorToDefineInvocation, result);
}
vars.addIfHasInitializer(context().literalFunctionTranslator().getDeclaration());
vars.addIfHasInitializer(classDeclarationTranslator.getDeclaration());
vars.addIfHasInitializer(getDeclaration(rootNamespaceDefinition));
return result;
js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java
+47 -11
View File
@@ -17,17 +17,22 @@
package org.jetbrains.k2js.translate.declaration;
import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.openapi.util.NotNullLazyValue;
import com.intellij.openapi.util.Trinity;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.k2js.translate.LabelGenerator;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.initializer.InitializerUtils;
import org.jetbrains.k2js.translate.initializer.InitializerVisitor;
import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import org.jetbrains.k2js.translate.utils.JsAstUtils;
import org.jetbrains.k2js.translate.utils.TranslationUtils;
@@ -36,9 +41,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import static org.jetbrains.k2js.translate.expression.LiteralFunctionTranslator.createPlace;
import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForProperty;
import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.isPredefinedObject;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForElement;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor;
final class NamespaceTranslator extends AbstractTranslator {
@@ -49,22 +53,49 @@ final class NamespaceTranslator extends AbstractTranslator {
private final FileDeclarationVisitor visitor;
NamespaceTranslator(@NotNull NamespaceDescriptor descriptor,
private final NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>> definitionPlace;
NamespaceTranslator(@NotNull final NamespaceDescriptor descriptor,
@NotNull ClassDeclarationTranslator classDeclarationTranslator,
@NotNull final Map<NamespaceDescriptor, List<JsExpression>> descriptorToDefineInvocation,
@NotNull TranslationContext context) {
super(context.newDeclaration(descriptor));
this.descriptor = descriptor;
this.classDeclarationTranslator = classDeclarationTranslator;
visitor = new FileDeclarationVisitor();
definitionPlace = new NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>>() {
@Override
@NotNull
public Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression> compute() {
List<JsExpression> defineInvocation = descriptorToDefineInvocation.get(descriptor);
if (defineInvocation == null) {
defineInvocation = createDefinitionPlace(null, descriptorToDefineInvocation);
}
return createPlace(getListFromPlace(defineInvocation), TranslationUtils.getQualifiedReference(context(), descriptor));
}
};
}
public void translate(JetFile file) {
context().literalFunctionTranslator().setDefinitionPlace(definitionPlace);
for (JetDeclaration declaration : file.getDeclarations()) {
if (!isPredefinedObject(getDescriptorForElement(bindingContext(), declaration))) {
if (!AnnotationsUtils.isPredefinedObject(BindingUtils.getDescriptorForElement(bindingContext(), declaration))) {
declaration.accept(visitor, context());
}
}
context().literalFunctionTranslator().setDefinitionPlace(null);
}
private List<JsExpression> createDefinitionPlace(@Nullable JsExpression initializer,
Map<NamespaceDescriptor, List<JsExpression>> descriptorToDefineInvocation) {
List<JsExpression> place = createDefineInvocation(initializer, new JsObjectLiteral(visitor.getResult(), true));
descriptorToDefineInvocation.put(descriptor, place);
addToParent((NamespaceDescriptor) descriptor.getContainingDeclaration(), getEntry(descriptor, place), descriptorToDefineInvocation);
return place;
}
public void add(@NotNull Map<NamespaceDescriptor, List<JsExpression>> descriptorToDefineInvocation,
@@ -83,20 +114,26 @@ final class NamespaceTranslator extends AbstractTranslator {
List<JsExpression> defineInvocation = descriptorToDefineInvocation.get(descriptor);
if (defineInvocation == null) {
defineInvocation = createDefineInvocation(initializer, new JsObjectLiteral(visitor.getResult(), true));
descriptorToDefineInvocation.put(descriptor, defineInvocation);
addToParent((NamespaceDescriptor) descriptor.getContainingDeclaration(), getEntry(descriptor, defineInvocation),
descriptorToDefineInvocation);
createDefinitionPlace(initializer, descriptorToDefineInvocation);
}
else {
if (context().isEcma5() && initializer != null) {
assert defineInvocation.get(0) == JsLiteral.NULL;
defineInvocation.set(0, initializer);
}
((JsObjectLiteral) defineInvocation.get(context().isEcma5() ? 1 : 0)).getPropertyInitializers().addAll(visitor.getResult());
List<JsPropertyInitializer> listFromPlace = getListFromPlace(defineInvocation);
// if equals, so, inner functions was added
if (listFromPlace != visitor.getResult()) {
listFromPlace.addAll(visitor.getResult());
}
}
}
private List<JsPropertyInitializer> getListFromPlace(List<JsExpression> defineInvocation) {
return ((JsObjectLiteral) defineInvocation.get(context().isEcma5() ? 1 : 0)).getPropertyInitializers();
}
private List<JsExpression> createDefineInvocation(@Nullable JsExpression initializer, @NotNull JsObjectLiteral members) {
if (context().isEcma5()) {
return Arrays.asList(initializer == null ? JsLiteral.NULL : initializer, members);
@@ -126,8 +163,7 @@ final class NamespaceTranslator extends AbstractTranslator {
JsPropertyInitializer entry,
Map<NamespaceDescriptor, List<JsExpression>> descriptorToDefineInvocation) {
while (!addEntryIfParentExists(parentDescriptor, entry, descriptorToDefineInvocation)) {
List<JsExpression> defineInvocation =
createDefineInvocation(null, new JsObjectLiteral(new SmartList<JsPropertyInitializer>(entry), true));
List<JsExpression> defineInvocation = createDefineInvocation(null, new JsObjectLiteral(new SmartList<JsPropertyInitializer>(entry), true));
entry = getEntry(parentDescriptor, defineInvocation);
descriptorToDefineInvocation.put(parentDescriptor, defineInvocation);
js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+30 -16
View File
@@ -20,6 +20,8 @@ import com.google.dart.compiler.backend.js.ast.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
@@ -36,6 +38,7 @@ import org.jetbrains.k2js.translate.reference.*;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import org.jetbrains.k2js.translate.utils.mutator.AssignToExpressionMutator;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.k2js.translate.general.Translation.translateAsExpression;
@@ -130,10 +133,19 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
@NotNull
// assume it is a local variable declaration
public JsNode visitProperty(@NotNull JetProperty expression, @NotNull TranslationContext context) {
DeclarationDescriptor descriptor = getDescriptorForElement(context.bindingContext(), expression);
JsName jsPropertyName = context.getNameForDescriptor(descriptor);
JsExpression jsInitExpression = translateInitializerForProperty(expression, context);
return newVar(jsPropertyName, jsInitExpression);
VariableDescriptor descriptor = context.bindingContext().get(BindingContext.VARIABLE, expression);
assert descriptor != null;
JsExpression initializer = translateInitializerForProperty(expression, context);
JsName name = context.getNameForDescriptor(descriptor);
if (descriptor.isVar() && context.bindingContext().get(BindingContext.CAPTURED_IN_CLOSURE, descriptor) != null) {
// well, wrap it
JsNameRef alias = new JsNameRef("v", new JsNameRef(name));
initializer = new JsObjectLiteral(
Collections.singletonList(new JsPropertyInitializer(alias, initializer == null ? JsLiteral.NULL : initializer)));
context.aliasingContext().registerAlias(descriptor, alias);
}
return newVar(name, initializer);
}
@Override
@@ -319,15 +331,24 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
@Override
@NotNull
public JsNode visitFunctionLiteralExpression(@NotNull JetFunctionLiteralExpression expression,
@NotNull TranslationContext context) {
return context.literalFunctionTranslator().translate(expression);
public JsNode visitFunctionLiteralExpression(@NotNull JetFunctionLiteralExpression expression, @NotNull TranslationContext context) {
FunctionDescriptor descriptor = getFunctionDescriptor(context.bindingContext(), expression.getFunctionLiteral());
return context.literalFunctionTranslator().translate(expression.getFunctionLiteral(), descriptor, context);
}
@Override
@NotNull
public JsNode visitThisExpression(@NotNull JetThisExpression expression,
@NotNull TranslationContext context) {
public JsNode visitNamedFunction(@NotNull JetNamedFunction expression, @NotNull TranslationContext context) {
FunctionDescriptor descriptor = getFunctionDescriptor(context.bindingContext(), expression);
JsExpression alias = context.literalFunctionTranslator().translate(expression, descriptor, context);
JsName name = context.scope().declareFreshName(descriptor.getName().asString());
context.aliasingContext().registerAlias(descriptor, name.makeRef());
return new JsVars(new JsVars.JsVar(name, alias));
}
@Override
@NotNull
public JsNode visitThisExpression(@NotNull JetThisExpression expression, @NotNull TranslationContext context) {
DeclarationDescriptor thisExpression =
getDescriptorForReferenceExpression(context.bindingContext(), expression.getInstanceReference());
assert thisExpression != null : "This expression must reference a descriptor: " + expression.getText();
@@ -381,11 +402,4 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
JsExpression value = ClassTranslator.generateClassCreation(expression, context);
return newVar(propertyName, value);
}
@Override
@NotNull
public JsNode visitNamedFunction(@NotNull JetNamedFunction function,
@NotNull TranslationContext context) {
return FunctionTranslator.newInstance(function, context).translateAsLocalFunction();
}
}
js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+3 -13
View File
@@ -30,7 +30,6 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFunctionLiteral;
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
@@ -64,8 +63,7 @@ public final class FunctionTranslator extends AbstractTranslator {
@NotNull
private final FunctionDescriptor descriptor;
private FunctionTranslator(@NotNull JetDeclarationWithBody functionDeclaration,
@NotNull TranslationContext context) {
private FunctionTranslator(@NotNull JetDeclarationWithBody functionDeclaration, @NotNull TranslationContext context) {
super(context);
this.descriptor = getFunctionDescriptor(context.bindingContext(), functionDeclaration);
this.functionDeclaration = functionDeclaration;
@@ -95,15 +93,7 @@ public final class FunctionTranslator extends AbstractTranslator {
@NotNull
private TranslationContext getContextWithFunctionBodyBlock() {
return context().newDeclaration(functionDeclaration).innerBlock(functionObject.getBody());
}
@NotNull
public JsFunction translateAsLocalFunction() {
JsName functionName = context().getNameForElement(functionDeclaration);
generateFunctionObject();
functionObject.setName(functionName);
return functionObject;
return context().contextWithScope(functionObject);
}
@NotNull
@@ -114,7 +104,7 @@ public final class FunctionTranslator extends AbstractTranslator {
@NotNull
public JsPropertyInitializer translateAsMethod() {
JsName functionName = context().getNameForElement(functionDeclaration);
JsName functionName = context().getNameForDescriptor(descriptor);
generateFunctionObject();
return new JsPropertyInitializer(functionName.makeRef(), functionObject);
}
js/js.translator/src/org/jetbrains/k2js/translate/expression/InnerDeclarationTranslator.java
+15 -10
View File
@@ -19,6 +19,7 @@ package org.jetbrains.k2js.translate.expression;
import com.google.dart.compiler.backend.js.ast.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
@@ -35,12 +36,12 @@ abstract class InnerDeclarationTranslator {
protected final TranslationContext context;
protected final JsFunction fun;
public InnerDeclarationTranslator(@NotNull JetElement declaration,
public InnerDeclarationTranslator(@NotNull JetElement element,
@NotNull DeclarationDescriptor descriptor,
@NotNull TranslationContext context,
@NotNull JsFunction fun) {
this.context = context;
closureContext = ClosureUtils.captureClosure(context.bindingContext(), declaration, descriptor);
closureContext = ClosureUtils.captureClosure(context.bindingContext(), element, descriptor);
this.fun = fun;
}
@@ -48,10 +49,7 @@ abstract class InnerDeclarationTranslator {
return Collections.emptyList();
}
@NotNull
public abstract JsExpression translate(@NotNull JsNameRef nameRef);
protected JsExpression translate(@NotNull JsNameRef nameRef, @Nullable JsExpression self) {
public JsExpression translate(@NotNull JsNameRef nameRef, @Nullable JsExpression self) {
if (closureContext.getDescriptors().isEmpty() && self == JsLiteral.NULL) {
return createExpression(nameRef, self);
}
@@ -62,9 +60,9 @@ abstract class InnerDeclarationTranslator {
}
}
protected abstract JsExpression createExpression(JsNameRef nameRef, JsExpression self);
protected abstract JsExpression createExpression(@NotNull JsNameRef nameRef, @Nullable JsExpression self);
protected abstract JsInvocation createInvocation(JsNameRef nameRef, JsExpression self);
protected abstract JsInvocation createInvocation(@NotNull JsNameRef nameRef, @Nullable JsExpression self);
private void addCapturedValueParameters(JsInvocation bind) {
if (closureContext.getDescriptors().isEmpty()) {
@@ -72,8 +70,15 @@ abstract class InnerDeclarationTranslator {
}
List<JsExpression> expressions = getCapturedValueParametersList(bind);
for (VariableDescriptor variableDescriptor : closureContext.getDescriptors()) {
JsName name = context.getNameForDescriptor(variableDescriptor);
for (CallableDescriptor descriptor : closureContext.getDescriptors()) {
JsName name;
if (descriptor instanceof VariableDescriptor) {
name = context.getNameForDescriptor(descriptor);
}
else {
name = ((JsNameRef) context.getAliasForDescriptor(descriptor)).getName();
assert name != null;
}
fun.getParameters().add(new JsParameter(name));
expressions.add(name.makeRef());
}
js/js.translator/src/org/jetbrains/k2js/translate/expression/InnerFunctionTranslator.java
+17 -18
View File
@@ -18,6 +18,7 @@ package org.jetbrains.k2js.translate.expression;
import com.google.dart.compiler.backend.js.ast.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
@@ -29,38 +30,32 @@ import java.util.List;
class InnerFunctionTranslator extends InnerDeclarationTranslator {
private final FunctionDescriptor descriptor;
public InnerFunctionTranslator(@NotNull JetElement declaration,
public InnerFunctionTranslator(@NotNull JetElement element,
@NotNull FunctionDescriptor descriptor,
@NotNull TranslationContext context,
@NotNull JsFunction fun) {
super(declaration, descriptor, context, fun);
super(element, descriptor, context, fun);
this.descriptor = descriptor;
}
public boolean isLocalVariablesAffected() {
return closureContext.isLocalVariablesAffected();
}
@Override
protected List<ValueParameterDescriptor> getValueParameters() {
return descriptor.getValueParameters();
}
@Override
@SuppressWarnings("MethodOverloadsMethodOfSuperclass")
@NotNull
public JsExpression translate(@NotNull JsNameRef nameRef) {
JsExpression result = translate(nameRef, getThis());
FunctionTranslator.addParameters(fun.getParameters(), descriptor, context);
return result;
public JsExpression translate(@NotNull JsNameRef nameRef, @NotNull TranslationContext outerContext) {
return translate(nameRef, getThis(outerContext));
}
@Override
protected JsExpression createExpression(JsNameRef nameRef, JsExpression self) {
protected JsExpression createExpression(@NotNull JsNameRef nameRef, @Nullable JsExpression self) {
return nameRef;
}
@Override
protected JsInvocation createInvocation(JsNameRef nameRef, JsExpression self) {
protected JsInvocation createInvocation(@NotNull JsNameRef nameRef, @Nullable JsExpression self) {
JsInvocation bind = new JsInvocation(context.namer().kotlin(getBindMethodName()));
bind.getArguments().add(nameRef);
bind.getArguments().add(self);
@@ -68,10 +63,10 @@ class InnerFunctionTranslator extends InnerDeclarationTranslator {
}
@NotNull
private JsExpression getThis() {
private JsExpression getThis(TranslationContext outerContext) {
ClassDescriptor outerClassDescriptor = closureContext.outerClassDescriptor;
if (outerClassDescriptor != null && descriptor.getReceiverParameter() == null) {
return JsLiteral.THIS;
return outerContext.getThisObject(outerClassDescriptor);
}
return JsLiteral.NULL;
@@ -80,16 +75,20 @@ class InnerFunctionTranslator extends InnerDeclarationTranslator {
@NotNull
private String getBindMethodName() {
if (closureContext.getDescriptors().isEmpty()) {
return getValueParameters().isEmpty() ? "b3" : "b4";
return !hasArguments() ? "b3" : "b4";
}
else {
return getValueParameters().isEmpty() ? (closureContext.getDescriptors().size() == 1 ? "b0" : "b1") : "b2";
return !hasArguments() ? (closureContext.getDescriptors().size() == 1 ? "b0" : "b1") : "b2";
}
}
private boolean hasArguments() {
return !getValueParameters().isEmpty() || descriptor.getReceiverParameter() != null;
}
@Override
protected List<JsExpression> getCapturedValueParametersList(JsInvocation invocation) {
if (closureContext.getDescriptors().size() > 1 || !getValueParameters().isEmpty()) {
if (closureContext.getDescriptors().size() > 1 || hasArguments()) {
JsArrayLiteral values = new JsArrayLiteral();
invocation.getArguments().add(values);
return values.getExpressions();
js/js.translator/src/org/jetbrains/k2js/translate/expression/InnerObjectTranslator.java
+7 -17
View File
@@ -18,35 +18,25 @@ package org.jetbrains.k2js.translate.expression;
import com.google.dart.compiler.backend.js.ast.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.k2js.translate.context.TraceableThisAliasProvider;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.k2js.translate.context.TranslationContext;
class InnerObjectTranslator extends InnerDeclarationTranslator {
public InnerObjectTranslator(@NotNull JetClassOrObject declaration, @NotNull ClassDescriptor descriptor, @NotNull TranslationContext context, @NotNull JsFunction fun) {
super(declaration, descriptor, context, fun);
public InnerObjectTranslator(@NotNull JetElement element, @NotNull ClassDescriptor descriptor, @NotNull TranslationContext context, @NotNull JsFunction fun) {
super(element, descriptor, context, fun);
}
@Override
protected JsExpression createExpression(JsNameRef nameRef, JsExpression self) {
protected JsExpression createExpression(@NotNull JsNameRef nameRef, @Nullable JsExpression self) {
return createInvocation(nameRef, self);
}
@Override
@NotNull
public JsExpression translate(@NotNull JsNameRef nameRef) {
return super.translate(nameRef, thisAliasProvider().getRefIfWasCaptured());
}
private TraceableThisAliasProvider thisAliasProvider() {
return ((TraceableThisAliasProvider) context.thisAliasProvider());
}
@Override
protected JsInvocation createInvocation(JsNameRef nameRef, JsExpression self) {
protected JsInvocation createInvocation(@NotNull JsNameRef nameRef, @Nullable JsExpression self) {
JsInvocation invocation = new JsInvocation(nameRef);
if (thisAliasProvider().wasThisCaptured()) {
if (self != null) {
fun.getParameters().add(new JsParameter(((JsNameRef) self).getName()));
invocation.getArguments().add(JsLiteral.THIS);
}
js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.java
+86 -49
View File
@@ -17,79 +17,107 @@
package org.jetbrains.k2js.translate.expression;
import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.openapi.util.NotNullLazyValue;
import com.intellij.openapi.util.Trinity;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.psi.JetClassBody;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.k2js.translate.LabelGenerator;
import org.jetbrains.k2js.translate.context.AliasingContext;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.TraceableThisAliasProvider;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.context.UsageTracker;
import org.jetbrains.k2js.translate.declaration.ClassTranslator;
import org.jetbrains.k2js.translate.initializer.InitializerUtils;
import java.util.ArrayList;
import java.util.List;
import static com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor;
import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedReceiverDescriptor;
// todo easy incremental compiler implementation - generated functions should be inside corresponding class/namespace definition
public class LiteralFunctionTranslator {
private final List<JsPropertyInitializer> properties = new ArrayList<JsPropertyInitializer>();
private final LabelGenerator labelGenerator = new LabelGenerator('f');
private final JsNameRef containingVarRef = new JsNameRef("_f");
private TranslationContext rootContext;
private final Stack<NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>>> definitionPlaces =
new Stack<NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>>>();
private NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>> definitionPlace;
public void setRootContext(@NotNull TranslationContext rootContext) {
assert this.rootContext == null;
this.rootContext = rootContext;
JsName containingVarName = rootContext.scope().declareName(containingVarRef.getIdent());
containingVarRef.resolve(containingVarName);
}
public JsVar getDeclaration() {
return new JsVar(containingVarRef.getName(), properties.isEmpty() ? null : new JsObjectLiteral(properties, true));
public static Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression> createPlace(@NotNull List<JsPropertyInitializer> list,
@NotNull JsExpression reference) {
return Trinity.create(list, new LabelGenerator('f'), reference);
}
public JsExpression translate(@NotNull JetFunctionLiteralExpression declaration) {
FunctionDescriptor descriptor = getFunctionDescriptor(rootContext.bindingContext(), declaration.getFunctionLiteral());
public void setDefinitionPlace(@Nullable NotNullLazyValue<Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression>> place) {
if (place == null) {
definitionPlaces.pop();
definitionPlace = definitionPlaces.isEmpty() ? null : definitionPlaces.peek();
}
else {
definitionPlaces.push(place);
definitionPlace = place;
}
}
public JsExpression translate(@NotNull JetDeclarationWithBody declaration, @NotNull FunctionDescriptor descriptor, @NotNull TranslationContext outerContext) {
JsFunction fun = createFunction();
TranslationContext funContext;
boolean asInner;
ClassDescriptor outerClass;
AliasingContext aliasingContext = rootContext.aliasingContext();
DeclarationDescriptor receiverDescriptor = getExpectedReceiverDescriptor(descriptor);
JsName receiverName;
if (receiverDescriptor == null) {
receiverName = null;
}
else {
receiverName = fun.getScope().declareName(Namer.getReceiverParameterName());
aliasingContext = aliasingContext.inner(receiverDescriptor, receiverName.makeRef());
}
if (descriptor.getContainingDeclaration() instanceof ConstructorDescriptor) {
// KT-2388
asInner = true;
fun.setName(fun.getScope().declareName(Namer.CALLEE_NAME));
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor.getContainingDeclaration().getContainingDeclaration();
assert classDescriptor != null;
funContext = createThisTraceableContext(classDescriptor, fun, new JsNameRef("o", fun.getName().makeRef()));
outerClass = (ClassDescriptor) descriptor.getContainingDeclaration().getContainingDeclaration();
assert outerClass != null;
if (receiverDescriptor == null) {
aliasingContext = aliasingContext.inner(outerClass, new JsNameRef("o", fun.getName().makeRef()));
}
funContext = rootContext.contextWithScope(fun, aliasingContext, new UsageTracker(outerClass));
}
else {
outerClass = null;
asInner = DescriptorUtils.isTopLevelDeclaration(descriptor);
funContext = rootContext.contextWithScope(fun);
funContext = rootContext.contextWithScope(fun, aliasingContext, outerContext.usageTracker());
}
fun.getBody().getStatements().addAll(translateFunctionBody(descriptor, declaration.getFunctionLiteral(), funContext).getStatements());
fun.getBody().getStatements().addAll(translateFunctionBody(descriptor, declaration, funContext).getStatements());
InnerFunctionTranslator translator = null;
if (!asInner) {
translator = new InnerFunctionTranslator(declaration, descriptor, funContext, fun);
if (translator.isLocalVariablesAffected()) {
asInner = true;
}
translator = new InnerFunctionTranslator(declaration.asElement(), descriptor, funContext, fun);
}
if (asInner) {
FunctionTranslator.addParameters(fun.getParameters(), descriptor, funContext);
if (funContext.thisAliasProvider() instanceof TraceableThisAliasProvider) {
TraceableThisAliasProvider provider = (TraceableThisAliasProvider) funContext.thisAliasProvider();
if (provider.wasThisCaptured()) {
addRegularParameters(descriptor, fun, funContext, receiverName);
if (outerClass != null) {
if (funContext.usageTracker().isUsed()) {
return new JsInvocation(rootContext.namer().kotlin("assignOwner"), fun, JsLiteral.THIS);
}
else {
@@ -97,40 +125,49 @@ public class LiteralFunctionTranslator {
}
}
return fun;
}
return translate(translator, fun);
JsExpression result = translator.translate(createReference(fun), outerContext);
addRegularParameters(descriptor, fun, funContext, receiverName);
return result;
}
private JsNameRef createReference(JsFunction fun) {
Trinity<List<JsPropertyInitializer>, LabelGenerator, JsExpression> place = definitionPlace.getValue();
JsNameRef nameRef = new JsNameRef(place.second.generate(), place.third);
place.first.add(new JsPropertyInitializer(nameRef, InitializerUtils.toDataDescriptor(fun, rootContext)));
return nameRef;
}
private static void addRegularParameters(FunctionDescriptor descriptor,
JsFunction fun,
TranslationContext funContext,
JsName receiverName) {
if (receiverName != null) {
fun.getParameters().add(new JsParameter(receiverName));
}
FunctionTranslator.addParameters(fun.getParameters(), descriptor, funContext);
}
private JsFunction createFunction() {
return new JsFunction(rootContext.scope(), new JsBlock());
}
public JsExpression translate(@NotNull ClassDescriptor containingClass,
public JsExpression translate(@NotNull ClassDescriptor outerClass,
@NotNull JetClassOrObject declaration,
@NotNull ClassDescriptor descriptor,
@NotNull ClassTranslator classTranslator) {
JsFunction fun = createFunction();
JsName outerThisName = fun.getScope().declareName("$this");
TranslationContext funContext = createThisTraceableContext(containingClass, fun, outerThisName.makeRef());
JsNameRef outerClassRef = fun.getScope().declareName("$this").makeRef();
TranslationContext funContext = rootContext
.contextWithScope(fun, rootContext.aliasingContext().inner(outerClass, outerClassRef), new UsageTracker(outerClass));
fun.getBody().getStatements().add(new JsReturn(classTranslator.translateClassOrObjectCreation(funContext)));
return translate(new InnerObjectTranslator(declaration, descriptor, funContext, fun), fun);
}
private JsExpression translate(@NotNull InnerDeclarationTranslator translator, @NotNull JsFunction fun) {
JsNameRef nameRef = new JsNameRef(labelGenerator.generate(), containingVarRef);
properties.add(new JsPropertyInitializer(nameRef, fun));
return translator.translate(nameRef);
}
private TranslationContext createThisTraceableContext(@NotNull ClassDescriptor containingClass,
@NotNull JsFunction fun,
@NotNull JsNameRef thisRef) {
return rootContext.contextWithScope(fun, rootContext.aliasingContext().inner(
new TraceableThisAliasProvider(containingClass, thisRef)));
fun.getBody().getStatements().add(new JsReturn(classTranslator.translate(funContext)));
JetClassBody body = declaration.getBody();
assert body != null;
InnerObjectTranslator translator = new InnerObjectTranslator(body, descriptor, funContext, fun);
return translator.translate(createReference(fun), funContext.usageTracker().isUsed() ? outerClassRef : null);
}
}
js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java
+1 -19
View File
@@ -31,14 +31,11 @@ import org.jetbrains.k2js.facade.exceptions.UnsupportedFeatureException;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.StaticContext;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.declaration.ClassAliasingMap;
import org.jetbrains.k2js.translate.declaration.ClassTranslator;
import org.jetbrains.k2js.translate.declaration.NamespaceDeclarationTranslator;
import org.jetbrains.k2js.translate.expression.ExpressionVisitor;
import org.jetbrains.k2js.translate.expression.FunctionTranslator;
import org.jetbrains.k2js.translate.expression.PatternTranslator;
import org.jetbrains.k2js.translate.expression.WhenTranslator;
import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator;
import org.jetbrains.k2js.translate.reference.CallBuilder;
import org.jetbrains.k2js.translate.test.JSTestGenerator;
import org.jetbrains.k2js.translate.test.JSTester;
@@ -75,13 +72,6 @@ public final class Translation {
return NamespaceDeclarationTranslator.translateFiles(files, context);
}
@NotNull
public static JsExpression translateClassDeclaration(@NotNull JetClass classDeclaration,
@NotNull ClassAliasingMap classAliasingMap,
@NotNull TranslationContext context) {
return ClassTranslator.generateClassCreation(classDeclaration, classAliasingMap, context);
}
@NotNull
public static PatternTranslator patternTranslator(@NotNull TranslationContext context) {
return PatternTranslator.newInstance(context);
@@ -124,14 +114,6 @@ public final class Translation {
return WhenTranslator.translate(expression, context);
}
//TODO: see if generate*Initializer methods fit somewhere else
@NotNull
public static JsFunction generateClassInitializerMethod(@NotNull JetClassOrObject classDeclaration,
@NotNull TranslationContext context) {
ClassInitializerTranslator classInitializerTranslator = new ClassInitializerTranslator(classDeclaration, context);
return classInitializerTranslator.generateInitializeMethod();
}
@NotNull
public static JsProgram generateAst(@NotNull BindingContext bindingContext,
@NotNull Collection<JetFile> files, @NotNull MainCallParameters mainCallParameters,
@@ -162,7 +144,7 @@ public final class Translation {
List<JsStatement> statements = rootBlock.getStatements();
statements.add(program.getStringLiteral("use strict").makeStmt());
TranslationContext context = TranslationContext.rootContext(staticContext);
TranslationContext context = TranslationContext.rootContext(staticContext, rootFunction);
staticContext.getLiteralFunctionTranslator().setRootContext(context);
statements.addAll(translateFiles(files, context));
defineModule(context, statements, config.getModuleId());
js/js.translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java
+7 -2
View File
@@ -17,8 +17,7 @@
package org.jetbrains.k2js.translate.general;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetVisitor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.k2js.translate.context.TranslationContext;
/**
@@ -32,4 +31,10 @@ public class TranslatorVisitor<T> extends JetVisitor<T, TranslationContext> {
throw new UnsupportedOperationException("Unsupported expression encountered:" + expression.toString());
}
public final void traverseContainer(@NotNull JetDeclarationContainer jetClass,
@NotNull TranslationContext context) {
for (JetDeclaration declaration : jetClass.getDeclarations()) {
declaration.accept(this, context);
}
}
}
js/js.translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
+17 -8
View File
@@ -17,6 +17,7 @@
package org.jetbrains.k2js.translate.initializer;
import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
@@ -35,7 +36,6 @@ import java.util.List;
import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToStatement;
import static org.jetbrains.k2js.translate.utils.JsAstUtils.setParameters;
import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters;
import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateArgumentList;
@@ -43,7 +43,7 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
@NotNull
private final JetClassOrObject classDeclaration;
@NotNull
private final List<JsStatement> initializerStatements = new ArrayList<JsStatement>();
private final List<JsStatement> initializerStatements = new SmartList<JsStatement>();
public ClassInitializerTranslator(@NotNull JetClassOrObject classDeclaration, @NotNull TranslationContext context) {
// Note: it's important we use scope for class descriptor because anonymous function used in property initializers
@@ -59,25 +59,34 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
JsFunction result = context().getFunctionObject(primaryConstructor);
//NOTE: while we translate constructor parameters we also add property initializer statements
// for properties declared as constructor parameters
setParameters(result, translatePrimaryConstructorParameters());
result.getParameters().addAll(translatePrimaryConstructorParameters());
mayBeAddCallToSuperMethod(result);
(new InitializerVisitor(initializerStatements)).traverseClass(classDeclaration, context());
result.getBody().getStatements().addAll(initializerStatements);
new InitializerVisitor(initializerStatements).traverseContainer(classDeclaration, context());
for (JsStatement statement : initializerStatements) {
if (statement instanceof JsBlock) {
result.getBody().getStatements().addAll(((JsBlock) statement).getStatements());
}
else {
result.getBody().getStatements().add(statement);
}
}
return result;
}
private void mayBeAddCallToSuperMethod(JsFunction initializer) {
if (hasAncestorClass(bindingContext(), classDeclaration)) {
JetDelegatorToSuperCall superCall = getSuperCall();
if (superCall == null) return;
if (superCall == null) {
return;
}
addCallToSuperMethod(superCall, initializer);
}
}
private void addCallToSuperMethod(@NotNull JetDelegatorToSuperCall superCall, JsFunction initializer) {
List<JsExpression> arguments = translateArguments(superCall);
//TODO: can be problematic to maintain
if (context().isEcma5()) {
JsName ref = context().scope().declareName(Namer.CALLEE_NAME);
initializer.setName(ref);
js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java
-14
View File
@@ -64,18 +64,4 @@ public final class InitializerVisitor extends TranslatorVisitor<Void> {
InitializerUtils.generate(declaration, result, null, context);
return null;
}
@NotNull
private List<JsStatement> generateInitializerStatements(@NotNull List<JetDeclaration> declarations,
@NotNull TranslationContext context) {
for (JetDeclaration declaration : declarations) {
declaration.accept(this, context);
}
return result;
}
@NotNull
public final List<JsStatement> traverseClass(@NotNull JetClassOrObject expression, @NotNull TranslationContext context) {
return generateInitializerStatements(expression.getDeclarations(), context);
}
}
js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java
+20 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.k2js.translate.reference;
import com.google.dart.compiler.backend.js.ast.JsExpression;
import com.google.dart.compiler.backend.js.ast.JsLiteral;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
@@ -25,8 +26,12 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace;
import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.k2js.translate.context.TranslationContext;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getDeclarationDescriptorForReceiver;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getDeclarationDescriptorForExtensionCallReceiver;
public final class CallParametersResolver {
@@ -89,7 +94,21 @@ public final class CallParametersResolver {
if (qualifier != null && !isExtensionCall) {
return qualifier;
}
return context.thisAliasProvider().get(resolvedCall);
ReceiverValue thisObject = resolvedCall.getThisObject();
if (!thisObject.exists()) {
return null;
}
if (thisObject instanceof ClassReceiver) {
JsExpression ref = context.getAliasForDescriptor(((ClassReceiver) thisObject).getDeclarationDescriptor());
return ref == null ? JsLiteral.THIS : ref;
}
else if (thisObject instanceof ExtensionReceiver) {
return context.getAliasForDescriptor(getDeclarationDescriptorForReceiver(thisObject));
}
return resolvedCall.getReceiverArgument().exists() && resolvedCall.getExplicitReceiverKind().isThisObject() ? JsLiteral.THIS : null;
}
@NotNull
js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
+11 -57
View File
@@ -80,14 +80,11 @@ public final class CallTranslator extends AbstractTranslator {
if (isConstructor()) {
return constructorCall();
}
if (isNativeExtensionFunctionCall()) {
return nativeExtensionCall();
}
if (isExtensionFunctionLiteral()) {
return extensionFunctionLiteralCall();
}
if (isExtensionFunction()) {
return extensionFunctionCall();
if (resolvedCall.getReceiverArgument().exists()) {
if (AnnotationsUtils.isNativeObject(descriptor)) {
return methodCall(callParameters.getReceiver());
}
return extensionFunctionCall(!(descriptor instanceof ExpressionAsFunctionDescriptor) && !descriptor.getName().asString().equals("invoke"));
}
if (isExpressionAsFunction()) {
return expressionAsFunctionCall();
@@ -191,65 +188,22 @@ public final class CallTranslator extends AbstractTranslator {
return ReferenceTranslator.translateAsFQReference(descriptor, context());
}
private boolean isNativeExtensionFunctionCall() {
return AnnotationsUtils.isNativeObject(descriptor) && isExtensionFunction();
}
@NotNull
private JsExpression nativeExtensionCall() {
return methodCall(callParameters.getReceiver());
}
private boolean isExtensionFunctionLiteral() {
boolean isLiteral = isInvoke()
|| descriptor instanceof ExpressionAsFunctionDescriptor;
return isExtensionFunction() && isLiteral;
}
@NotNull
private JsExpression extensionFunctionLiteralCall() {
private JsExpression extensionFunctionCall(final boolean useThis) {
return callType.constructCall(callParameters.getReceiver(), new CallType.CallConstructor() {
@NotNull
@Override
public JsExpression construct(@Nullable JsExpression receiver) {
assert receiver != null : "Could not be null for extensions";
return constructExtensionLiteralCall(receiver);
JsExpression functionReference = callParameters.getFunctionReference();
if (useThis) {
setQualifier(functionReference, getThisObjectOrQualifier());
}
return new JsInvocation(functionReference, generateExtensionCallArgumentList(receiver));
}
}, context());
}
@NotNull
private JsExpression constructExtensionLiteralCall(@NotNull JsExpression realReceiver) {
List<JsExpression> callArguments = generateExtensionCallArgumentList(realReceiver);
return new JsInvocation(new JsNameRef("call", callParameters.getFunctionReference()), callArguments);
}
@SuppressWarnings("UnnecessaryLocalVariable")
private boolean isExtensionFunction() {
boolean hasReceiver = resolvedCall.getReceiverArgument().exists();
return hasReceiver;
}
@NotNull
private JsExpression extensionFunctionCall() {
return callType.constructCall(callParameters.getReceiver(), new CallType.CallConstructor() {
@NotNull
@Override
public JsExpression construct(@Nullable JsExpression receiver) {
assert receiver != null : "Could not be null for extensions";
return constructExtensionFunctionCall(receiver);
}
}, context());
}
@NotNull
private JsExpression constructExtensionFunctionCall(@NotNull JsExpression receiver) {
List<JsExpression> argumentList = generateExtensionCallArgumentList(receiver);
JsExpression functionReference = callParameters.getFunctionReference();
setQualifier(functionReference, getThisObjectOrQualifier());
return new JsInvocation(functionReference, argumentList);
}
@NotNull
private List<JsExpression> generateExtensionCallArgumentList(@NotNull JsExpression receiver) {
List<JsExpression> argumentList = new ArrayList<JsExpression>();
js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java
+2 -2
View File
@@ -100,10 +100,10 @@ public final class InlinedCallExpressionTranslator extends AbstractCallExpressio
@NotNull
private TranslationContext createContextWithAliasesForParameters(@NotNull TranslationContext contextForInlining) {
Map<DeclarationDescriptor, JsName> aliases = Maps.newHashMap();
Map<DeclarationDescriptor, JsExpression> aliases = Maps.newHashMap();
for (ValueParameterDescriptor parameterDescriptor : resolvedCall.getResultingDescriptor().getValueParameters()) {
TemporaryVariable aliasForArgument = createAliasForArgument(parameterDescriptor);
aliases.put(parameterDescriptor, aliasForArgument.name());
aliases.put(parameterDescriptor, aliasForArgument.name().makeRef());
}
return contextForInlining.innerContextWithDescriptorsAliased(aliases);
}
js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
+13 -7
View File
@@ -17,11 +17,12 @@
package org.jetbrains.k2js.translate.reference;
import com.google.dart.compiler.backend.js.ast.JsExpression;
import com.google.dart.compiler.backend.js.ast.JsName;
import com.google.dart.compiler.backend.js.ast.JsNameRef;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.k2js.translate.context.TranslationContext;
@@ -41,18 +42,23 @@ public final class ReferenceTranslator {
@NotNull
public static JsExpression translateAsFQReference(@NotNull DeclarationDescriptor referencedDescriptor,
@NotNull TranslationContext context) {
JsExpression qualifier = context.getQualifierForDescriptor(referencedDescriptor);
if (qualifier == null) {
return translateAsLocalNameReference(referencedDescriptor, context);
JsExpression alias = context.getAliasForDescriptor(referencedDescriptor);
if (alias != null) {
return alias;
}
JsName referencedName = context.getNameForDescriptor(referencedDescriptor);
return new JsNameRef(referencedName, qualifier);
return new JsNameRef(context.getNameForDescriptor(referencedDescriptor), context.getQualifierForDescriptor(referencedDescriptor));
}
@NotNull
public static JsExpression translateAsLocalNameReference(@NotNull DeclarationDescriptor referencedDescriptor,
@NotNull TranslationContext context) {
//Preconditions.checkNotNull(referencedDescriptor, "No referencedDescriptor available");
if (referencedDescriptor instanceof FunctionDescriptor || referencedDescriptor instanceof VariableDescriptor) {
JsExpression alias = context.aliasingContext().getAliasForDescriptor(referencedDescriptor);
if (alias != null) {
return alias;
}
}
return context.getNameForDescriptor(referencedDescriptor).makeRef();
}
js/js.translator/src/org/jetbrains/k2js/translate/utils/closure/CaptureClosureVisitor.java
+19 -7
View File
@@ -18,6 +18,7 @@ package org.jetbrains.k2js.translate.utils.closure;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
@@ -25,6 +26,7 @@ import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
class CaptureClosureVisitor extends JetTreeVisitor<ClosureContext> {
@NotNull
@@ -61,8 +63,8 @@ class CaptureClosureVisitor extends JetTreeVisitor<ClosureContext> {
DeclarationDescriptor descriptor = BindingUtils.getNullableDescriptorForReferenceExpression(bindingContext, expression);
if (!(descriptor instanceof VariableDescriptor)) {
if (descriptor instanceof SimpleFunctionDescriptor && !descriptor.getName().isSpecial()) {
checkOuterClassDescriptor(descriptor, context);
if (descriptor instanceof SimpleFunctionDescriptor) {
checkSimpleFunction(context, (SimpleFunctionDescriptor) descriptor);
}
return null;
}
@@ -75,6 +77,19 @@ class CaptureClosureVisitor extends JetTreeVisitor<ClosureContext> {
return null;
}
private void checkSimpleFunction(ClosureContext context, @Nullable SimpleFunctionDescriptor descriptor) {
if (descriptor == null || descriptor.getName().isSpecial()) {
return;
}
checkOuterClassDescriptor(descriptor, context);
DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
// local named function
if (!JsDescriptorUtils.isExtension(descriptor) && !(containingDeclaration instanceof ClassOrNamespaceDescriptor) && !isAncestor(functionDescriptor, descriptor)) {
context.put(descriptor);
}
}
private boolean captured(VariableDescriptor descriptor, ClosureContext context) {
if (descriptor instanceof PropertyDescriptor) {
checkOuterClassDescriptor(descriptor, context);
@@ -90,9 +105,7 @@ class CaptureClosureVisitor extends JetTreeVisitor<ClosureContext> {
return false;
}
if (descriptor instanceof LocalVariableDescriptor && descriptor.isVar()) {
// todo modification of outer local variable
context.setHasLocalVariables();
if (descriptor instanceof LocalVariableDescriptor || descriptor instanceof ValueParameterDescriptor) {
return true;
}
@@ -102,8 +115,7 @@ class CaptureClosureVisitor extends JetTreeVisitor<ClosureContext> {
return false;
}
return descriptor instanceof ValueParameterDescriptor ||
(!descriptor.isVar() && variableDeclaration instanceof JetProperty) ||
return (!descriptor.isVar() && variableDeclaration instanceof JetProperty) ||
variableDeclaration.getNode().getElementType().equals(JetNodeTypes.LOOP_PARAMETER);
}
js/js.translator/src/org/jetbrains/k2js/translate/utils/closure/ClosureContext.java
+4 -14
View File
@@ -19,35 +19,25 @@ package org.jetbrains.k2js.translate.utils.closure;
import com.intellij.util.containers.OrderedSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import java.util.Collection;
import java.util.Set;
public final class ClosureContext {
@NotNull
private final Set<VariableDescriptor> descriptors = new OrderedSet<VariableDescriptor>();
private boolean hasLocalVariables;
private final Set<CallableDescriptor> descriptors = new OrderedSet<CallableDescriptor>();
@Nullable
public ClassDescriptor outerClassDescriptor;
public boolean isLocalVariablesAffected() {
return hasLocalVariables;
}
void setHasLocalVariables() {
hasLocalVariables = true;
}
/*package*/ void put(@NotNull VariableDescriptor descriptor) {
/*package*/ void put(@NotNull CallableDescriptor descriptor) {
descriptors.add(descriptor);
}
@NotNull
public Collection<VariableDescriptor> getDescriptors() {
public Collection<CallableDescriptor> getDescriptors() {
return descriptors;
}
}
js/js.translator/src/org/jetbrains/k2js/translate/utils/closure/ClosureUtils.java
+1 -1
View File
@@ -29,7 +29,7 @@ public final class ClosureUtils {
public static ClosureContext captureClosure(@NotNull BindingContext bindingContext, @NotNull JetElement element, @NotNull DeclarationDescriptor descriptor) {
CaptureClosureVisitor captureClosureVisitor = new CaptureClosureVisitor(descriptor, bindingContext);
ClosureContext closureContext = new ClosureContext();
element.accept(captureClosureVisitor, closureContext);
element.acceptChildren(captureClosureVisitor, closureContext);
return closureContext;
}
}
js/js.translator/testFiles/kotlinLib/cases/namespace.js
+4 -3
View File
@@ -14,10 +14,11 @@
* limitations under the License.
*/
var foo = Kotlin.definePackage({box:function(){
return !false;
var foo = Kotlin.definePackage({initialize: function () {
}, box: function () {
return !false;
}
});
});
function test() {
return foo.box()
js/js.translator/testFiles/kotlinLib/cases/namespaceWithClasses.js
+1 -1
View File
@@ -16,7 +16,7 @@
{
var items = function () {
var A = Kotlin.createClass({initialize: function () {
var A = Kotlin.createClass(null, {initialize: function () {
this.$order = '';
{
this.set_order(this.get_order() + 'A');
js/js.translator/testFiles/kotlin_lib_ecma3.js
+32 -11
View File
@@ -97,10 +97,11 @@ var Kotlin = {};
function subclass() {
}
function create() {
var parent = null, properties = Kotlin.argumentsToArrayLike(arguments);
if (typeof (properties[0]) == "function") {
parent = properties.shift();
function create(parent, properties, staticProperties) {
var traits = null;
if (parent instanceof Array) {
traits = parent;
parent = parent[0];
}
function klass() {
@@ -111,13 +112,19 @@ var Kotlin = {};
}
klass.addMethods = addMethods;
klass.superclass = parent;
klass.superclass = parent || null;
klass.subclasses = [];
if (parent) {
subclass.prototype = parent.prototype;
klass.prototype = new subclass();
parent.subclasses.push(klass);
if (typeof (parent) == "function") {
subclass.prototype = parent.prototype;
klass.prototype = new subclass();
parent.subclasses.push(klass);
}
else {
// trait
klass.addMethods(parent);
}
}
klass.addMethods({get_class: function () {
@@ -131,8 +138,13 @@ var Kotlin = {};
}});
}
for (var i = 0, length = properties.length; i < length; i++) {
klass.addMethods(properties[i]);
if (traits !== null) {
for (var i = 1, n = traits.length; i < n; i++) {
klass.addMethods(traits[i]);
}
}
if (properties !== null && properties !== undefined) {
klass.addMethods(properties);
}
if (!klass.prototype.initialize) {
@@ -140,6 +152,9 @@ var Kotlin = {};
}
klass.prototype.constructor = klass;
if (staticProperties !== null && staticProperties !== undefined) {
copyProperties(klass, staticProperties);
}
return klass;
}
@@ -151,7 +166,13 @@ var Kotlin = {};
return create;
})();
Kotlin.$createClass = Kotlin.createClass;
Kotlin.$createClass = function (parent, properties) {
if (parent !== null && typeof (parent) != "function") {
properties = parent;
parent = null;
}
return Kotlin.createClass(parent, properties, null);
};
Kotlin.createObjectWithPrototype = function (prototype) {
function C() {}
js/js.translator/testFiles/kotlin_lib_ecma5.js
+9 -5
View File
@@ -66,13 +66,13 @@ var Kotlin = Object.create(null);
return proto;
}
Kotlin.createTrait = function (bases, properties) {
return createClass(bases, null, properties, false);
Kotlin.createTrait = function (bases, properties, staticProperties) {
return createClass(bases, null, properties, staticProperties, false);
};
Kotlin.createClass = function (bases, initializer, properties) {
Kotlin.createClass = function (bases, initializer, properties, staticProperties) {
// proto must be created for class even if it is not needed (requires for is operator)
return createClass(bases, initializer === null ? function () {} : initializer, properties, true);
return createClass(bases, initializer === null ? function () {} : initializer, properties, staticProperties, true);
};
function computeProto2(bases, properties) {
@@ -94,7 +94,7 @@ var Kotlin = Object.create(null);
return o;
};
function createClass(bases, initializer, properties, isClass) {
function createClass(bases, initializer, properties, staticProperties, isClass) {
var proto;
var baseInitializer;
if (bases === null) {
@@ -125,6 +125,10 @@ var Kotlin = Object.create(null);
Object.freeze(initializer);
}
if (staticProperties !== null && staticProperties !== undefined) {
Object.defineProperties(constructor, staticProperties);
}
Object.freeze(constructor);
return constructor;
}
libraries/stdlib/test/iterators/IteratorsTest.kt
+2 -1
View File
@@ -16,7 +16,8 @@ class IteratorsTest {
assertEquals(arrayList(144, 233, 377, 610, 987), fibonacci().filter { it > 100 }.takeWhile { it < 1000 }.toList())
}
test fun foldReducesTheFirstNElements() {
// TODO fix and enable this test
fun foldReducesTheFirstNElements() {
val sum = { (a: Int, b: Int) -> a + b }
assertEquals(arrayList(13, 21, 34, 55, 89).fold(0, sum), fibonacci().filter { it > 10 }.take(5).fold(0, sum))
}