Cleanup to divide project

marad · Nov 15, 2023 · e23a4cf · e23a4cf
1 parent d93f2df
commit e23a4cf
Show file tree

Hide file tree

Showing 49 changed files with 115 additions and 61 deletions.
diff --git a/build_native.bat b/build_native.bat
@@ -8,11 +8,11 @@ REM %GRAALVM_HOME%\bin\native-image -H:+ReportUnsupportedElementsAtRuntime --mac
 REM call gradlew.bat clean chi-launcher:shadowJar
 call gradlew.bat chi-launcher:shadowJar
 %GRAALVM_HOME%\bin\native-image ^
+    -H:+UnlockExperimentalVMOptions ^
     -H:+ReportUnsupportedElementsAtRuntime ^
     -H:ReflectionConfigurationFiles=native/reflectionconfig.json ^
     -H:DynamicProxyConfigurationFiles=native/proxyconfig.json ^
-    --macro:truffle ^
-    --language:nfi ^
+    --macro:truffle-svm ^
     --no-fallback ^
     --enable-http ^
     --enable-https ^

diff --git a/chi-compiler/build.gradle b/chi-compiler/build.gradle
@@ -3,11 +3,20 @@ plugins {
     id 'application'
     id 'distribution'
     id 'antlr'
+    id 'maven-publish'
 }
 
-group 'gh.marad.chi.core'
+group 'gh.marad.chi'
 version '1.0'
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+        }
+    }
+}
+
 application {
     mainClass = 'gh.marad.chi.MainKt'
 }
