language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Parse same-line proc bodies

Browse source
This commit is contained in:
Tad Hardesty 2018-02-21 22:37:23 -08:00
parent ae97425d05
commit aa1390ba62
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/dreammaker/parser.rs
View file

@ -432,6 +432,10 @@ impl<I> Parser<I> where
// even when the proc body doesn't parse
let mut body_tt = Vec::new();
require!(self.read_any_tt(&mut body_tt));
while body_tt[0].token != Punct(LBrace) && body_tt[body_tt.len() - 1].token != Punct(Semicolon) {
// read repeatedly until it's a block or ends with a newline
require!(self.read_any_tt(&mut body_tt));
}
let mut subparser = Parser::new(body_tt.iter().cloned().map(Ok));
if subparser.block().is_ok() {
self.procs_good += 1;
@ -450,7 +454,7 @@ impl<I> Parser<I> where
fn tree_entries(&mut self, parent: PathStack, terminator: Token) -> Status<()> {
loop {
let next = self.next(format!("newline or {:?}", terminator))?;
let next = self.next(format!("newline, {}", terminator))?;
if next == terminator || next == Token::Eof {
break
} else if next == Token::Punct(Punctuation::Semicolon) {