1.3.11 release: more generalization for AmuseLabs key regex.

jpd236 · Nov 6, 2023 · c019286 · c019286
1 parent 7310305
commit c019286
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "com.jeffpdavidson.kotwords"
-version = "1.3.11-SNAPSHOT"
+version = "1.3.11"
 
 repositories {
     mavenCentral()

diff --git a/src/commonMain/kotlin/com/jeffpdavidson/kotwords/formats/PuzzleMe.kt b/src/commonMain/kotlin/com/jeffpdavidson/kotwords/formats/PuzzleMe.kt
@@ -14,8 +14,8 @@ private val PUZZLE_DATA_REGEX = """\bwindow\.(?:puzzleEnv\.)?rawc\s*=\s*'([^']+)
 private val KEY_REGEX = """var [a-zA-Z]+\s*=\s*"([0-9a-f]{7,})"""".toRegex()
 private val KEY_DIGIT_REGEX = """.push\((\d+)\)""".toRegex()
 
-private val KEY_2_ORDER_REGEX = """i=(\d+);i<t.length;i\+=""".toRegex()
-private val KEY_2_DIGIT_REGEX = """t.length\?(\d+)""".toRegex()
+private val KEY_2_ORDER_REGEX = """[a-z]+=(\d+);[a-z]+<[a-z]+.length;[a-z]+\+=""".toRegex()
+private val KEY_2_DIGIT_REGEX = """<[a-z]+.length\?(\d+)""".toRegex()
 
 private val ROWS_REGEX = """Row \d+: """.toRegex(RegexOption.IGNORE_CASE)
 private val BANDS_REGEX = """[^:]*band: """.toRegex(RegexOption.IGNORE_CASE)