nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 19:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

extract parse_mod

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2020-03-07 20:19:52 +01:00
parent 803de3188c
commit 7108b7fbfe
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/librustc_parse/parser/module.rs
View File

@ -31,14 +31,10 @@ impl<'a> Parser<'a> {
/// Parses a source module as a crate. This is the main entry point for the parser. /// Parses a source module as a crate. This is the main entry point for the parser.
pub fn parse_crate_mod(&mut self) -> PResult<'a, Crate> { pub fn parse_crate_mod(&mut self) -> PResult<'a, Crate> {
let lo = self.token.span; let lo = self.token.span;
let krate = Ok(ast::Crate { let (module, attrs) = self.parse_mod(&token::Eof)?;
attrs: self.parse_inner_attributes()?, let span = lo.to(self.token.span);
module: self.parse_mod_items(&token::Eof, lo)?, let proc_macros = Vec::new(); // Filled in by `proc_macro_harness::inject()`.
span: lo.to(self.token.span), Ok(ast::Crate { attrs, module, span, proc_macros })
// Filled in by proc_macro_harness::inject()
proc_macros: Vec::new(),
});
krate
} }
/// Parses a `mod <foo> { ... }` or `mod <foo>;` item. /// Parses a `mod <foo> { ... }` or `mod <foo>;` item.
@ -60,17 +56,23 @@ impl<'a> Parser<'a> {
self.push_directory(id, &attrs); self.push_directory(id, &attrs);
self.expect(&token::OpenDelim(token::Brace))?; self.expect(&token::OpenDelim(token::Brace))?;
let mod_inner_lo = self.token.span; let module = self.parse_mod(&token::CloseDelim(token::Brace))?;
let inner_attrs = self.parse_inner_attributes()?;
let module = self.parse_mod_items(&token::CloseDelim(token::Brace), mod_inner_lo)?;
self.directory = old_directory; self.directory = old_directory;
(module, inner_attrs) module
}; };
attrs.append(&mut inner_attrs); attrs.append(&mut inner_attrs);
Ok((id, ItemKind::Mod(module))) Ok((id, ItemKind::Mod(module)))
} }
/// Parses the contents of a module (inner attributes followed by module items).
fn parse_mod(&mut self, term: &TokenKind) -> PResult<'a, (Mod, Vec<Attribute>)> {
let lo = self.token.span;
let attrs = self.parse_inner_attributes()?;
let module = self.parse_mod_items(term, lo)?;
Ok((module, attrs))
}
/// Given a termination token, parses all of the items in a module. /// Given a termination token, parses all of the items in a module.
fn parse_mod_items(&mut self, term: &TokenKind, inner_lo: Span) -> PResult<'a, Mod> { fn parse_mod_items(&mut self, term: &TokenKind, inner_lo: Span) -> PResult<'a, Mod> {
let mut items = vec![]; let mut items = vec![];
@ -268,12 +270,11 @@ impl<'a> Parser<'a> {
let mut p0 = let mut p0 =
new_sub_parser_from_file(self.sess, &path, directory_ownership, Some(name), id_sp); new_sub_parser_from_file(self.sess, &path, directory_ownership, Some(name), id_sp);
p0.cfg_mods = self.cfg_mods; p0.cfg_mods = self.cfg_mods;
let mod_inner_lo = p0.token.span; let mut module = p0.parse_mod(&token::Eof)?;
let mod_attrs = p0.parse_inner_attributes()?; module.0.inline = false;
let mut m0 = p0.parse_mod_items(&token::Eof, mod_inner_lo)?;
m0.inline = false;
self.sess.included_mod_stack.borrow_mut().pop(); self.sess.included_mod_stack.borrow_mut().pop();
Ok((m0, mod_attrs)) Ok(module)
} }
fn push_directory(&mut self, id: Ident, attrs: &[Attribute]) { fn push_directory(&mut self, id: Ident, attrs: &[Attribute]) {