@@ -17,7 +26,7 @@ repositories {
 }
 
 dependencies {
-    antlr "org.antlr:antlr4:4.9.3"
+    antlr "org.antlr:antlr4:4.12.0"
     implementation 'org.jgrapht:jgrapht-core:1.5.1'
     testImplementation 'io.kotest:kotest-runner-junit5:5.0.0.M3'
     testImplementation("org.junit.jupiter:junit-jupiter")
@@ -28,14 +37,19 @@ test {
 }
 
 generateGrammarSource {
-    arguments += ["-visitor", "-no-listener"]
+    arguments += ["-visitor", "-no-listener", "-package", "gh.marad.chi.core.antlr"]
+    outputDirectory = new File("src/main/java/gh/marad/chi/core/antlr")
 }
 
-compileKotlin {
-    dependsOn tasks.named("generateGrammarSource")
+compileJava {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileKotlin {
+    dependsOn(generateGrammarSource)
     targetCompatibility = JavaVersion.VERSION_17
+}
+
+compileTestKotlin {
+    dependsOn(generateTestGrammarSource)
 }
diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/Exceptions.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/Exceptions.kt
@@ -1,10 +1,10 @@
 package gh.marad.chi.core
 
-import ChiLexer
 import gh.marad.chi.core.analyzer.CodePoint
 import gh.marad.chi.core.analyzer.InvalidImport
 import gh.marad.chi.core.analyzer.Message
 import gh.marad.chi.core.analyzer.SyntaxError
+import gh.marad.chi.core.antlr.ChiLexer
 import org.antlr.v4.runtime.BaseErrorListener
 import org.antlr.v4.runtime.IntStream
 import org.antlr.v4.runtime.RecognitionException

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/Parser.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/Parser.kt
@@ -1,8 +1,8 @@
 package gh.marad.chi.core
 
-import ChiLexer
-import ChiParser
 import gh.marad.chi.core.analyzer.Message
+import gh.marad.chi.core.antlr.ChiLexer
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.expressionast.generateExpressionsFromParsedProgram
 import gh.marad.chi.core.namespace.GlobalCompilationNamespace
 import gh.marad.chi.core.parser.ChiSource

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/ParserVisitor.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/ParserVisitor.kt
@@ -1,7 +1,7 @@
 package gh.marad.chi.core.parser
 
-import ChiParser
-import ChiParserBaseVisitor
+import gh.marad.chi.core.antlr.ChiParser
+import gh.marad.chi.core.antlr.ChiParserBaseVisitor
 import gh.marad.chi.core.parser.readers.*
 import org.antlr.v4.runtime.tree.TerminalNode
 

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/ArithmeticLogicReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/ArithmeticLogicReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/AtomReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/AtomReader.kt
@@ -1,8 +1,7 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiLexer
-import ChiParser
-import ChiParser.StringPartContext
+import gh.marad.chi.core.antlr.ChiLexer
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection
@@ -37,7 +36,7 @@ internal object AtomReader {
         val parts = mutableListOf<StringPart>()
         var currentSection: ChiSource.Section? = null
 
-        fun updateSection(ctx: StringPartContext) {
+        fun updateSection(ctx: ChiParser.StringPartContext) {
             val lastSection = currentSection
             val section = getSection(source, ctx)
             currentSection =

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/BlockReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/BlockReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/CastReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/CastReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/CommonReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/CommonReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/EffectReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/EffectReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/FieldOperatorReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/FieldOperatorReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/FuncReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/FuncReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/GroupReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/GroupReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/IfElseReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/IfElseReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/ImportReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/ImportReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.getSection
 import gh.marad.chi.core.parser.readers.CommonReader.readModuleName

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/IsReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/IsReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/NameDeclarationReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/NameDeclarationReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/OpEqualReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/OpEqualReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/PackageReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/PackageReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.getSection
 

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/ProgramReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/ProgramReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/TypeReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/TypeReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/VariableReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/VariableReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/VariantTypeDefinitionReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/VariantTypeDefinitionReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/WeaveReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/WeaveReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/WhenReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/WhenReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/WhileReader.kt b/chi-compiler/src/main/kotlin/gh/marad/chi/core/parser/readers/WhileReader.kt
@@ -1,6 +1,6 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiParser
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import gh.marad.chi.core.parser.getSection

diff --git a/chi-compiler/src/test/kotlin/gh/marad/chi/core/parser/ParserTestUtils.kt b/chi-compiler/src/test/kotlin/gh/marad/chi/core/parser/ParserTestUtils.kt
@@ -1,7 +1,7 @@
 package gh.marad.chi.core.parser
 
-import ChiLexer
-import ChiParser
+import gh.marad.chi.core.antlr.ChiLexer
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.readers.*
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeTypeOf

diff --git a/chi-compiler/src/test/kotlin/gh/marad/chi/core/parser/readers/ProgramReaderTest.kt b/chi-compiler/src/test/kotlin/gh/marad/chi/core/parser/readers/ProgramReaderTest.kt
@@ -1,7 +1,7 @@
 package gh.marad.chi.core.parser.readers
 
-import ChiLexer
-import ChiParser
+import gh.marad.chi.core.antlr.ChiLexer
+import gh.marad.chi.core.antlr.ChiParser
 import gh.marad.chi.core.parser.ChiSource
 import gh.marad.chi.core.parser.ParserVisitor
 import io.kotest.matchers.collections.shouldBeEmpty

diff --git a/chi-launcher/build.gradle b/chi-launcher/build.gradle
@@ -15,7 +15,8 @@ applicationDefaultJvmArgs = ["-Dgraalvm.locatorDisabled=true"]
 
 dependencies {
     implementation project(':chi-truffle-language')
-    implementation 'org.graalvm.tools:profiler:22.1.0'
+//    implementation 'org.graalvm.truffle:truffle-api:'
+    implementation 'org.graalvm.tools:profiler:23.0.2'
     implementation 'org.pcollections:pcollections:4.0.1'
 }
 

diff --git a/chi-truffle-language/build.gradle b/chi-truffle-language/build.gradle
@@ -13,12 +13,12 @@ version '1.0'
 
 dependencies {
     implementation project(':chi-compiler')
-    implementation 'org.graalvm.sdk:graal-sdk:22.1.0'
-    implementation 'org.graalvm.truffle:truffle-api:22.1.0'
-    annotationProcessor 'org.graalvm.truffle:truffle-dsl-processor:22.1.0'
-    testAnnotationProcessor 'org.graalvm.truffle:truffle-dsl-processor:22.1.0'
+    //implementation 'org.graalvm.sdk:graal-sdk:23.1.1'
+    implementation 'org.graalvm.truffle:truffle-api:23.1.1'
+    annotationProcessor 'org.graalvm.truffle:truffle-dsl-processor:23.1.1'
+    testAnnotationProcessor 'org.graalvm.truffle:truffle-dsl-processor:23.1.1'
     testImplementation 'junit:junit:4.13.2'
-    implementation 'org.graalvm.tools:profiler:22.1.0'
+    implementation 'org.graalvm.tools:profiler:23.0.1'
 
 }