squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

fix infinite loop in the parser

Browse source 
closes #1866
This commit is contained in:
Aleksey Kladov 2019-09-20 16:53:05 +03:00
parent c733993658
commit d57b993ade
3 changed files with 64 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_parser/src/grammar/items/use_item.rs
View file

@ -3,7 +3,7 @@ use super::*;
pub(super) fn use_item(p: &mut Parser, m: Marker) {
assert!(p.at(T![use]));
p.bump(T![use]);
use_tree(p);
use_tree(p, true);
p.expect(T![;]);
m.complete(p, USE_ITEM);
}
@ -12,7 +12,7 @@ pub(super) fn use_item(p: &mut Parser, m: Marker) {
/// Note that this is called both by `use_item` and `use_tree_list`,
/// so handles both `some::path::{inner::path}` and `inner::path` in
/// `use some::path::{inner::path};`
fn use_tree(p: &mut Parser) {
fn use_tree(p: &mut Parser, top_level: bool) {
let m = p.start();
match p.current() {
// Finish the use_tree for cases of e.g.
@ -101,10 +101,14 @@ fn use_tree(p: &mut Parser) {
}
_ => {
m.abandon(p);
p.err_recover(
"expected one of `*`, `::`, `{`, `self`, `super` or an identifier",
ITEM_RECOVERY_SET,
);
let msg = "expected one of `*`, `::`, `{`, `self`, `super` or an identifier";
if top_level {
p.err_recover(msg, ITEM_RECOVERY_SET);
} else {
// if we are parsing a nested tree, we have to eat a token to
// main balanced `{}`
p.err_and_bump(msg);
}
return;
}
}
@ -116,7 +120,7 @@ pub(crate) fn use_tree_list(p: &mut Parser) {
let m = p.start();
p.bump(T!['{']);
while !p.at(EOF) && !p.at(T!['}']) {
use_tree(p);
use_tree(p, false);
if !p.at(T!['}']) {
p.expect(T![,]);
}

2
crates/ra_syntax/test_data/parser/err/0036_partial_use.rs Normal file
View file

@ -0,0 +1,2 @@
use std::{error::Error;
use std::io;

51
crates/ra_syntax/test_data/parser/err/0036_partial_use.txt Normal file
View file

@ -0,0 +1,51 @@
SOURCE_FILE@[0; 37)
USE_ITEM@[0; 36)
USE_KW@[0; 3) "use"
WHITESPACE@[3; 4) " "
USE_TREE@[4; 36)
PATH@[4; 7)
PATH_SEGMENT@[4; 7)
NAME_REF@[4; 7)
IDENT@[4; 7) "std"
COLONCOLON@[7; 9) "::"
USE_TREE_LIST@[9; 36)
L_CURLY@[9; 10) "{"
USE_TREE@[10; 22)
PATH@[10; 22)
PATH@[10; 15)
PATH_SEGMENT@[10; 15)
NAME_REF@[10; 15)
IDENT@[10; 15) "error"
COLONCOLON@[15; 17) "::"
PATH_SEGMENT@[17; 22)
NAME_REF@[17; 22)
IDENT@[17; 22) "Error"
ERROR@[22; 23)
SEMI@[22; 23) ";"
WHITESPACE@[23; 24) "\n"
ERROR@[24; 27)
USE_KW@[24; 27) "use"
WHITESPACE@[27; 28) " "
USE_TREE@[28; 35)
PATH@[28; 35)
PATH@[28; 31)
PATH_SEGMENT@[28; 31)
NAME_REF@[28; 31)
IDENT@[28; 31) "std"
COLONCOLON@[31; 33) "::"
PATH_SEGMENT@[33; 35)
NAME_REF@[33; 35)
IDENT@[33; 35) "io"
ERROR@[35; 36)
SEMI@[35; 36) ";"
WHITESPACE@[36; 37) "\n"
error 22: expected COMMA
error 22: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
error 23: expected COMMA
error 24: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
error 27: expected COMMA
error 35: expected COMMA
error 35: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
error 36: expected COMMA
error 36: expected R_CURLY
error 36: expected SEMI