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

KJS: fix non-local return inside catch block

Browse Source
This commit is contained in:
Zalim Bashorov
2017-03-20 21:10:39 +03:00
parent 29e7bcce65
commit c021af0fef
9 changed files with 162 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt
+5 -6
View File
@@ -17,8 +17,7 @@
package com.google.gwt.dev.js
import org.jetbrains.kotlin.js.backend.ast.*
import java.util.Stack
import java.util.*
class ScopeContext(scope: JsScope) {
private val rootScope = generateSequence(scope) { it.parent }.first { it is JsRootScope }
@@ -35,7 +34,7 @@ class ScopeContext(scope: JsScope) {
}
fun exitFunction() {
assert(currentScope is JsFunctionScope)
assert(currentScope is JsDeclarationScope)
exitScope()
}
@@ -51,13 +50,13 @@ class ScopeContext(scope: JsScope) {
}
fun enterLabel(ident: String): JsName =
(currentScope as JsFunctionScope).enterLabel(ident)
(currentScope as JsDeclarationScope).enterLabel(ident)
fun exitLabel() =
(currentScope as JsFunctionScope).exitLabel()
(currentScope as JsDeclarationScope).exitLabel()
fun labelFor(ident: String): JsName? =
(currentScope as JsFunctionScope).findLabel(ident)
(currentScope as JsDeclarationScope).findLabel(ident)
fun globalNameFor(ident: String): JsName =
currentScope.findName(ident) ?: rootScope.declareName(ident)