Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-07-10 08:28:57 +00:00
Code Issues Projects Releases Wiki Activity

* #40 grammar: don't require EOL after blocks, so .p8 files need not end with that

Browse Source
This commit is contained in:
meisl 2021-06-12 17:52:44 +02:00
parent f2844bdf1a
commit b8117394c0
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compilerAst/src/prog8/parser/ModuleParsing.kt
View File

@ -45,8 +45,6 @@ class ModuleImporter(private val program: Program,
throw ParsingFailedError("No such file: $filePath")
var content = filePath.toFile().readText().replace("\r\n", "\n") // normalize line endings
if(content.last()!='\n')
content+='\n' // grammar requires blocks (and thus module files) to end in an EOL
return importModule(CharStreams.fromString(content), filePath, false)
}

2
parser/antlr/prog8.g4
View File

@ -75,7 +75,7 @@ register: 'A' | 'X' | 'Y' | 'AX' | 'AY' | 'XY' | 'Pc' | 'Pz' | 'Pn' | 'Pv' | 'R0
module : (directive | block | EOL)* EOF ;
block: identifier integerliteral? '{' EOL (block_statement | EOL) * '}' EOL ;
block: identifier integerliteral? '{' EOL (block_statement | EOL) * '}' (EOL | EOF) ;
block_statement: