strips/pork
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/pork.git synced 2025-08-02 12:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add AnyOf to the tokenizer

Browse Source
This commit is contained in:
Violet White 2023-09-14 21:25:59 -07:00
parent 7b931327ff
commit e56e815f06
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,7 @@ class Parser(source: TokenSource, attribution: NodeAttribution) :
}
override fun parseImportDeclaration(): ImportDeclaration = guarded {
expect(TokenType.Import, TokenType.Impork, TokenType.PorkLoad)
expect(TokenType.Import)
val form = parseSymbol()
val components = oneAndContinuedBy(TokenType.Dot) {
parseSymbol()

7
parser/src/main/kotlin/gay/pizza/pork/parser/TokenType.kt
View File

@ -55,9 +55,7 @@ enum class TokenType(vararg properties: TokenTypeProperty) {
In(ManyChars("in"), KeywordFamily),
Continue(ManyChars("continue"), KeywordFamily),
Break(ManyChars("break"), KeywordFamily),
Import(ManyChars("import"), KeywordFamily),
Impork(ManyChars("impork"), KeywordFamily),
PorkLoad(ManyChars("porkload"), KeywordFamily),
Import(AnyOf("import", "impork", "porkload"), KeywordFamily),
Export(ManyChars("export"), KeywordFamily),
Func(ManyChars("func"), KeywordFamily),
Native(ManyChars("native"), KeywordFamily),
@ -72,6 +70,8 @@ enum class TokenType(vararg properties: TokenTypeProperty) {
properties.filterIsInstance<Promotion>()
val manyChars: ManyChars? =
properties.filterIsInstance<ManyChars>().singleOrNull()
val anyOf: AnyOf? =
properties.filterIsInstance<AnyOf>().singleOrNull()
val singleChar: SingleChar? =
properties.filterIsInstance<SingleChar>().singleOrNull()
val family: TokenFamily =
@ -83,6 +83,7 @@ enum class TokenType(vararg properties: TokenTypeProperty) {
properties.filterIsInstance<TokenUpgrader>().singleOrNull()
companion object {
val AnyOf = entries.filter { item -> item.anyOf != null }
val ManyChars = entries.filter { item -> item.manyChars != null }
val SingleChars = entries.filter { item -> item.singleChar != null }
val CharConsumers = entries.filter { item ->

9
parser/src/main/kotlin/gay/pizza/pork/parser/TokenTypeProperty.kt
View File

@ -4,6 +4,7 @@ interface TokenTypeProperty {
class SingleChar(val char: Char) : TokenTypeProperty
class Promotion(val nextChar: Char, val type: TokenType) : TokenTypeProperty
class ManyChars(val text: String) : TokenTypeProperty
class AnyOf(vararg val strings: String): TokenTypeProperty
class CharConsumer(val isValid: (Char) -> Boolean) : TokenTypeProperty
class CharIndexConsumer(val isValid: (Char, Int) -> Boolean) : TokenTypeProperty
open class TokenUpgrader(val maybeUpgrade: (Token) -> Token?) : TokenTypeProperty
@ -16,6 +17,14 @@ interface TokenTypeProperty {
break
}
}
if (upgraded == null) {
for(item in TokenType.AnyOf) {
if(item.anyOf != null && item.anyOf.strings.contains(token.text)) {
upgraded = Token(item, token.start, token.text)
break
}
}
}
upgraded
})
}