// uses a HOF to parse anything, and <source> includes file and
// source_str.
-pub fn parse_crate_from_file(
- input: &Path,
- cfg: ast::CrateConfig,
- sess: &ParseSess
-) -> ast::Crate {
+pub fn parse_crate_from_file<'a>(input: &Path,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, ast::Crate> {
let mut parser = new_parser_from_file(sess, cfg, input);
- abort_if_errors(parser.parse_crate_mod(), &parser)
+ parser.parse_crate_mod()
}
-pub fn parse_crate_attrs_from_file(
- input: &Path,
- cfg: ast::CrateConfig,
- sess: &ParseSess
-) -> Vec<ast::Attribute> {
+pub fn parse_crate_attrs_from_file<'a>(input: &Path,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, Vec<ast::Attribute>> {
let mut parser = new_parser_from_file(sess, cfg, input);
- abort_if_errors(parser.parse_inner_attributes(), &parser)
+ parser.parse_inner_attributes()
}
-pub fn parse_crate_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> ast::Crate {
+pub fn parse_crate_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, ast::Crate> {
let mut p = new_parser_from_source_str(sess,
cfg,
name,
source);
- panictry!(p.parse_crate_mod())
+ p.parse_crate_mod()
}
-pub fn parse_crate_attrs_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> Vec<ast::Attribute> {
+pub fn parse_crate_attrs_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, Vec<ast::Attribute>> {
let mut p = new_parser_from_source_str(sess,
cfg,
name,
source);
- panictry!(p.parse_inner_attributes())
+ p.parse_inner_attributes()
}
-pub fn parse_expr_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> P<ast::Expr> {
+pub fn parse_expr_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, P<ast::Expr>> {
let mut p = new_parser_from_source_str(sess, cfg, name, source);
- panictry!(p.parse_expr())
+ p.parse_expr()
}
-pub fn parse_item_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> Option<P<ast::Item>> {
+/// Parses an item.
+///
+/// Returns `Ok(Some(item))` when successful, `Ok(None)` when no item was found, and`Err`
+/// when a syntax error occurred.
+pub fn parse_item_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, Option<P<ast::Item>>> {
let mut p = new_parser_from_source_str(sess, cfg, name, source);
- panictry!(p.parse_item())
+ p.parse_item()
}
-pub fn parse_meta_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> P<ast::MetaItem> {
+pub fn parse_meta_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, P<ast::MetaItem>> {
let mut p = new_parser_from_source_str(sess, cfg, name, source);
- panictry!(p.parse_meta_item())
+ p.parse_meta_item()
}
-pub fn parse_stmt_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> Option<ast::Stmt> {
+pub fn parse_stmt_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, Option<ast::Stmt>> {
let mut p = new_parser_from_source_str(
sess,
cfg,
name,
source
);
- panictry!(p.parse_stmt())
+ p.parse_stmt()
}
// Warning: This parses with quote_depth > 0, which is not the default.
-pub fn parse_tts_from_source_str(name: String,
- source: String,
- cfg: ast::CrateConfig,
- sess: &ParseSess)
- -> Vec<ast::TokenTree> {
+pub fn parse_tts_from_source_str<'a>(name: String,
+ source: String,
+ cfg: ast::CrateConfig,
+ sess: &'a ParseSess)
+ -> PResult<'a, Vec<ast::TokenTree>> {
let mut p = new_parser_from_source_str(
sess,
cfg,
);
p.quote_depth += 1;
// right now this is re-creating the token trees from ... token trees.
- panictry!(p.parse_all_token_trees())
+ p.parse_all_token_trees()
}
// Create a new parser from a source string
p
}
-
-fn abort_if_errors<'a, T>(result: PResult<'a, T>, p: &Parser) -> T {
- match result {
- Ok(c) => {
- c
- }
- Err(mut e) => {
- e.emit();
- p.abort_if_errors();
- unreachable!();
- }
- }
-}
-
/// Parse a string representing a character literal into its final form.
/// Rather than just accepting/rejecting a given literal, unescapes it as
/// well. Can take any slice prefixed by a character escape. Returns the
let name = "<source>".to_string();
let source = "/// doc comment\r\nfn foo() {}".to_string();
- let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap();
+ let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess)
+ .unwrap().unwrap();
let doc = first_attr_value_str_by_name(&item.attrs, "doc").unwrap();
assert_eq!(&doc[..], "/// doc comment");
let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".to_string();
- let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap();
+ let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess)
+ .unwrap().unwrap();
let docs = item.attrs.iter().filter(|a| &*a.name() == "doc")
.map(|a| a.value_str().unwrap().to_string()).collect::<Vec<_>>();
let b: &[_] = &["/// doc comment".to_string(), "/// line 2".to_string()];
assert_eq!(&docs[..], b);
let source = "/** doc comment\r\n * with CRLF */\r\nfn foo() {}".to_string();
- let item = parse_item_from_source_str(name, source, Vec::new(), &sess).unwrap();
+ let item = parse_item_from_source_str(name, source, Vec::new(), &sess).unwrap().unwrap();
let doc = first_attr_value_str_by_name(&item.attrs, "doc").unwrap();
assert_eq!(&doc[..], "/** doc comment\n * with CRLF */");
}
fn ttdelim_span() {
let sess = ParseSess::new();
let expr = parse::parse_expr_from_source_str("foo".to_string(),
- "foo!( fn main() { body } )".to_string(), vec![], &sess);
+ "foo!( fn main() { body } )".to_string(), vec![], &sess).unwrap();
let tts = match expr.node {
ast::ExprKind::Mac(ref mac) => mac.node.tts.clone(),
projects / rustc.git / blobdiff