bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

libsyntax: fix infinite loop when recursively including modules

Browse source 
Fixes #7276
This commit is contained in:
Philipp Brüschweiler 2013-07-04 19:51:11 +02:00
parent dd4f6bb2a2
commit 3c5cfdf2e7
4 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/parse/mod.rs
View file

@ -44,6 +44,8 @@ pub struct ParseSess {
cm: @codemap::CodeMap, // better be the same as the one in the reader!
next_id: node_id,
span_diagnostic: @span_handler, // better be the same as the one in the reader!
/// Used to determine and report recursive mod inclusions
included_mod_stack: ~[Path],
}
pub fn new_parse_sess(demitter: Option<Emitter>) -> @mut ParseSess {
@ -52,6 +54,7 @@ pub fn new_parse_sess(demitter: Option<Emitter>) -> @mut ParseSess {
cm: cm,
next_id: 1,
span_diagnostic: mk_span_handler(mk_handler(demitter), cm),
included_mod_stack: ~[],
}
}
@ -62,6 +65,7 @@ pub fn new_parse_sess_special_handler(sh: @span_handler,
cm: cm,
next_id: 1,
span_diagnostic: sh,
included_mod_stack: ~[],
}
}