"field": JS translation

This commit is contained in:
Mikhail Glukhikh
2015-09-16 18:34:46 +03:00
parent 094c6cebc3
commit 028e0ec59a
4 changed files with 27 additions and 1 deletions
@@ -98,6 +98,10 @@ public final class PropertyAccessTest extends SingleFileTranslationTest {
checkFooBoxIsOk(); checkFooBoxIsOk();
} }
public void testField() throws Exception {
checkFooBoxIsOk();
}
@Override @Override
@NotNull @NotNull
protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) { protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
@@ -20,6 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable;
import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
@@ -41,6 +42,9 @@ public final class BackingFieldAccessTranslator extends AbstractTranslator imple
public static BackingFieldAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression, public static BackingFieldAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression,
@NotNull TranslationContext context) { @NotNull TranslationContext context) {
DeclarationDescriptor referencedProperty = getDescriptorForReferenceExpression(context.bindingContext(), expression); DeclarationDescriptor referencedProperty = getDescriptorForReferenceExpression(context.bindingContext(), expression);
if (referencedProperty instanceof SyntheticFieldDescriptor) {
referencedProperty = ((SyntheticFieldDescriptor) referencedProperty).getPropertyDescriptor();
}
assert referencedProperty instanceof PropertyDescriptor; assert referencedProperty instanceof PropertyDescriptor;
return new BackingFieldAccessTranslator((PropertyDescriptor) referencedProperty, context); return new BackingFieldAccessTranslator((PropertyDescriptor) referencedProperty, context);
} }
@@ -20,6 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;
@@ -103,7 +104,8 @@ public final class ReferenceTranslator {
public static AccessTranslator getAccessTranslator(@NotNull JetSimpleNameExpression referenceExpression, public static AccessTranslator getAccessTranslator(@NotNull JetSimpleNameExpression referenceExpression,
@Nullable JsExpression receiver, @Nullable JsExpression receiver,
@NotNull TranslationContext context) { @NotNull TranslationContext context) {
if (isBackingFieldReference(referenceExpression)) { if (getDescriptorForReferenceExpression(context.bindingContext(), referenceExpression) instanceof SyntheticFieldDescriptor
|| isBackingFieldReference(referenceExpression)) {
return BackingFieldAccessTranslator.newInstance(referenceExpression, context); return BackingFieldAccessTranslator.newInstance(referenceExpression, context);
} }
if (canBePropertyAccess(referenceExpression, context)) { if (canBePropertyAccess(referenceExpression, context)) {
+16
View File
@@ -0,0 +1,16 @@
package foo
class A {
var a: Int = 0
get() = field + 1
set(arg) {
field = arg
}
}
fun box(): String {
val a = A()
a.a = 1
if (a.a != 2) return "A().a != 2, it: ${a.a}"
return "OK"
}