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

JS backend: restored old label naming strategy

Browse Source
This commit is contained in:
Alexey Tsvetkov
2014-09-30 14:10:00 +04:00
committed by Zalim Bashorov
parent 886ae36e1f
commit f022cd6281
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+4 -2
View File
@@ -291,7 +291,9 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
) {
JetExpression baseExpression = expression.getBaseExpression();
assert baseExpression != null;
JsName name = context.scope().declareName(getReferencedName(expression.getTargetLabel()));
JsScope scope = context.scope();
assert scope instanceof JsFunctionScope: "Labeled statement is unexpected outside of function scope";
JsName name = ((JsFunctionScope) scope).declareNameUnsafe(getReferencedName(expression.getTargetLabel()));
JsStatement baseStatement = Translation.translateAsStatement(baseExpression, context);
return new JsLabel(name, baseStatement).source(expression);
}
@@ -359,7 +361,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
private static String getReferencedName(JetSimpleNameExpression expression) {
return expression.getReferencedName()
.replaceAll("^@", "")
.replaceAll("(?:^`(.*)`$)", "$1");
.replaceAll("(?:^`(.*)`$)", "$1") + "$";
}
private static JsNameRef getTargetLabel(JetExpressionWithLabel expression, TranslationContext context) {