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

#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
@@ -53,7 +53,6 @@ public abstract class JsScope {
private static final Pattern FRESH_NAME_SUFFIX = Pattern.compile("[\\$_]\\d+$");
public JsScope(JsScope parent, @NotNull String description, @Nullable String scopeId) {
assert (parent != null);
this.scopeId = scopeId;
this.description = description;
this.parent = parent;
@@ -196,7 +195,7 @@ public abstract class JsScope {
* Fresh name for "a0" should still be "a0_0".
*/
@NotNull
private String getFreshIdent(@NotNull String suggestedIdent) {
protected String getFreshIdent(@NotNull String suggestedIdent) {
char sep = '_';
String baseName = suggestedIdent;
int counter = 0;
@@ -16,18 +16,50 @@
package com.google.dart.compiler.backend.js.ast
import java.util.Stack
public fun JsObjectScope(parent: JsScope, description: String): JsObjectScope = JsObjectScope(parent, description, null)
public class JsObjectScope(parent: JsScope, description: String, scopeId: String?) : JsScope(parent, description, scopeId)
public class JsFunctionScope(parent: JsScope, description: String) : JsScope(parent, description, null) {
private val labelScopes = Stack<LabelScope>()
private val topLabelScope: LabelScope?
get() = if (labelScopes.notEmpty) labelScopes.peek() else null
override fun declareName(identifier: String): JsName = super.declareFreshName(identifier)
override fun hasOwnName(name: String): Boolean = RESERVED_WORDS.contains(name) || super.hasOwnName(name)
public fun declareNameUnsafe(identifier: String): JsName = super.declareName(identifier)
public fun enterLabel(label: String): JsName {
val scope = LabelScope(topLabelScope, label)
labelScopes.push(scope)
return scope.labelName
}
public fun exitLabel() {
assert(labelScopes.notEmpty) { "No scope to exit from" }
labelScopes.pop()
}
public fun findLabel(label: String): JsName? =
topLabelScope?.findName(label)
private inner class LabelScope(parent: LabelScope?, val ident: String) : JsScope(parent, "Label scope for $ident", null) {
val labelName = JsName(this@JsFunctionScope, parent?.getFreshIdent(ident) ?: ident)
override fun findOwnName(name: String): JsName? =
if (name == ident) labelName else null
override fun hasOwnName(name: String): Boolean =
name == ident
|| name == labelName.getIdent()
|| getParent()?.hasOwnName(name) ?: false
}
class object {
public val RESERVED_WORDS: Set<String> = setOf(
// keywords