From 2452b3c34ca5715921fa977b8946ec233faa82c9 Mon Sep 17 00:00:00 2001
From: Erokhin Stanislav <Stanislav.Erokhin@jetbrains.com>
Date: Thu, 5 Sep 2013 20:17:13 +0400
Subject: [PATCH] JS backend: remove isEcma5() from property initialize

---
 .../translate/declaration/PropertyTranslator.java   | 11 +++--------
 .../translate/initializer/InitializerUtils.java     |  2 +-
 .../jetbrains/k2js/translate/utils/JsAstUtils.java  | 13 ++-----------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
index a15e085c722..13300a58be3 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
@@ -72,7 +72,7 @@ public final class PropertyTranslator extends AbstractTranslator {
 
     private void translate(@NotNull List<JsPropertyInitializer> result) {
         List<JsPropertyInitializer> to;
-        if (context().isEcma5() && !JsDescriptorUtils.isExtension(descriptor)) {
+        if (!JsDescriptorUtils.isExtension(descriptor)) {
             to = new SmartList<JsPropertyInitializer>();
             result.add(new JsPropertyInitializer(context().nameToLiteral(descriptor), new JsObjectLiteral(to, true)));
         }
@@ -205,12 +205,7 @@ public final class PropertyTranslator extends AbstractTranslator {
     @NotNull
     private JsPropertyInitializer generateDefaultAccessor(@NotNull PropertyAccessorDescriptor accessorDescriptor,
             @NotNull JsFunction function) {
-        if (context().isEcma5()) {
-            return TranslationUtils.translateFunctionAsEcma5PropertyDescriptor(function, accessorDescriptor, context());
-        }
-        else {
-            return new JsPropertyInitializer(context().getNameForDescriptor(accessorDescriptor).makeRef(), function);
-        }
+        return TranslationUtils.translateFunctionAsEcma5PropertyDescriptor(function, accessorDescriptor, context());
     }
 
     @NotNull
@@ -221,6 +216,6 @@ public final class PropertyTranslator extends AbstractTranslator {
     @NotNull
     private JsPropertyInitializer translateCustomAccessor(@NotNull JetPropertyAccessor expression) {
         FunctionTranslator translator = Translation.functionTranslator(expression, context());
-        return context().isEcma5() ? translator.translateAsEcma5PropertyDescriptor() : translator.translateAsMethod();
+        return translator.translateAsEcma5PropertyDescriptor();
     }
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java
index 017da9bd05c..abe54a12b13 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java
@@ -53,7 +53,7 @@ public final class InitializerUtils {
             JsExpression value = Translation.translateAsExpression(delegate, context);
             String name = property.getName();
             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;
     }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
index 083da5edc3a..61e24c1032b 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
@@ -228,17 +228,8 @@ public final class JsAstUtils {
     }
 
     @NotNull
-    public static JsStatement defineSimpleProperty(@NotNull String name, @NotNull JsExpression value, @NotNull TranslationContext context) {
-        if (context.isEcma5()) {
-            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);
+    public static JsStatement defineSimpleProperty(@NotNull String name, @NotNull JsExpression value) {
+        return assignment(new JsNameRef(name, JsLiteral.THIS), value).makeStmt();
     }
 
     @NotNull