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

Cleaned up AliasingContext.java

Browse Source
This commit is contained in:
Anton Bannykh
2016-10-31 21:07:29 +03:00
parent 49ea0f5984
commit bb4d8f9223
1 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java
+10 -40
View File
@@ -27,14 +27,15 @@ import java.util.Collections;
import java.util.Map; import java.util.Map;
public class AliasingContext { public class AliasingContext {
@NotNull
public static AliasingContext getCleanContext() { public static AliasingContext getCleanContext() {
return new AliasingContext(null, null, null); return new AliasingContext(null, null, null);
} }
@Nullable @NotNull
private Map<DeclarationDescriptor, JsExpression> aliasesForDescriptors; private final Map<DeclarationDescriptor, JsExpression> aliasesForDescriptors;
@Nullable @NotNull
private final Map<KtExpression, JsExpression> aliasesForExpressions; private final Map<KtExpression, JsExpression> aliasesForExpressions;
@Nullable @Nullable
@@ -46,8 +47,8 @@ public class AliasingContext {
@Nullable Map<KtExpression, JsExpression> aliasesForExpressions @Nullable Map<KtExpression, JsExpression> aliasesForExpressions
) { ) {
this.parent = parent; this.parent = parent;
this.aliasesForDescriptors = aliasesForDescriptors; this.aliasesForDescriptors = aliasesForDescriptors == null ? Collections.<DeclarationDescriptor, JsExpression>emptyMap() : aliasesForDescriptors;
this.aliasesForExpressions = aliasesForExpressions; this.aliasesForExpressions = aliasesForExpressions == null ? Collections.<KtExpression, JsExpression>emptyMap() : aliasesForExpressions;
} }
@NotNull @NotNull
@@ -70,47 +71,16 @@ public class AliasingContext {
return new AliasingContext(this, aliases, null); return new AliasingContext(this, aliases, null);
} }
@Nullable @Nullable
final public JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) { public JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
// these aliases cannot be shared and applicable only in current context // these aliases cannot be shared and applicable only in current context
return getAliasForDescriptor(descriptor, false); JsExpression alias = aliasesForDescriptors.get(descriptor.getOriginal());
} return alias != null || parent == null ? alias : parent.getAliasForDescriptor(descriptor);
@Nullable
protected JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor, boolean fromChild) {
JsExpression alias = aliasesForDescriptors == null ? null : aliasesForDescriptors.get(descriptor.getOriginal());
return alias != null || parent == null ? alias : parent.getAliasForDescriptor(descriptor, true);
} }
@Nullable @Nullable
public JsExpression getAliasForExpression(@NotNull KtExpression element) { public JsExpression getAliasForExpression(@NotNull KtExpression element) {
JsExpression alias = aliasesForExpressions == null ? null : aliasesForExpressions.get(element); JsExpression alias = aliasesForExpressions.get(element);
return alias != null || parent == null ? alias : parent.getAliasForExpression(element); return alias != null || parent == null ? alias : parent.getAliasForExpression(element);
} }
/**
* Usages:
* 1) Local variable captured in closure. If captured in closure, any modification in closure should affect captured variable.
* So, "var count = n" wrapped as "var count = {v: n}". descriptor wil be property descriptor, alias will be JsObjectLiteral
*
* 2) Local named function.
*/
public void registerAlias(@NotNull DeclarationDescriptor descriptor, @NotNull JsExpression alias) {
if (aliasesForDescriptors == null) {
aliasesForDescriptors = Collections.singletonMap(descriptor, alias);
}
else {
if (aliasesForDescriptors.size() == 1) {
Map<DeclarationDescriptor, JsExpression> singletonMap = aliasesForDescriptors;
aliasesForDescriptors = new THashMap<DeclarationDescriptor, JsExpression>();
aliasesForDescriptors.put(singletonMap.keySet().iterator().next(), singletonMap.values().iterator().next());
}
JsExpression prev = aliasesForDescriptors.put(descriptor, alias);
assert prev == null : "Alias for descriptor already registered." +
" Descriptor: " + descriptor +
" prev alias: " + prev +
" new alias: " + alias;
}
}
} }