Split out all code into modules.

README.md

@@ -23,5 +23,5 @@ fn main() {
 ## Usage
 
 ```
-./gradlew -q core:run --args 'run ../examples/fib.pork'
+./gradlew -q tool:run --args 'run ../examples/fib.pork'
 ```

common/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  pork_module
+}

common/src/main/kotlin/gay/pizza/pork/common/IndentPrinter.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.util
+package gay.pizza.pork.common
 
 class IndentPrinter(
   val buffer: StringBuilder = StringBuilder(),

core/src/main/kotlin/gay/pizza/pork/PorkLanguage.kt

@@ -1,3 +0,0 @@
-package gay.pizza.pork
-
-object PorkLanguage

core/src/main/kotlin/gay/pizza/pork/eval/None.kt

@@ -1,3 +0,0 @@
-package gay.pizza.pork.eval
-
-data object None

evaluator/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+  pork_module
+}
+
+dependencies {
+  api(project(":ast"))
+  api(project(":frontend"))
+
+  implementation(project(":common"))
+}

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/Arguments.kt

@@ -1,3 +1,3 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 class Arguments(val values: List<Any>)

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/BlockFunction.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 fun interface BlockFunction {
   fun call(): Any

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/CallableFunction.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 fun interface CallableFunction {
   fun call(arguments: Arguments): Any

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationContext.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 import gay.pizza.pork.ast.CompilationUnit
 import gay.pizza.pork.ast.ImportDeclaration

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationContextProvider.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 interface EvaluationContextProvider {
   fun provideEvaluationContext(path: String): EvaluationContext

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 import gay.pizza.pork.ast.*
 

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/Evaluator.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 import gay.pizza.pork.frontend.World
 

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/None.kt

@@ -0,0 +1,3 @@
+package gay.pizza.pork.evaluator
+
+data object None

evaluator/src/main/kotlin/gay/pizza/pork/evaluator/Scope.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.eval
+package gay.pizza.pork.evaluator
 
 class Scope(val parent: Scope? = null, inherits: List<Scope> = emptyList()) {
   private val inherited = inherits.toMutableList()

frontend/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+  pork_module
+}
+
+dependencies {
+  api(project(":ast"))
+  api(project(":parser"))
+
+  implementation(project(":common"))
+}

frontend/src/main/kotlin/gay/pizza/pork/frontend/ContentSource.kt

@@ -1,6 +1,6 @@
 package gay.pizza.pork.frontend
 
-import gay.pizza.pork.parse.CharSource
+import gay.pizza.pork.parser.CharSource
 
 interface ContentSource {
   fun loadAsCharSource(path: String): CharSource

frontend/src/main/kotlin/gay/pizza/pork/frontend/FsContentSource.kt

@@ -1,13 +1,12 @@
 package gay.pizza.pork.frontend
 
-import gay.pizza.pork.parse.CharSource
+import gay.pizza.pork.parser.StringCharSource
-import gay.pizza.pork.parse.StringCharSource
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.readText
 
 class FsContentSource(val root: Path) : ContentSource {
-  override fun loadAsCharSource(path: String): CharSource =
+  override fun loadAsCharSource(path: String): gay.pizza.pork.parser.CharSource =
     StringCharSource(asFsPath(path).readText())
 
   override fun stableContentIdentity(path: String): String =

frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt

@@ -2,10 +2,9 @@ package gay.pizza.pork.frontend
 
 import gay.pizza.pork.ast.CompilationUnit
 import gay.pizza.pork.ast.ImportDeclaration
-import gay.pizza.pork.parse.DiscardNodeAttribution
+import gay.pizza.pork.parser.Parser
-import gay.pizza.pork.parse.Parser
+import gay.pizza.pork.parser.TokenStreamSource
-import gay.pizza.pork.parse.TokenStreamSource
+import gay.pizza.pork.parser.Tokenizer
-import gay.pizza.pork.parse.Tokenizer
 
 class World(val contentSource: ContentSource) {
   private val units = mutableMapOf<String, CompilationUnit>()
@@ -19,7 +18,7 @@ class World(val contentSource: ContentSource) {
     val charSource = contentSource.loadAsCharSource(path)
     val tokenizer = Tokenizer(charSource)
     val tokenStream = tokenizer.tokenize()
-    val parser = Parser(TokenStreamSource(tokenStream), DiscardNodeAttribution)
+    val parser = Parser(TokenStreamSource(tokenStream), gay.pizza.pork.parser.DiscardNodeAttribution)
     return parser.readCompilationUnit()
   }
 

parser/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+  pork_module
+}
+
+dependencies {
+  api(project(":ast"))
+
+  implementation(project(":common"))
+}

parser/src/main/kotlin/gay/pizza/pork/parser/AnsiHighlightScheme.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 open class AnsiHighlightScheme : HighlightScheme {
   override fun highlight(token: Token): Highlight {
@@ -16,11 +16,16 @@ open class AnsiHighlightScheme : HighlightScheme {
     } else Highlight(token)
   }
 
-  open fun string(): AnsiAttributes = AnsiAttributes("32m")
+  open fun string(): AnsiAttributes =
-  open fun symbol(): AnsiAttributes = AnsiAttributes("33m")
+    AnsiAttributes("32m")
-  open fun operator(): AnsiAttributes = AnsiAttributes("34m")
+  open fun symbol(): AnsiAttributes =
-  open fun keyword(): AnsiAttributes = AnsiAttributes("35m")
+    AnsiAttributes("33m")
-  open fun comment(): AnsiAttributes = AnsiAttributes("37m")
+  open fun operator(): AnsiAttributes =
+    AnsiAttributes("34m")
+  open fun keyword(): AnsiAttributes =
+    AnsiAttributes("35m")
+  open fun comment(): AnsiAttributes =
+    AnsiAttributes("37m")
 
   private fun ansi(attributes: AnsiAttributes, text: String): String =
     "\u001b[${attributes.color}${text}\u001b[0m"

parser/src/main/kotlin/gay/pizza/pork/parser/CharSource.kt

@@ -1,7 +1,8 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 interface CharSource : PeekableSource<Char> {
   companion object {
+    @Suppress("ConstPropertyName")
     const val NullChar = 0.toChar()
   }
 }

parser/src/main/kotlin/gay/pizza/pork/parser/DiscardNodeAttribution.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 import gay.pizza.pork.ast.Node
 

parser/src/main/kotlin/gay/pizza/pork/parser/Highlight.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class Highlight(val token: Token, val text: String? = null) {
   override fun toString(): String = text ?: token.text

parser/src/main/kotlin/gay/pizza/pork/parser/HighlightScheme.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 interface HighlightScheme {
   fun highlight(token: Token): Highlight

parser/src/main/kotlin/gay/pizza/pork/parser/Highlighter.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class Highlighter(val scheme: HighlightScheme) {
   fun highlight(stream: TokenStream): List<Highlight> =

parser/src/main/kotlin/gay/pizza/pork/parser/NodeAttribution.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 import gay.pizza.pork.ast.Node
 

parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt

@@ -1,7 +1,6 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 import gay.pizza.pork.ast.*
-import gay.pizza.pork.util.StringEscape
 
 class Parser(source: PeekableSource<Token>, val attribution: NodeAttribution) {
   private val unsanitizedSource = source

parser/src/main/kotlin/gay/pizza/pork/parser/PeekableSource.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 interface PeekableSource<T> {
   val currentIndex: Int

parser/src/main/kotlin/gay/pizza/pork/parser/Printer.kt

@@ -1,8 +1,7 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 import gay.pizza.pork.ast.*
-import gay.pizza.pork.util.IndentPrinter
+import gay.pizza.pork.common.IndentPrinter
-import gay.pizza.pork.util.StringEscape
 
 class Printer(buffer: StringBuilder) : NodeVisitor<Unit> {
   private val out = IndentPrinter(buffer)

parser/src/main/kotlin/gay/pizza/pork/parser/StringCharSource.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class StringCharSource(val input: String) : CharSource {
   private var index = 0

parser/src/main/kotlin/gay/pizza/pork/parser/StringEscape.kt

@@ -1,8 +1,7 @@
-package gay.pizza.pork.util
+package gay.pizza.pork.parser
 
 object StringEscape {
   fun escape(input: String): String = input.replace("\n", "\\n")
   fun unescape(input: String): String = input.replace("\\n", "\n")
-
   fun unquote(input: String): String = input.substring(1, input.length - 1)
 }

parser/src/main/kotlin/gay/pizza/pork/parser/Token.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class Token(val type: TokenType, val start: Int, val text: String) {
   override fun toString(): String = "$start ${type.name} '${text.replace("\n", "\\n")}'"

parser/src/main/kotlin/gay/pizza/pork/parser/TokenFamily.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 enum class TokenFamily : TokenTypeProperty {
   OperatorFamily,

parser/src/main/kotlin/gay/pizza/pork/parser/TokenNodeAttribution.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 import gay.pizza.pork.ast.NodeCoalescer
 import gay.pizza.pork.ast.Node

parser/src/main/kotlin/gay/pizza/pork/parser/TokenSource.kt

@@ -1,3 +1,3 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 interface TokenSource : PeekableSource<Token>

parser/src/main/kotlin/gay/pizza/pork/parser/TokenStream.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class TokenStream(val tokens: List<Token>) {
   override fun toString(): String = tokens.toString()

parser/src/main/kotlin/gay/pizza/pork/parser/TokenStreamSource.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class TokenStreamSource(val stream: TokenStream) : TokenSource {
   private var index = 0

parser/src/main/kotlin/gay/pizza/pork/parser/TokenType.kt

@@ -1,7 +1,7 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
-import gay.pizza.pork.parse.TokenTypeProperty.*
+import gay.pizza.pork.parser.TokenTypeProperty.*
-import gay.pizza.pork.parse.TokenFamily.*
+import gay.pizza.pork.parser.TokenFamily.*
 
 enum class TokenType(vararg properties: TokenTypeProperty) {
   Symbol(SymbolFamily, CharConsumer { (it in 'a'..'z') || (it in 'A'..'Z') || it == '_' }, KeywordUpgrader),

parser/src/main/kotlin/gay/pizza/pork/parser/TokenTypeProperty.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 interface TokenTypeProperty {
   class SingleChar(val char: Char) : TokenTypeProperty

parser/src/main/kotlin/gay/pizza/pork/parser/Tokenizer.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.parse
+package gay.pizza.pork.parser
 
 class Tokenizer(val source: CharSource) {
   private var tokenStart: Int = 0

settings.gradle.kts

@@ -1,8 +1,12 @@
 rootProject.name = "pork"
 
 include(
+  ":common",
   ":ast",
-  ":core"
+  ":parser",
+  ":frontend",
+  ":evaluator",
+  ":tool"
 )
 
 dependencyResolutionManagement {

tool/build.gradle.kts

@@ -7,18 +7,22 @@ plugins {
 
 dependencies {
   api(project(":ast"))
+  api(project(":parser"))
+  api(project(":frontend"))
+  api(project(":evaluator"))
   implementation(libs.clikt)
+  implementation(project(":common"))
 }
 
 application {
-  mainClass.set("gay.pizza.pork.cli.MainKt")
+  mainClass.set("gay.pizza.pork.tool.MainKt")
 }
 
 graalvmNative {
   binaries {
     named("main") {
       imageName.set("pork")
-      mainClass.set("gay.pizza.pork.cli.MainKt")
+      mainClass.set("gay.pizza.pork.tool.MainKt")
       sharedLibrary.set(false)
     }
   }

tool/src/main/kotlin/gay/pizza/pork/tool/AstCommand.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument

tool/src/main/kotlin/gay/pizza/pork/tool/AttributeCommand.kt

@@ -1,10 +1,10 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
 import gay.pizza.pork.ast.NodeCoalescer
-import gay.pizza.pork.parse.TokenNodeAttribution
+import gay.pizza.pork.parser.TokenNodeAttribution
 
 class AttributeCommand : CliktCommand(help = "Attribute AST", name = "attribute") {
   val path by argument("file").path(mustExist = true, canBeDir = false)

tool/src/main/kotlin/gay/pizza/pork/tool/FileTool.kt

@@ -1,14 +1,13 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import gay.pizza.pork.frontend.ContentSource
 import gay.pizza.pork.frontend.FsContentSource
-import gay.pizza.pork.parse.CharSource
+import gay.pizza.pork.parser.StringCharSource
-import gay.pizza.pork.parse.StringCharSource
 import java.nio.file.Path
 import kotlin.io.path.readText
 
 class FileTool(val path: Path) : Tool() {
-  override fun createCharSource(): CharSource = StringCharSource(path.readText())
+  override fun createCharSource(): gay.pizza.pork.parser.CharSource = StringCharSource(path.readText())
   override fun createContentSource(): ContentSource = FsContentSource(path.parent)
   override fun rootFilePath(): String = path.fileName.toString()
 }

tool/src/main/kotlin/gay/pizza/pork/tool/HighlightCommand.kt

@@ -1,15 +1,14 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
-import gay.pizza.pork.parse.AnsiHighlightScheme
 
 class HighlightCommand : CliktCommand(help = "Syntax Highlighter", name = "highlight") {
   val path by argument("file").path(mustExist = true, canBeDir = false)
 
   override fun run() {
     val tool = FileTool(path)
-    print(tool.highlight(AnsiHighlightScheme()).joinToString(""))
+    print(tool.highlight(gay.pizza.pork.parser.AnsiHighlightScheme()).joinToString(""))
   }
 }

tool/src/main/kotlin/gay/pizza/pork/tool/ReprintCommand.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument

tool/src/main/kotlin/gay/pizza/pork/tool/RootCommand.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.subcommands

tool/src/main/kotlin/gay/pizza/pork/tool/RunCommand.kt

@@ -1,10 +1,10 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
-import gay.pizza.pork.eval.CallableFunction
+import gay.pizza.pork.evaluator.CallableFunction
-import gay.pizza.pork.eval.Scope
+import gay.pizza.pork.evaluator.Scope
 
 class RunCommand : CliktCommand(help = "Run Program", name = "run") {
   val path by argument("file").path(mustExist = true, canBeDir = false)

tool/src/main/kotlin/gay/pizza/pork/tool/TokenizeCommand.kt

@@ -1,4 +1,4 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument

tool/src/main/kotlin/gay/pizza/pork/tool/Tool.kt

@@ -1,12 +1,14 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 import gay.pizza.pork.ast.NodeVisitor
-import gay.pizza.pork.parse.Printer
+import gay.pizza.pork.parser.Printer
 import gay.pizza.pork.ast.CompilationUnit
-import gay.pizza.pork.eval.*
+import gay.pizza.pork.evaluator.Arguments
+import gay.pizza.pork.evaluator.Evaluator
+import gay.pizza.pork.evaluator.Scope
 import gay.pizza.pork.frontend.ContentSource
 import gay.pizza.pork.frontend.World
-import gay.pizza.pork.parse.*
+import gay.pizza.pork.parser.*
 
 abstract class Tool {
   abstract fun createCharSource(): CharSource

tool/src/main/kotlin/gay/pizza/pork/tool/main.kt

@@ -1,3 +1,3 @@
-package gay.pizza.pork.cli
+package gay.pizza.pork.tool
 
 fun main(args: Array<String>) = RootCommand().main(args)