Kotlin 1.9.0 support and usage of Kotlin Common Regex implementation

benchmarks/build.gradle.kts

@@ -22,7 +22,7 @@ kotlin {
 
     jvm {
         compilations["main"].apply {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "17"
         }
 
         compilations["test"].defaultSourceSet.dependencies {

build.gradle.kts

@@ -34,11 +34,11 @@ kotlin {
             implementation(kotlin("test-junit"))
         }
         compilations.all {
-            kotlinOptions.jvmTarget = "1.6"
+            kotlinOptions.jvmTarget = "17"
         }
     }
 
-    js(BOTH) {
+    js(IR) {
         browser()
         nodejs()
 

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     // TODO: setup the version in the same way as in the root project once IJ fixes importing of buildSrc
-    kotlin("jvm").version("1.4.21")
+    kotlin("jvm").version("1.9.0")
 }
 
 repositories {

demo/demo-js/build.gradle.kts

@@ -6,7 +6,10 @@ dependencies {
     implementation(rootProject)
 }
 
-kotlin.js().nodejs()
+kotlin.js("IR") {
+    browser()
+    binaries.executable()
+}
 
 var assembleWeb = task<Sync>("assembleWeb") {
     val main by kotlin.js().compilations.getting
@@ -20,7 +23,6 @@ var assembleWeb = task<Sync>("assembleWeb") {
         }
     })
 
-    from(main.compileKotlinTaskProvider.map { it.destinationDir })
     from(kotlin.sourceSets.main.get().resources) { include("*.html") }
     into("${buildDir}/web")
 }

demo/demo-js/src/main/resources/main.html

@@ -13,7 +13,7 @@
 
 <h3>Boolean expression parser</h3>
 
-<label for="expr"></label><input id="expr" value="toBe | !toBe"/>
+<label for="expr"></label><input id="expr" value="a & (b1 -> c1) | a1 & !b | !(a1 -> a2) -> a"/>
 
 <button id="parse">Parse</button>
 

gradle.properties

@@ -1,8 +1,6 @@
 group=com.github.h0tk3y.betterParse
 
 kotlin.code.style=official
-
-kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.mpp.stability.nowarn=true
 
 # Workaround for Bintray treating .sha512 files as artifacts

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/commonMain/kotlin/com/github/h0tk3y/betterParse/lexer/RegexToken.kt

@@ -1,8 +1,13 @@
 package com.github.h0tk3y.betterParse.lexer
 
-public expect class RegexToken : Token {
-    public constructor(name: String?, @Language("RegExp", "", "") patternString: String, ignored: Boolean = false)
-    public constructor(name: String?, regex: Regex, ignored: Boolean = false)
+
+public class RegexToken(name: String?, private val pattern: Regex, ignored: Boolean = false) : Token(name = name, ignored = ignored) {
+
+    public constructor(name: String?, pattern: String, ignored: Boolean = false): this(name, pattern.toRegex(), ignored)
+    override fun match(input: CharSequence, fromIndex: Int): Int {
+        val result = this.pattern.matchAt(input, fromIndex)
+        return result?.range?.count() ?: 0
+    }
 }
 
 public fun regexToken(name: String, @Language("RegExp", "", "") pattern: String, ignore: Boolean = false): RegexToken =

versions.settings.gradle.kts

@@ -3,18 +3,18 @@ package com.github.h0tk3y.betterParse.build
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import kotlin.reflect.full.memberProperties
 
-val kotlinVersion = KotlinPlugin.V1620
+val kotlinVersion = KotlinPlugin.V1900
 
 enum class KotlinPlugin {
-    V1620
+    V1900
 }
 
 val versions = when (kotlinVersion) {
-    KotlinPlugin.V1620 -> Versions(
+    KotlinPlugin.V1900 -> Versions(
         version = "0.4.4",
-        kotlinVersion = "1.6.20",
-        serializationVersion = "1.3.2",
-        benchmarkVersion = "0.4.2"
+        kotlinVersion = "1.9.0",
+        serializationVersion = "1.5.1",
+        benchmarkVersion = "0.4.9"
     )
 }