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

parser: cleanup code for fixing comma bug

Browse Source
This commit is contained in:
Alex Zenla
2023-09-11 05:20:08 -04:00
parent dbe4e7d5a5
commit d8c0ef43c1
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/count.pork
View File

@ -1,4 +1,4 @@
export let count = 5 let count = 5
export func main() { export func main() {
var x = 1 var x = 1

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

@ -60,11 +60,7 @@ class Parser(source: PeekableSource<Token>, val attribution: NodeAttribution) {
private fun readSymbolCases(): Expression = within { private fun readSymbolCases(): Expression = within {
val symbol = readSymbolRaw() val symbol = readSymbolRaw()
if (next(TokenType.LeftParentheses)) { if (next(TokenType.LeftParentheses)) {
val arguments = collect( val arguments = collect(TokenType.RightParentheses, TokenType.Comma) {
TokenType.RightParentheses,
TokenType.Comma,
forceConsumeExceptLast = true
) {
readExpression() readExpression()
} }
expect(TokenType.RightParentheses) expect(TokenType.RightParentheses)
@ -363,17 +359,14 @@ class Parser(source: PeekableSource<Token>, val attribution: NodeAttribution) {
private fun <T> collect( private fun <T> collect(
peeking: TokenType, peeking: TokenType,
consuming: TokenType? = null, consuming: TokenType? = null,
forceConsumeExceptLast: Boolean = false,
read: () -> T read: () -> T
): List<T> { ): List<T> {
val items = mutableListOf<T>() val items = mutableListOf<T>()
while (!peek(peeking)) { while (!peek(peeking)) {
val item = read() val item = read()
if (consuming != null) { if (consuming != null) {
if (!next(consuming)) { if (!peek(peeking)) {
if (!peek(peeking)) { expect(consuming)
expect(consuming)
}
} }
} }
items.add(item) items.add(item)