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

JS backend: added @lends annotation for namespace members (ecma5 only)

Browse Source 
(cherry picked from commit 9ae9a60)
This commit is contained in:
develar
2013-08-14 14:56:41 +04:00
committed by Zalim Bashorov
parent 39a135c824
commit 0daf2c6a79
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java
+6 -4
View File
@@ -34,7 +34,6 @@ import org.jetbrains.k2js.translate.initializer.InitializerVisitor;
import org.jetbrains.k2js.translate.utils.AnnotationsUtils; import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
import org.jetbrains.k2js.translate.utils.BindingUtils; import org.jetbrains.k2js.translate.utils.BindingUtils;
import org.jetbrains.k2js.translate.utils.JsAstUtils; import org.jetbrains.k2js.translate.utils.JsAstUtils;
import org.jetbrains.k2js.translate.utils.TranslationUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -45,6 +44,7 @@ import static org.jetbrains.k2js.translate.expression.LiteralFunctionTranslator.
import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForDelegate; import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForDelegate;
import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForProperty; import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForProperty;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor; import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor;
import static org.jetbrains.k2js.translate.utils.TranslationUtils.getQualifiedReference;
final class NamespaceTranslator extends AbstractTranslator { final class NamespaceTranslator extends AbstractTranslator {
@NotNull @NotNull
@@ -74,7 +74,7 @@ final class NamespaceTranslator extends AbstractTranslator {
defineInvocation = createDefinitionPlace(null, descriptorToDefineInvocation); defineInvocation = createDefinitionPlace(null, descriptorToDefineInvocation);
} }
return createPlace(getListFromPlace(defineInvocation), TranslationUtils.getQualifiedReference(context(), descriptor)); return createPlace(getListFromPlace(defineInvocation), getQualifiedReference(context(), descriptor));
} }
}; };
} }
@@ -107,7 +107,7 @@ final class NamespaceTranslator extends AbstractTranslator {
initializer = visitor.initializer; initializer = visitor.initializer;
if (!context().isEcma5()) { if (!context().isEcma5()) {
initializers.add(new JsInvocation(new JsNameRef("call", initializer), initializers.add(new JsInvocation(new JsNameRef("call", initializer),
TranslationUtils.getQualifiedReference(context(), descriptor)).makeStmt()); getQualifiedReference(context(), descriptor)).makeStmt());
} }
} }
@@ -135,7 +135,9 @@ final class NamespaceTranslator extends AbstractTranslator {
private List<JsExpression> createDefineInvocation(@Nullable JsExpression initializer, @NotNull JsObjectLiteral members) { private List<JsExpression> createDefineInvocation(@Nullable JsExpression initializer, @NotNull JsObjectLiteral members) {
if (context().isEcma5()) { if (context().isEcma5()) {
return Arrays.asList(initializer == null ? JsLiteral.NULL : initializer, members); return Arrays.asList(initializer == null ? JsLiteral.NULL : initializer,
new JsDocComment("lends", getQualifiedReference(context(), descriptor)),
members);
} }
else { else {
return Collections.<JsExpression>singletonList(members); return Collections.<JsExpression>singletonList(members);