From c69b68c9ec35329c174fb16458692eb4e9fb1ef0 Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Fri, 5 Jan 2024 15:38:39 +0100
Subject: [PATCH] [orx-expression-evaluator] Fix package name of generated
 parser

---
 orx-expression-evaluator/build.gradle.kts                   | 5 +----
 .../src/commonMain/kotlin/Expressions.kt                    | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/orx-expression-evaluator/build.gradle.kts b/orx-expression-evaluator/build.gradle.kts
index 4f59af37..77e0bc3a 100644
--- a/orx-expression-evaluator/build.gradle.kts
+++ b/orx-expression-evaluator/build.gradle.kts
@@ -9,15 +9,12 @@ plugins {
 val generateKotlinGrammarSource = tasks.register<AntlrKotlinTask>("generateKotlinGrammarSource") {
     dependsOn("cleanGenerateKotlinGrammarSource")
 
-    // ANTLR .g4 files are under {example-project}/antlr
-    // Only include *.g4 files. This allows tools (e.g., IDE plugins)
-    // to generate temporary files inside the base path
     source = fileTree(layout.projectDirectory.dir("src/commonMain/antlr")) {
         include("**/*.g4")
     }
 
     // We want the generated source files to have this package name
-    val pkgName = "org.openrndr.expressions.parser"
+    val pkgName = "org.openrndr.extra.expressions.parser"
     packageName = pkgName
 
     // We want visitors alongside listeners.
diff --git a/orx-expression-evaluator/src/commonMain/kotlin/Expressions.kt b/orx-expression-evaluator/src/commonMain/kotlin/Expressions.kt
index 2796b703..1a657b3f 100644
--- a/orx-expression-evaluator/src/commonMain/kotlin/Expressions.kt
+++ b/orx-expression-evaluator/src/commonMain/kotlin/Expressions.kt
@@ -7,9 +7,9 @@ import org.antlr.v4.kotlinruntime.tree.ParseTreeWalker
 import org.antlr.v4.kotlinruntime.tree.TerminalNode
 import org.openrndr.collections.pop
 import org.openrndr.collections.push
-import org.openrndr.expressions.parser.KeyLangLexer
-import org.openrndr.expressions.parser.KeyLangParser
-import org.openrndr.expressions.parser.KeyLangParserBaseListener
+import org.openrndr.extra.expressions.parser.KeyLangLexer
+import org.openrndr.extra.expressions.parser.KeyLangParser
+import org.openrndr.extra.expressions.parser.KeyLangParserBaseListener
 
 import org.openrndr.extra.noise.uniform
 import org.openrndr.math.*