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

JS backend: remove isEcma5() from property initialize

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-09-05 20:17:13 +04:00
parent 550cf581c4
commit 2452b3c34c
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+3 -8
View File
@@ -72,7 +72,7 @@ public final class PropertyTranslator extends AbstractTranslator {
private void translate(@NotNull List<JsPropertyInitializer> result) { private void translate(@NotNull List<JsPropertyInitializer> result) {
List<JsPropertyInitializer> to; List<JsPropertyInitializer> to;
if (context().isEcma5() && !JsDescriptorUtils.isExtension(descriptor)) { if (!JsDescriptorUtils.isExtension(descriptor)) {
to = new SmartList<JsPropertyInitializer>(); to = new SmartList<JsPropertyInitializer>();
result.add(new JsPropertyInitializer(context().nameToLiteral(descriptor), new JsObjectLiteral(to, true))); result.add(new JsPropertyInitializer(context().nameToLiteral(descriptor), new JsObjectLiteral(to, true)));
} }
@@ -205,12 +205,7 @@ public final class PropertyTranslator extends AbstractTranslator {
@NotNull @NotNull
private JsPropertyInitializer generateDefaultAccessor(@NotNull PropertyAccessorDescriptor accessorDescriptor, private JsPropertyInitializer generateDefaultAccessor(@NotNull PropertyAccessorDescriptor accessorDescriptor,
@NotNull JsFunction function) { @NotNull JsFunction function) {
if (context().isEcma5()) { return TranslationUtils.translateFunctionAsEcma5PropertyDescriptor(function, accessorDescriptor, context());
return TranslationUtils.translateFunctionAsEcma5PropertyDescriptor(function, accessorDescriptor, context());
}
else {
return new JsPropertyInitializer(context().getNameForDescriptor(accessorDescriptor).makeRef(), function);
}
} }
@NotNull @NotNull
@@ -221,6 +216,6 @@ public final class PropertyTranslator extends AbstractTranslator {
@NotNull @NotNull
private JsPropertyInitializer translateCustomAccessor(@NotNull JetPropertyAccessor expression) { private JsPropertyInitializer translateCustomAccessor(@NotNull JetPropertyAccessor expression) {
FunctionTranslator translator = Translation.functionTranslator(expression, context()); FunctionTranslator translator = Translation.functionTranslator(expression, context());
return context().isEcma5() ? translator.translateAsEcma5PropertyDescriptor() : translator.translateAsMethod(); return translator.translateAsEcma5PropertyDescriptor();
} }
} }
js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java
+1 -1
View File
@@ -53,7 +53,7 @@ public final class InitializerUtils {
JsExpression value = Translation.translateAsExpression(delegate, context); JsExpression value = Translation.translateAsExpression(delegate, context);
String name = property.getName(); String name = property.getName();
assert name != null: "Delegate property must have name"; assert name != null: "Delegate property must have name";
return JsAstUtils.defineSimpleProperty(Namer.getDelegateName(name), value, context); return JsAstUtils.defineSimpleProperty(Namer.getDelegateName(name), value);
} }
return null; return null;
} }
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
+2 -11
View File
@@ -228,17 +228,8 @@ public final class JsAstUtils {
} }
@NotNull @NotNull
public static JsStatement defineSimpleProperty(@NotNull String name, @NotNull JsExpression value, @NotNull TranslationContext context) { public static JsStatement defineSimpleProperty(@NotNull String name, @NotNull JsExpression value) {
if (context.isEcma5()) { return assignment(new JsNameRef(name, JsLiteral.THIS), value).makeStmt();
return defineProperty(name, createDataDescriptor(value, false, false), context).makeStmt();
} else {
return assignment(new JsNameRef(name, JsLiteral.THIS), value).makeStmt();
}
}
@NotNull
public static JsObjectLiteral createDataDescriptor(@NotNull JsExpression value) {
return createDataDescriptor(value, false, false);
} }
@NotNull @NotNull