strips/pork
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/pork.git synced 2025-11-03 17:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some overqualifications due to IDE renaming.

Browse Source
This commit is contained in:
Alex Zenla
2023-09-04 02:38:09 -07:00
parent 3545aa076f
commit 4aa516f0fb
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/main/kotlin/gay/pizza/pork/frontend/FsContentSource.kt
View File

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

3
frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt
View File

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

4
parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt
View File

@ -198,7 +198,9 @@ class Parser(source: PeekableSource<Token>, val attribution: NodeAttribution) {
expect(TokenType.Func) expect(TokenType.Func)
val name = readSymbolRaw() val name = readSymbolRaw()
expect(TokenType.LeftParentheses) expect(TokenType.LeftParentheses)
val arguments = collect(TokenType.RightParentheses, TokenType.Comma) { readSymbolRaw() } val arguments = collect(TokenType.RightParentheses, TokenType.Comma) {
readSymbolRaw()
}
expect(TokenType.RightParentheses) expect(TokenType.RightParentheses)
FunctionDefinition(modifiers, name, arguments, readBlock()) FunctionDefinition(modifiers, name, arguments, readBlock())
} }

3
tool/src/main/kotlin/gay/pizza/pork/tool/FileTool.kt
View File

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

3
tool/src/main/kotlin/gay/pizza/pork/tool/HighlightCommand.kt
View File

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