kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-expression-evaluator] Fix package name of generated parser

Browse Source
This commit is contained in:
Edwin Jakobs
2024-01-05 15:38:39 +01:00
parent 8245b24bed
commit c69b68c9ec
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
orx-expression-evaluator/build.gradle.kts
View File

@@ -9,15 +9,12 @@ plugins {
val generateKotlinGrammarSource = tasks.register<AntlrKotlinTask>("generateKotlinGrammarSource") { val generateKotlinGrammarSource = tasks.register<AntlrKotlinTask>("generateKotlinGrammarSource") {
dependsOn("cleanGenerateKotlinGrammarSource") 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")) { source = fileTree(layout.projectDirectory.dir("src/commonMain/antlr")) {
include("**/*.g4") include("**/*.g4")
} }
// We want the generated source files to have this package name // 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 packageName = pkgName
// We want visitors alongside listeners. // We want visitors alongside listeners.

6
orx-expression-evaluator/src/commonMain/kotlin/Expressions.kt
View File

@@ -7,9 +7,9 @@ import org.antlr.v4.kotlinruntime.tree.ParseTreeWalker
import org.antlr.v4.kotlinruntime.tree.TerminalNode import org.antlr.v4.kotlinruntime.tree.TerminalNode
import org.openrndr.collections.pop import org.openrndr.collections.pop
import org.openrndr.collections.push import org.openrndr.collections.push
import org.openrndr.expressions.parser.KeyLangLexer import org.openrndr.extra.expressions.parser.KeyLangLexer
import org.openrndr.expressions.parser.KeyLangParser import org.openrndr.extra.expressions.parser.KeyLangParser
import org.openrndr.expressions.parser.KeyLangParserBaseListener import org.openrndr.extra.expressions.parser.KeyLangParserBaseListener
import org.openrndr.extra.noise.uniform import org.openrndr.extra.noise.uniform
import org.openrndr.math.* import org.openrndr.math.*