Merge pull request antlr#13 from ftomassetti/adaptforjit

Adaptforjit
KvanTTT · Aug 20, 2018 · 29aa404 · 29aa404
2 parents 943cf4c + 44db804
commit 29aa404
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/antlr-kotlin-gradle-plugin/build.gradle b/antlr-kotlin-gradle-plugin/build.gradle
@@ -27,6 +27,6 @@ repositories {
 dependencies {
     compileOnly gradleApi()
     compileOnly "org.antlr:antlr4:${antlrVersion}@jar"
-    compileOnly "com.strumenta.antlr-kotlin:antlr-kotlin-target:${projectVersion}@jar"
+    compileOnly project(':antlr-kotlin-target')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 }
diff --git a/...-kotlin-runtime-common/src/main/kotlin/org/antlr/v4/kotlinruntime/DefaultErrorStrategy.kt b/...-kotlin-runtime-common/src/main/kotlin/org/antlr/v4/kotlinruntime/DefaultErrorStrategy.kt
@@ -485,11 +485,10 @@ open class DefaultErrorStrategy : ANTLRErrorStrategy {
         }
 
         // even that didn't work; must throw the exception
-        val e: InputMismatchException
-        if (nextTokensContext == null) {
-            e = InputMismatchException(recognizer)
+        val e: InputMismatchException = if (nextTokensContext == null) {
+            InputMismatchException(recognizer)
         } else {
-            e = InputMismatchException(recognizer, nextTokensState, nextTokensContext!!)
+            InputMismatchException(recognizer, nextTokensState, nextTokensContext!!)
         }
 
         throw e