cyclane/wacc_37
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lexer

Browse Source
This commit is contained in:
Gleb Koval 2025-02-01 20:48:49 +00:00
commit 993acddad3
Signed by: cyclane
GPG Key ID: 15E168A8B332382C
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.scalafmt.conf
View File

@ -2,3 +2,4 @@ version = 3.8.6
runner.dialect = scala3 runner.dialect = scala3
binPack.literalsExclude = [] binPack.literalsExclude = []
maxColumn = 100

13
src/main/wacc/lexer.scala
View File

@ -12,22 +12,19 @@ object lexer {
), ),
symbolDesc = SymbolDesc.plain.copy( symbolDesc = SymbolDesc.plain.copy(
hardKeywords = Set( hardKeywords = Set(
"begin", "end", "is", "skip", "if", "then", "else", "fi", "while", "do", "begin", "end", "is", "skip", "if", "then", "else", "fi", "while", "do", "done", "read",
"done", "read", "free", "return", "exit", "print", "println", "true", "free", "return", "exit", "print", "println", "true", "false", "int", "bool", "char",
"false", "int", "bool", "char", "string", "pair", "newpair", "fst", "string", "pair", "newpair", "fst", "snd", "call", "chr", "ord", "len", "null"
"snd", "call", "chr", "ord", "len", "null"
), ),
hardOperators = Set( hardOperators = Set(
"+", "-", "*", "/", "%", ">", "<", ">=", "<=", "==", "!=", "&&", "||", "+", "-", "*", "/", "%", ">", "<", ">=", "<=", "==", "!=", "&&", "||", "!"
"!"
) )
), ),
spaceDesc = SpaceDesc.plain.copy( spaceDesc = SpaceDesc.plain.copy(
lineCommentStart = "#" lineCommentStart = "#"
), ),
textDesc = TextDesc.plain.copy( textDesc = TextDesc.plain.copy(
graphicCharacter = graphicCharacter = Basic(c => c >= ' ' && c != '\\' && c != '\'' && c != '"'),
Basic(c => c >= ' ' && c != '\\' && c != '\'' && c != '"'),
escapeSequences = EscapeDesc.plain.copy( escapeSequences = EscapeDesc.plain.copy(
literals = Set('\\', '"', '\''), literals = Set('\\', '"', '\''),
mapping = Map( mapping = Map(

5
src/test/wacc/examples.scala
View File

@ -5,10 +5,7 @@ import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.Inspectors.forEvery import org.scalatest.Inspectors.forEvery
import parsley.{Success, Failure} import parsley.{Success, Failure}
class ParallelExamplesSpec class ParallelExamplesSpec extends AnyFlatSpec with BeforeAndAfterAll with ParallelTestExecution {
extends AnyFlatSpec
with BeforeAndAfterAll
with ParallelTestExecution {
val files = val files =
allWaccFiles("wacc-examples/valid").map { p => allWaccFiles("wacc-examples/valid").map { p =>
(p.toString, List(0)) (p.toString, List(0))