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

JS backend: removed adding '$' to label suffix

Browse Source
This commit is contained in:
Alexey Tsvetkov
2014-10-23 20:07:42 +04:00
parent 78e12f7cfa
commit fb8918bbe6
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
+19 -3
View File
@@ -49,14 +49,30 @@ public class JsFunctionScope(parent: JsScope, description: String) : JsScope(par
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)
val labelName: JsName
{
val freshIdent = when {
ident in RESERVED_WORDS -> getFreshIdent(ident)
parent != null -> parent.getFreshIdent(ident)
else -> ident
}
labelName = JsName(this@JsFunctionScope, freshIdent)
}
override fun findOwnName(name: String): JsName? =
if (name == ident) labelName else null
/**
* Safe call is necessary, because hasOwnName can be called
* in constructor before labelName is initialized (see KT-4394)
*/
[suppress("UNNECESSARY_SAFE_CALL")]
override fun hasOwnName(name: String): Boolean =
name == ident
|| name == labelName.getIdent()
name in RESERVED_WORDS
|| name == ident
|| name == labelName?.getIdent()
|| getParent()?.hasOwnName(name) ?: false
}
js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+1 -1
View File
@@ -364,7 +364,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) {
js/js.translator/testData/labels/cases/labelWithVariableClashing.kt
+2 -2
View File
@@ -1,7 +1,7 @@
package foo
// CHECK_LABELS_COUNT: function=test1 name=loop$ count=1
// CHECK_LABELS_COUNT: function=test2 name=loop$ count=1
// CHECK_LABELS_COUNT: function=test1 name=loop count=1
// CHECK_LABELS_COUNT: function=test2 name=loop count=1
fun test1() {
var `loop$` = 0
js/js.translator/testData/labels/cases/nestedLabels.kt
+2 -2
View File
@@ -1,7 +1,7 @@
package foo
// CHECK_LABELS_COUNT: function=test name=loop$ count=1
// CHECK_LABELS_COUNT: function=test name=loop$_0 count=1
// CHECK_LABELS_COUNT: function=test name=loop count=1
// CHECK_LABELS_COUNT: function=test name=loop_0 count=1
fun test() {
var i = 0
js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt
+3 -3
View File
@@ -1,9 +1,9 @@
package foo
// CHECK_CONTAINS_NO_CALLS: test
// CHECK_LABELS_COUNT: function=test name=loop$ count=1
// CHECK_LABELS_COUNT: function=test name=loop$_0 count=1
// CHECK_LABELS_COUNT: function=test name=loop$_1 count=1
// CHECK_LABELS_COUNT: function=test name=loop count=1
// CHECK_LABELS_COUNT: function=test name=loop_0 count=1
// CHECK_LABELS_COUNT: function=test name=loop_1 count=1
class State() {
public var value: Int = 0
js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt
+3 -3
View File
@@ -1,8 +1,8 @@
package foo
// CHECK_LABELS_COUNT: function=test name=loop$ count=1
// CHECK_LABELS_COUNT: function=test name=loop$_0 count=1
// CHECK_LABELS_COUNT: function=test name=loop$_1 count=1
// CHECK_LABELS_COUNT: function=test name=loop count=1
// CHECK_LABELS_COUNT: function=test name=loop_0 count=1
// CHECK_LABELS_COUNT: function=test name=loop_1 count=1
class State() {
public var value: Int = 0
js/js.translator/testData/labels/cases/siblingLabels.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package foo
// CHECK_LABELS_COUNT: function=test name=loop$ count=2
// CHECK_LABELS_COUNT: function=test name=loop count=2
fun test() {
var i = 0
js/js.translator/testData/labels/cases/siblingLabelsInlined.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package foo
// CHECK_NOT_CALLED: testInline
// CHECK_LABELS_COUNT: function=testNoinline name=loop$ count=2
// CHECK_LABELS_COUNT: function=testNoinline name=loop count=2
inline fun testInline(): Int {
var c = 0
js/js.translator/testData/labels/cases/siblingLabelsInlinedClashing.kt
+2 -2
View File
@@ -1,8 +1,8 @@
package foo
// CHECK_NOT_CALLED: testLabelInline
// CHECK_LABELS_COUNT: function=testLabel name=loop$ count=1
// CHECK_LABELS_COUNT: function=testLabel name=loop$_0 count=2
// CHECK_LABELS_COUNT: function=testLabel name=loop count=1
// CHECK_LABELS_COUNT: function=testLabel name=loop_0 count=2
inline fun testLabelInline(): Int {
var a = 0
js/js.translator/testData/labels/cases/simpleLabel.kt
+2 -2
View File
@@ -1,7 +1,7 @@
package foo
// CHECK_LABELS_COUNT: function=testBreak name=loop$ count=1
// CHECK_LABELS_COUNT: function=testContinue name=loop$ count=1
// CHECK_LABELS_COUNT: function=testBreak name=loop count=1
// CHECK_LABELS_COUNT: function=testContinue name=loop count=1
fun testBreak() {
var i = 0
js/js.translator/testData/labels/cases/simpleLabelInlined.kt
+2 -2
View File
@@ -2,8 +2,8 @@ package foo
// CHECK_NOT_CALLED: testBreak
// CHECK_NOT_CALLED: testContinue
// CHECK_LABELS_COUNT: function=testBreakNoinline name=loop$ count=1
// CHECK_LABELS_COUNT: function=testContinueNoinline name=loop$ count=1
// CHECK_LABELS_COUNT: function=testBreakNoinline name=loop count=1
// CHECK_LABELS_COUNT: function=testContinueNoinline name=loop count=1
inline fun testBreak(): Int {
var i = 0