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

commit

Browse Source
This commit is contained in:
Pavel Talanov
2012-02-03 20:46:27 +04:00
parent ad281a29bb
commit d46281822f
20 changed files with 214 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jslib/src/core/javautil.kt
+4
View File
@@ -145,3 +145,7 @@ public class StringBuilder() {
public fun toString() : String
}
library("splitString")
public fun String.split(regex : String) : Array<String> {
}
translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
+9 -34
View File
@@ -1,18 +1,14 @@
package org.jetbrains.k2js.translate.context;
import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.psi.JetPropertyAccessor;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForElement;
/**
* @author Pavel Talanov
@@ -53,34 +49,14 @@ public final class TranslationContext {
return new TranslationContext(staticContext, dynamicContext.innerBlock(block));
}
@NotNull
public TranslationContext newNamespace(@NotNull NamespaceDescriptor namespace) {
return newDeclaration(namespace);
}
@NotNull
public TranslationContext newDeclaration(@NotNull DeclarationDescriptor descriptor) {
return contextWithScope(getScopeForDescriptor(descriptor));
}
@NotNull
public TranslationContext newClass(@NotNull JetClass declaration) {
return newDeclaration(BindingUtils.getClassDescriptor(staticContext.getBindingContext(), declaration));
}
@NotNull
public TranslationContext newPropertyAccess(@NotNull JetPropertyAccessor declaration) {
return newDeclaration(BindingUtils.getPropertyAccessorDescriptor(staticContext.getBindingContext(), declaration));
}
@NotNull
public TranslationContext newPropertyAccess(@NotNull PropertyAccessorDescriptor descriptor) {
return newDeclaration(descriptor);
}
@NotNull
public TranslationContext newFunctionDeclaration(@NotNull JetNamedFunction declaration) {
return newDeclaration(BindingUtils.getFunctionDescriptor(staticContext.getBindingContext(), declaration));
public TranslationContext newDeclaration(@NotNull PsiElement element) {
return newDeclaration(getDescriptorForElement(bindingContext(), element));
}
@NotNull
@@ -88,21 +64,20 @@ public final class TranslationContext {
return staticContext.getBindingContext();
}
@NotNull
public NamingScope getScopeForDescriptor(@NotNull DeclarationDescriptor descriptor) {
return staticContext.getScopeForDescriptor(descriptor);
}
@NotNull
public NamingScope getScopeForElement(@NotNull JetElement element) {
DeclarationDescriptor descriptorForElement = BindingUtils.getDescriptorForElement(bindingContext(), element);
public NamingScope getScopeForElement(@NotNull PsiElement element) {
DeclarationDescriptor descriptorForElement = getDescriptorForElement(bindingContext(), element);
return getScopeForDescriptor(descriptorForElement);
}
@NotNull
public JsName getNameForElement(@NotNull JetElement element) {
DeclarationDescriptor descriptor = BindingUtils.getDescriptorForElement(bindingContext(), element);
public JsName getNameForElement(@NotNull PsiElement element) {
DeclarationDescriptor descriptor = getDescriptorForElement(bindingContext(), element);
return getNameForDescriptor(descriptor);
}
translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
+35 -16
View File
@@ -1,27 +1,24 @@
package org.jetbrains.k2js.translate.declaration;
import com.google.dart.compiler.backend.js.ast.JsExpression;
import com.google.dart.compiler.backend.js.ast.JsInvocation;
import com.google.dart.compiler.backend.js.ast.JsObjectLiteral;
import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.util.AstUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassKind;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetParameter;
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.utils.BindingUtils;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter;
import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
import static org.jetbrains.k2js.translate.utils.DescriptorUtils.findAncestorClass;
import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters;
/**
* @author Pavel Talanov
@@ -29,7 +26,16 @@ import static org.jetbrains.k2js.translate.utils.DescriptorUtils.findAncestorCla
public final class ClassTranslator extends AbstractTranslator {
@NotNull
public static JsInvocation translateClass(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
public static JsPropertyInitializer translateAsProperty(@NotNull JetClassOrObject classDeclaration,
@NotNull TranslationContext context) {
JsInvocation classCreationExpression = generateClassCreationExpression(classDeclaration, context);
JsName className = context.getNameForElement(classDeclaration);
return new JsPropertyInitializer(className.makeRef(), classCreationExpression);
}
@NotNull
public static JsInvocation generateClassCreationExpression(@NotNull JetClassOrObject classDeclaration,
@NotNull TranslationContext context) {
return (new ClassTranslator(classDeclaration, context)).translateClass();
}
@@ -37,10 +43,14 @@ public final class ClassTranslator extends AbstractTranslator {
private final DeclarationBodyVisitor declarationBodyVisitor = new DeclarationBodyVisitor();
@NotNull
private final JetClass classDeclaration;
private final JetClassOrObject classDeclaration;
private ClassTranslator(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
super(context.newClass(classDeclaration));
@NotNull
private final ClassDescriptor descriptor;
private ClassTranslator(@NotNull JetClassOrObject classDeclaration, @NotNull TranslationContext context) {
super(context.newDeclaration(classDeclaration));
this.descriptor = getClassDescriptor(context.bindingContext(), classDeclaration);
this.classDeclaration = classDeclaration;
}
@@ -54,13 +64,23 @@ public final class ClassTranslator extends AbstractTranslator {
@NotNull
private JsInvocation classCreateMethodInvocation() {
if (classDeclaration.isTrait()) {
if (isObject()) {
return AstUtil.newInvocation(context().namer().objectCreationMethodReference());
} else if (isTrait()) {
return AstUtil.newInvocation(context().namer().traitCreationMethodReference());
} else {
return AstUtil.newInvocation(context().namer().classCreationMethodReference());
}
}
private boolean isObject() {
return descriptor.getKind().equals(ClassKind.OBJECT);
}
private boolean isTrait() {
return descriptor.getKind().equals(ClassKind.TRAIT);
}
private void addClassOwnDeclarations(@NotNull JsInvocation jsClassDeclaration) {
JsObjectLiteral jsClassDescription = translateClassDeclarations();
jsClassDeclaration.getArguments().add(jsClassDescription);
@@ -75,8 +95,7 @@ public final class ClassTranslator extends AbstractTranslator {
@NotNull
private List<JsExpression> getSuperclassNameReferences() {
List<JsExpression> superclassReferences = new ArrayList<JsExpression>();
List<ClassDescriptor> superclassDescriptors =
BindingUtils.getSuperclassDescriptors(context().bindingContext(), classDeclaration);
List<ClassDescriptor> superclassDescriptors = getSuperclassDescriptors(descriptor);
addAncestorClass(superclassReferences, superclassDescriptors);
addTraits(superclassReferences, superclassDescriptors);
return superclassReferences;
@@ -120,7 +139,7 @@ public final class ClassTranslator extends AbstractTranslator {
@NotNull
private JsObjectLiteral translateClassDeclarations() {
List<JsPropertyInitializer> propertyList = new ArrayList<JsPropertyInitializer>();
if (!classDeclaration.isTrait()) {
if (!isTrait()) {
propertyList.add(Translation.generateClassInitializerMethod(classDeclaration, context()));
}
propertyList.addAll(translatePropertiesAsConstructorParameters());
@@ -131,7 +150,7 @@ public final class ClassTranslator extends AbstractTranslator {
@NotNull
private List<JsPropertyInitializer> translatePropertiesAsConstructorParameters() {
List<JsPropertyInitializer> result = new ArrayList<JsPropertyInitializer>();
for (JetParameter parameter : classDeclaration.getPrimaryConstructorParameters()) {
for (JetParameter parameter : getPrimaryConstructorParameters(classDeclaration)) {
PropertyDescriptor descriptor =
getPropertyDescriptorForConstructorParameter(context().bindingContext(), parameter);
if (descriptor != null) {
translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java
+18 -3
View File
@@ -11,11 +11,11 @@ import org.jetbrains.k2js.translate.general.TranslatorVisitor;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDeclarationsForNamespace;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForObjectDeclaration;
/**
* @author Pavel Talanov
@@ -24,7 +24,7 @@ public final class DeclarationBodyVisitor extends TranslatorVisitor<List<JsPrope
@NotNull
public List<JsPropertyInitializer> traverseClass(@NotNull JetClass jetClass,
public List<JsPropertyInitializer> traverseClass(@NotNull JetClassOrObject jetClass,
@NotNull TranslationContext context) {
List<JsPropertyInitializer> properties = new ArrayList<JsPropertyInitializer>();
for (JetDeclaration declaration : jetClass.getDeclarations()) {
@@ -53,7 +53,7 @@ public final class DeclarationBodyVisitor extends TranslatorVisitor<List<JsPrope
@NotNull
public List<JsPropertyInitializer> visitNamedFunction(@NotNull JetNamedFunction expression,
@NotNull TranslationContext context) {
return Arrays.asList(Translation.functionTranslator(expression, context).translateAsMethod());
return Collections.singletonList(Translation.functionTranslator(expression, context).translateAsMethod());
}
@Override
@@ -65,6 +65,21 @@ public final class DeclarationBodyVisitor extends TranslatorVisitor<List<JsPrope
return PropertyTranslator.translateAccessors(propertyDescriptor, context);
}
@Override
@NotNull
public List<JsPropertyInitializer> visitObjectDeclaration(@NotNull JetObjectDeclaration expression,
@NotNull TranslationContext context) {
return Collections.singletonList(ClassTranslator.translateAsProperty(expression, context));
}
@Override
@NotNull
public List<JsPropertyInitializer> visitObjectDeclarationName(@NotNull JetObjectDeclarationName expression,
@NotNull TranslationContext context) {
PropertyDescriptor propertyDescriptor =
getPropertyDescriptorForObjectDeclaration(context.bindingContext(), expression);
return PropertyTranslator.translateAccessors(propertyDescriptor, context);
}
@Override
@NotNull
translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java
+1 -1
View File
@@ -32,7 +32,7 @@ public final class NamespaceTranslator extends AbstractTranslator {
}
private NamespaceTranslator(@NotNull NamespaceDescriptor namespace, @NotNull TranslationContext context) {
super(context.newNamespace(namespace));
super(context.newDeclaration(namespace));
this.namespace = namespace;
this.namespaceName = context.getNameForDescriptor(namespace);
this.classDeclarationTranslator = new ClassDeclarationTranslator(context(), namespace);
translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+1 -1
View File
@@ -130,7 +130,7 @@ public final class PropertyTranslator extends AbstractTranslator {
@NotNull
private TranslationContext propertyAccessContext(@NotNull PropertySetterDescriptor propertySetterDescriptor) {
return context().newPropertyAccess(propertySetterDescriptor);
return context().newDeclaration(propertySetterDescriptor);
}
@NotNull
translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+22
View File
@@ -11,6 +11,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.constants.NullValue;
import org.jetbrains.k2js.translate.context.TemporaryVariable;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.declaration.ClassTranslator;
import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.general.TranslatorVisitor;
import org.jetbrains.k2js.translate.operation.BinaryOperationTranslator;
@@ -369,4 +370,25 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
assert thrownExpression != null : "Thrown expression must not be null";
return new JsThrow(translateAsExpression(thrownExpression, context));
}
@Override
@NotNull
public JsNode visitObjectLiteralExpression(@NotNull JetObjectLiteralExpression expression,
@NotNull TranslationContext context) {
return ClassTranslator.generateClassCreationExpression(expression.getObjectDeclaration(), context);
}
@Override
@NotNull
public JsNode visitObjectDeclaration(@NotNull JetObjectDeclaration expression,
@NotNull TranslationContext context) {
//TODO: util
JetObjectDeclarationName nameAsDeclaration = expression.getNameAsDeclaration();
assert nameAsDeclaration != null;
DeclarationDescriptor descriptor = getDescriptorForElement(context.bindingContext(),
nameAsDeclaration);
JsName propertyName = context.getNameForDescriptor(descriptor);
JsExpression value = ClassTranslator.generateClassCreationExpression(expression, context);
return AstUtil.newVar(propertyName, value);
}
}
translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+2 -7
View File
@@ -156,16 +156,11 @@ public final class FunctionTranslator extends AbstractTranslator {
@NotNull
private TranslationContext functionBodyContext() {
if (functionDeclaration instanceof JetNamedFunction) {
return context().newFunctionDeclaration((JetNamedFunction) functionDeclaration);
}
if (functionDeclaration instanceof JetPropertyAccessor) {
return context().newPropertyAccess((JetPropertyAccessor) functionDeclaration);
}
if (isLiteral()) {
return context().innerJsScope(functionObject.getScope());
} else {
return context().newDeclaration(functionDeclaration);
}
throw new AssertionError("Unsupported type of functionDeclaration.");
}
@NotNull
translator/src/org/jetbrains/k2js/translate/general/Translation.java
+2 -2
View File
@@ -46,7 +46,7 @@ public final class Translation {
@NotNull
public static JsInvocation translateClassDeclaration(@NotNull JetClass classDeclaration,
@NotNull TranslationContext context) {
return ClassTranslator.translateClass(classDeclaration, context);
return ClassTranslator.generateClassCreationExpression(classDeclaration, context);
}
@NotNull
@@ -79,7 +79,7 @@ public final class Translation {
//TODO: see if generate*Initializer methods fit somewhere else
@NotNull
public static JsPropertyInitializer generateClassInitializerMethod(@NotNull JetClass classDeclaration,
public static JsPropertyInitializer generateClassInitializerMethod(@NotNull JetClassOrObject classDeclaration,
@NotNull TranslationContext context) {
return (new ClassInitializerTranslator(classDeclaration, context)).generateInitializeMethod();
}
translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
+2 -2
View File
@@ -5,7 +5,7 @@ import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer;
import com.google.dart.compiler.backend.js.ast.JsStatement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.NamingScope;
import org.jetbrains.k2js.translate.context.TranslationContext;
@@ -40,7 +40,7 @@ public abstract class AbstractInitializerTranslator extends AbstractTranslator {
}
@NotNull
protected List<JsStatement> translateClassInitializers(@NotNull JetClass declaration) {
protected List<JsStatement> translateClassInitializers(@NotNull JetClassOrObject declaration) {
return visitor.traverseClass(declaration, context());
}
translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
+5 -4
View File
@@ -6,12 +6,13 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetDelegationSpecifier;
import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.utils.PsiUtils;
import org.jetbrains.k2js.translate.utils.TranslationUtils;
import java.util.ArrayList;
@@ -27,11 +28,11 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.functionWithSc
public final class ClassInitializerTranslator extends AbstractInitializerTranslator {
@NotNull
private final JetClass classDeclaration;
private final JetClassOrObject classDeclaration;
@NotNull
private final List<JsStatement> initializerStatements = new ArrayList<JsStatement>();
public ClassInitializerTranslator(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
public ClassInitializerTranslator(@NotNull JetClassOrObject classDeclaration, @NotNull TranslationContext context) {
super(context.getScopeForElement(classDeclaration).innerScope
("initializer " + classDeclaration.getName()), context);
this.classDeclaration = classDeclaration;
@@ -91,7 +92,7 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
@NotNull
List<JsParameter> translatePrimaryConstructorParameters() {
List<JetParameter> parameterList = classDeclaration.getPrimaryConstructorParameters();
List<JetParameter> parameterList = PsiUtils.getPrimaryConstructorParameters(classDeclaration);
List<JsParameter> result = new ArrayList<JsParameter>();
for (JetParameter jetParameter : parameterList) {
result.add(translateParameter(jetParameter));
translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java
+23 -2
View File
@@ -1,12 +1,15 @@
package org.jetbrains.k2js.translate.initializer;
import com.google.dart.compiler.backend.js.ast.JsExpression;
import com.google.dart.compiler.backend.js.ast.JsInvocation;
import com.google.dart.compiler.backend.js.ast.JsName;
import com.google.dart.compiler.backend.js.ast.JsStatement;
import org.jetbrains.annotations.NotNull;
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.context.TranslationContext;
import org.jetbrains.k2js.translate.declaration.ClassTranslator;
import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.general.TranslatorVisitor;
import org.jetbrains.k2js.translate.utils.BindingUtils;
@@ -14,9 +17,13 @@ import org.jetbrains.k2js.translate.utils.TranslationUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static java.util.Collections.singletonList;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDeclarationsForNamespace;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForObjectDeclaration;
import static org.jetbrains.k2js.translate.utils.PsiUtils.getObjectDeclarationForName;
/**
* @author Pavel Talanov
@@ -43,6 +50,7 @@ public final class InitializerVisitor extends TranslatorVisitor<List<JsStatement
return assignmentToBackingField(property, initExpression, context);
}
//TODO:
@NotNull
JsStatement assignmentToBackingField(@NotNull JetProperty property, @NotNull JsExpression initExpression,
@NotNull TranslationContext context) {
@@ -62,11 +70,24 @@ public final class InitializerVisitor extends TranslatorVisitor<List<JsStatement
@NotNull
// Not interested in other types of declarations, they do not contain initializers.
public List<JsStatement> visitDeclaration(@NotNull JetDeclaration expression, @NotNull TranslationContext context) {
return new ArrayList<JsStatement>();
return Collections.emptyList();
}
@Override
@NotNull
public List<JsStatement> visitObjectDeclarationName(@NotNull JetObjectDeclarationName objectName,
@NotNull TranslationContext context) {
PropertyDescriptor propertyDescriptorForObjectDeclaration
= getPropertyDescriptorForObjectDeclaration(context.bindingContext(), objectName);
JsName objectPropertyName = context.getNameForDescriptor(propertyDescriptorForObjectDeclaration);
JetObjectDeclaration objectDeclaration = getObjectDeclarationForName(objectName);
JsInvocation objectValue = ClassTranslator.generateClassCreationExpression(objectDeclaration, context);
return singletonList(TranslationUtils.assignmentToBackingField(context,
propertyDescriptorForObjectDeclaration, objectValue));
}
@NotNull
public List<JsStatement> traverseClass(@NotNull JetClass expression, @NotNull TranslationContext context) {
public List<JsStatement> traverseClass(@NotNull JetClassOrObject expression, @NotNull TranslationContext context) {
List<JsStatement> initializerStatements = new ArrayList<JsStatement>();
for (JetDeclaration declaration : expression.getDeclarations()) {
initializerStatements.addAll(declaration.accept(this, context));
translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
+14 -11
View File
@@ -41,7 +41,8 @@ public final class BindingUtils {
}
@NotNull
public static ClassDescriptor getClassDescriptor(@NotNull BindingContext context, @NotNull JetClass declaration) {
public static ClassDescriptor getClassDescriptor(@NotNull BindingContext context,
@NotNull JetClassOrObject declaration) {
return getDescriptorForExpression(context, declaration, ClassDescriptor.class);
}
@@ -113,13 +114,6 @@ public final class BindingUtils {
return (JetParameter) result;
}
@NotNull
public static List<ClassDescriptor> getSuperclassDescriptors(@NotNull BindingContext context,
@NotNull JetClass classDeclaration) {
ClassDescriptor classDescriptor = getClassDescriptor(context, classDeclaration);
return getSuperclassDescriptors(classDescriptor);
}
@NotNull
public static List<ClassDescriptor> getSuperclassDescriptors(@NotNull ClassDescriptor classDescriptor) {
Collection<? extends JetType> superclassTypes = classDescriptor.getTypeConstructor().getSupertypes();
@@ -142,8 +136,9 @@ public final class BindingUtils {
return (ClassDescriptor) superClassDescriptor;
}
public static boolean hasAncestorClass(@NotNull BindingContext context, @NotNull JetClass classDeclaration) {
List<ClassDescriptor> superclassDescriptors = getSuperclassDescriptors(context, classDeclaration);
public static boolean hasAncestorClass(@NotNull BindingContext context, @NotNull JetClassOrObject classDeclaration) {
ClassDescriptor classDescriptor = getClassDescriptor(context, classDeclaration);
List<ClassDescriptor> superclassDescriptors = getSuperclassDescriptors(classDescriptor);
return (DescriptorUtils.findAncestorClass(superclassDescriptors) != null);
}
@@ -264,7 +259,7 @@ public final class BindingUtils {
@NotNull
public static DeclarationDescriptor getDescriptorForElement(@NotNull BindingContext context,
@NotNull JetElement element) {
@NotNull PsiElement element) {
DeclarationDescriptor descriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
assert descriptor != null : element + " doesn't have a descriptor.";
return descriptor;
@@ -312,4 +307,12 @@ public final class BindingUtils {
assert hasNextDescriptor != null : "Range expression must have a descriptor for hasNext function or property.";
return hasNextDescriptor;
}
@NotNull
public static PropertyDescriptor getPropertyDescriptorForObjectDeclaration(@NotNull BindingContext context,
@NotNull JetObjectDeclarationName name) {
PropertyDescriptor propertyDescriptor = context.get(BindingContext.OBJECT_DECLARATION, name);
assert propertyDescriptor != null;
return propertyDescriptor;
}
}
translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
+21
View File
@@ -1,5 +1,6 @@
package org.jetbrains.k2js.translate.utils;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -7,6 +8,9 @@ import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
import java.util.Collections;
import java.util.List;
/**
* @author Pavel Talanov
*/
@@ -97,4 +101,21 @@ public final class PsiUtils {
assert loopParameter != null;
return loopParameter;
}
@NotNull
public static List<JetParameter> getPrimaryConstructorParameters(@NotNull JetClassOrObject classDeclaration) {
if (classDeclaration instanceof JetClass) {
return ((JetClass) classDeclaration).getPrimaryConstructorParameters();
}
return Collections.emptyList();
}
@NotNull
public static JetObjectDeclaration getObjectDeclarationForName(@NotNull JetObjectDeclarationName name) {
PsiElement parent = name.getParent();
assert parent instanceof JetObjectDeclaration :
"ObjectDeclarationName should have a parent of type ObjectDeclaration.";
return (JetObjectDeclaration) parent;
}
}
translator/test/org/jetbrains/k2js/test/ObjectTest.java
+11 -1
View File
@@ -5,7 +5,7 @@ import org.junit.Test;
/**
* @author Pavel Talanov
*/
public class ObjectTest extends TranslationTest {
public final class ObjectTest extends TranslationTest {
private static final String MAIN = "object/";
@@ -18,4 +18,14 @@ public class ObjectTest extends TranslationTest {
public void objectWithMethods() throws Exception {
testFooBoxIsTrue("objectWithMethods.kt");
}
@Test
public void objectDeclaration() throws Exception {
testFooBoxIsTrue("objectDeclaration.kt");
}
@Test
public void objectInMethod() throws Exception {
testFooBoxIsTrue("objectInMethod.kt");
}
}
translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
+4 -4
View File
@@ -21,10 +21,10 @@ public final class WebDemoExamples2Test extends TranslationTest {
}
//TODO: a couple of classes not supported and objects
// @Test
// public void life() throws Exception {
// testWithMain("life", "", "2");
// }
@Test
public void life() throws Exception {
testWithMain("life", "", "2");
}
@Test
public void builder() throws Exception {
translator/testFiles/kotlin_lib.js
+5
View File
@@ -252,6 +252,7 @@
Kotlin.Namespace = Namespace;
Kotlin.Trait = Trait;
Kotlin.isType = isType;
Kotlin.object = object;
Kotlin.equals = function (obj1, obj2) {
if (typeof obj1 == "object") {
@@ -499,6 +500,10 @@
}
);
Kotlin.splitString = function(str, regex) {
return str.split(regex);
};
Kotlin.nullArray = function (size) {
var res = [];
var i = size;
translator/testFiles/object/cases/objectDeclaration.kt
+17
View File
@@ -0,0 +1,17 @@
package foo
object test {
var c = 2;
var b = 1;
}
fun box() : Boolean {
if (test.c != 2) return false;
if (test.b != 1) return false;
test.c += 10
if (test.c != 12) {
return false;
}
return true;
}
translator/testFiles/object/cases/objectInMethod.kt
+18
View File
@@ -0,0 +1,18 @@
package foo
class A() {
fun f() : Boolean {
object t {
val c = true;
}
val z = object {
val c = true
}
return t.c && z.c
}
}
fun box() = A().f();
translator/testFiles/webDemoExamples2/cases/life.kt
-10
View File
@@ -154,18 +154,8 @@ fun comparator<T> (f : (T, T) -> Int) : Comparator<T> = object : Comparator<T> {
override fun compare(o1 : T, o2 : T) : Int = f(o1, o2)
}
fun println(message : Any?) {
System.out?.println(message)
}
fun print(message : Any?) {
System.out?.print(message)
}
val <T> Array<T>.isEmpty : Boolean get() = size == 0
fun String.split(s : String) = (this as java.lang.String).split(s)
val String.size : Int
get() = length