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

Remove some conflicting declarations from test, convert code to new Regex API

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-04-12 02:28:58 +03:00
parent 2ae767a049
commit 43dd23bd4b
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/reservedWords/_commonFiles/helpers.kt
+5 -13
View File
@@ -1,25 +1,17 @@
package foo package foo
import kotlin.text.Regex
fun testRenamed(case: String, f: () -> Unit) = test(case, true, f) fun testRenamed(case: String, f: () -> Unit) = test(case, true, f)
fun testNotRenamed(case: String, f: () -> Unit) = test(case, false, f) fun testNotRenamed(case: String, f: () -> Unit) = test(case, false, f)
native
fun String.replace(r: String, s: String): String = noImpl
native
class RegExp(pattern: String, flag: String)
native
fun String.match(r: RegExp): Array<String> = noImpl
fun test(keyword: String, expectedRenamed: Boolean, f: Any) { fun test(keyword: String, expectedRenamed: Boolean, f: Any) {
val fs = f.toString().replace("while (false)", "") val fs = f.toString().replace("while (false)", "")
val matches = fs.match(RegExp("[\\w$]*$keyword[\\w_$]*", "g")) val matches = Regex("[\\w$]*$keyword[\\w_$]*").matchAll(fs).map { it.value }.toList()
assertNotEquals(null, matches, "matches == null, fs = $fs") assertNotEquals(0, matches.size(), "matches is empty for fs = $fs")
assertNotEquals(0, matches.size, "matches = $matches")
val actual = matches[matches.size -1] val actual = matches.last()
assertTrue(actual.contains(keyword), "'$keyword' not found in '$matches' from '$fs'") assertTrue(actual.contains(keyword), "'$keyword' not found in '$matches' from '$fs'")