From b9644c29126c4cb60a530ffd344e7f15c0693b2e Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Wed, 29 Nov 2023 18:00:50 +0100
Subject: [PATCH] Work around antlr configuration

---
 orx-jvm/orx-expression-evaluator/build.gradle.kts      | 10 +---------
 .../src/main/kotlin/Expressions.kt                     |  7 ++++---
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/orx-jvm/orx-expression-evaluator/build.gradle.kts b/orx-jvm/orx-expression-evaluator/build.gradle.kts
index 5f32fb36..cc6efafa 100644
--- a/orx-jvm/orx-expression-evaluator/build.gradle.kts
+++ b/orx-jvm/orx-expression-evaluator/build.gradle.kts
@@ -7,17 +7,9 @@ plugins {
 
 tasks.generateGrammarSource {
     maxHeapSize = "64m"
-    arguments.addAll(listOf("-visitor", "-long-messages", "-package", "org.openrndr.extra.expressions.antlr"))
-    outputDirectory = file("${project.buildDir}/generated-src/antlr/org/openrndr/extra/expressions/antlr")
+    arguments.addAll(listOf("-visitor", "-long-messages"))
 }
 
-sourceSets {
-    main {
-        java {
-            srcDir("build/generated-src/antlr")
-        }
-    }
-}
 
 tasks.withType<KotlinCompile> {
     kotlinOptions.freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
diff --git a/orx-jvm/orx-expression-evaluator/src/main/kotlin/Expressions.kt b/orx-jvm/orx-expression-evaluator/src/main/kotlin/Expressions.kt
index 778780d6..61f60d74 100644
--- a/orx-jvm/orx-expression-evaluator/src/main/kotlin/Expressions.kt
+++ b/orx-jvm/orx-expression-evaluator/src/main/kotlin/Expressions.kt
@@ -1,11 +1,12 @@
 package org.openrndr.extra.expressions
 
+import KeyLangLexer
+import KeyLangParser
+import KeyLangParserBaseListener
 import org.antlr.v4.runtime.*
 import org.antlr.v4.runtime.tree.ParseTreeWalker
 import org.antlr.v4.runtime.tree.TerminalNode
-import org.openrndr.extra.expressions.antlr.KeyLangLexer
-import org.openrndr.extra.expressions.antlr.KeyLangParser
-import org.openrndr.extra.expressions.antlr.KeyLangParserBaseListener
+
 import org.openrndr.extra.noise.uniform
 import org.openrndr.math.*
 import java.util.*