user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libsyntax: De-@mut ParseSess::included_mod_stack

Browse source
This commit is contained in:
Patrick Walton 2013-12-27 11:51:18 -08:00
parent 08321f1c49
commit f553701da6
2 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ use parse::attr::parser_attr;
use parse::lexer::reader;
use parse::parser::Parser;
use std::cell::RefCell;
use std::io;
use std::io::File;
use std::str;
@ -43,7 +44,7 @@ pub struct ParseSess {
cm: @codemap::CodeMap, // better be the same as the one in the reader!
span_diagnostic: @mut SpanHandler, // better be the same as the one in the reader!
/// Used to determine and report recursive mod inclusions
included_mod_stack: ~[Path],
included_mod_stack: RefCell<~[Path]>,
}
pub fn new_parse_sess(demitter: Option<@Emitter>) -> @mut ParseSess {
@ -51,7 +52,7 @@ pub fn new_parse_sess(demitter: Option<@Emitter>) -> @mut ParseSess {
@mut ParseSess {
cm: cm,
span_diagnostic: mk_span_handler(mk_handler(demitter), cm),
included_mod_stack: ~[],
included_mod_stack: RefCell::new(~[]),
}
}
@ -61,7 +62,7 @@ pub fn new_parse_sess_special_handler(sh: @mut SpanHandler,
@mut ParseSess {
cm: cm,
span_diagnostic: sh,
included_mod_stack: ~[],
included_mod_stack: RefCell::new(~[]),
}
}

38
src/libsyntax/parse/parser.rs
View file

@ -4264,21 +4264,28 @@ impl Parser {
path: Path,
outer_attrs: ~[ast::Attribute],
id_sp: Span) -> (ast::item_, ~[ast::Attribute]) {
let maybe_i = self.sess.included_mod_stack.iter().position(|p| *p == path);
match maybe_i {
Some(i) => {
let stack = &self.sess.included_mod_stack;
let mut err = ~"circular modules: ";
for p in stack.slice(i, stack.len()).iter() {
p.display().with_str(|s| err.push_str(s));
err.push_str(" -> ");
{
let mut included_mod_stack = self.sess
.included_mod_stack
.borrow_mut();
let maybe_i = included_mod_stack.get()
.iter()
.position(|p| *p == path);
match maybe_i {
Some(i) => {
let mut err = ~"circular modules: ";
let len = included_mod_stack.get().len();
for p in included_mod_stack.get().slice(i, len).iter() {
p.display().with_str(|s| err.push_str(s));
err.push_str(" -> ");
}
path.display().with_str(|s| err.push_str(s));
self.span_fatal(id_sp, err);
}
path.display().with_str(|s| err.push_str(s));
self.span_fatal(id_sp, err);
None => ()
}
None => ()
included_mod_stack.get().push(path.clone());
}
self.sess.included_mod_stack.push(path.clone());
let mut p0 =
new_sub_parser_from_file(self.sess,
@ -4289,7 +4296,12 @@ impl Parser {
let mod_attrs = vec::append(outer_attrs, inner);
let first_item_outer_attrs = next;
let m0 = p0.parse_mod_items(token::EOF, first_item_outer_attrs);
self.sess.included_mod_stack.pop();
{
let mut included_mod_stack = self.sess
.included_mod_stack
.borrow_mut();
included_mod_stack.get().pop();
}
return (ast::item_mod(m0), mod_attrs);
}