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

JS backend: added support for nested labels with the same name

Browse Source 
#KT-5891 fixed
This commit is contained in:
Alexey Tsvetkov
2014-10-19 05:15:39 +04:00
parent 09c98226c8
commit 1f87bea78f
7 changed files with 107 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+12 -7
View File
@@ -293,9 +293,12 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
assert baseExpression != null;
JsScope scope = context.scope();
assert scope instanceof JsFunctionScope: "Labeled statement is unexpected outside of function scope";
JsName name = ((JsFunctionScope) scope).declareNameUnsafe(getReferencedName(expression.getTargetLabel()));
JsFunctionScope functionScope = (JsFunctionScope) scope;
String labelIdent = getReferencedName(expression.getTargetLabel());
JsName labelName = functionScope.enterLabel(labelIdent);
JsStatement baseStatement = Translation.translateAsStatement(baseExpression, context);
return new JsLabel(name, baseStatement).source(expression);
functionScope.exitLabel();
return new JsLabel(labelName, baseStatement).source(expression);
}
@Override
@@ -369,11 +372,13 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
if (labelElement == null) {
return null;
}
else {
JsName name = context.scope().findName(getReferencedName(labelElement));
assert name != null;
return name.makeRef();
}
String labelIdent = getReferencedName(labelElement);
JsScope scope = context.scope();
assert scope instanceof JsFunctionScope: "Labeled statement is unexpected outside of function scope";
JsName labelName = ((JsFunctionScope) scope).findLabel(labelIdent);
assert labelName != null;
return labelName.makeRef();
}
@Override