From a6342436343e01b32d4482a48994b8c22bcbe659 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 2 Dec 2020 16:52:14 +0100 Subject: Propagate eager expansion errors --- crates/hir_def/src/body.rs | 20 ++++--- crates/hir_def/src/lib.rs | 51 ++++++++++++++---- crates/hir_expand/src/eager.rs | 115 +++++++++++++++++++++++++++++++++++------ 3 files changed, 153 insertions(+), 33 deletions(-) (limited to 'crates') diff --git a/crates/hir_def/src/body.rs b/crates/hir_def/src/body.rs index 33eb5e78c..92bcc1705 100644 --- a/crates/hir_def/src/body.rs +++ b/crates/hir_def/src/body.rs @@ -120,18 +120,24 @@ impl Expander { self.resolve_path_as_macro(db, &path) }; - let call_id = match macro_call.as_call_id(db, self.crate_def_map.krate, resolver) { + let mut err = None; + let call_id = + macro_call.as_call_id_with_errors(db, self.crate_def_map.krate, resolver, &mut |e| { + err.get_or_insert(e); + }); + let call_id = match call_id { Some(it) => it, None => { - // FIXME: this can mean other things too, but `as_call_id` doesn't provide enough - // info. - return ExpandResult::only_err(mbe::ExpandError::Other( - "failed to parse or resolve macro invocation".into(), - )); + if err.is_none() { + eprintln!("no error despite `as_call_id_with_errors` returning `None`"); + } + return ExpandResult { value: None, err }; } }; - let err = db.macro_expand_error(call_id); + if err.is_none() { + err = db.macro_expand_error(call_id); + } let file_id = call_id.as_file(); diff --git a/crates/hir_def/src/lib.rs b/crates/hir_def/src/lib.rs index 1b22d1eec..ce2be8e2b 100644 --- a/crates/hir_def/src/lib.rs +++ b/crates/hir_def/src/lib.rs @@ -465,21 +465,37 @@ pub trait AsMacroCall { db: &dyn db::DefDatabase, krate: CrateId, resolver: impl Fn(path::ModPath) -> Option, + ) -> Option { + self.as_call_id_with_errors(db, krate, resolver, &mut |_| ()) + } + + fn as_call_id_with_errors( + &self, + db: &dyn db::DefDatabase, + krate: CrateId, + resolver: impl Fn(path::ModPath) -> Option, + error_sink: &mut dyn FnMut(mbe::ExpandError), ) -> Option; } impl AsMacroCall for InFile<&ast::MacroCall> { - fn as_call_id( + fn as_call_id_with_errors( &self, db: &dyn db::DefDatabase, krate: CrateId, resolver: impl Fn(path::ModPath) -> Option, + error_sink: &mut dyn FnMut(mbe::ExpandError), ) -> Option { let ast_id = AstId::new(self.file_id, db.ast_id_map(self.file_id).ast_id(self.value)); let h = Hygiene::new(db.upcast(), self.file_id); - let path = path::ModPath::from_src(self.value.path()?, &h)?; + let path = self.value.path().and_then(|path| path::ModPath::from_src(path, &h)); + + if path.is_none() { + error_sink(mbe::ExpandError::Other("malformed macro invocation".into())); + } - AstIdWithPath::new(ast_id.file_id, ast_id.value, path).as_call_id(db, krate, resolver) + AstIdWithPath::new(ast_id.file_id, ast_id.value, path?) + .as_call_id_with_errors(db, krate, resolver, error_sink) } } @@ -497,22 +513,32 @@ impl AstIdWithPath { } impl AsMacroCall for AstIdWithPath { - fn as_call_id( + fn as_call_id_with_errors( &self, db: &dyn db::DefDatabase, krate: CrateId, resolver: impl Fn(path::ModPath) -> Option, + error_sink: &mut dyn FnMut(mbe::ExpandError), ) -> Option { - let def: MacroDefId = resolver(self.path.clone())?; + let def: MacroDefId = resolver(self.path.clone()).or_else(|| { + error_sink(mbe::ExpandError::Other("could not resolve macro".into())); + None + })?; if let MacroDefKind::BuiltInEager(_) = def.kind { let macro_call = InFile::new(self.ast_id.file_id, self.ast_id.to_node(db.upcast())); let hygiene = Hygiene::new(db.upcast(), self.ast_id.file_id); Some( - expand_eager_macro(db.upcast(), krate, macro_call, def, &|path: ast::Path| { - resolver(path::ModPath::from_src(path, &hygiene)?) - })? + expand_eager_macro( + db.upcast(), + krate, + macro_call, + def, + &|path: ast::Path| resolver(path::ModPath::from_src(path, &hygiene)?), + error_sink, + ) + .ok()? .into(), ) } else { @@ -522,13 +548,18 @@ impl AsMacroCall for AstIdWithPath { } impl AsMacroCall for AstIdWithPath { - fn as_call_id( + fn as_call_id_with_errors( &self, db: &dyn db::DefDatabase, krate: CrateId, resolver: impl Fn(path::ModPath) -> Option, + error_sink: &mut dyn FnMut(mbe::ExpandError), ) -> Option { - let def = resolver(self.path.clone())?; + let def: MacroDefId = resolver(self.path.clone()).or_else(|| { + error_sink(mbe::ExpandError::Other("could not resolve macro".into())); + None + })?; + Some( def.as_lazy_macro( db.upcast(), diff --git a/crates/hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs index ab6b4477c..a48d08f3b 100644 --- a/crates/hir_expand/src/eager.rs +++ b/crates/hir_expand/src/eager.rs @@ -26,19 +26,89 @@ use crate::{ }; use base_db::CrateId; +use mbe::ExpandResult; use parser::FragmentKind; use std::sync::Arc; use syntax::{algo::SyntaxRewriter, SyntaxNode}; +pub struct ErrorEmitted { + _private: (), +} + +trait ErrorSink { + fn emit(&mut self, err: mbe::ExpandError); + + fn option( + &mut self, + opt: Option, + error: impl FnOnce() -> mbe::ExpandError, + ) -> Result { + match opt { + Some(it) => Ok(it), + None => { + self.emit(error()); + Err(ErrorEmitted { _private: () }) + } + } + } + + fn option_with( + &mut self, + opt: impl FnOnce() -> Option, + error: impl FnOnce() -> mbe::ExpandError, + ) -> Result { + self.option(opt(), error) + } + + fn result(&mut self, res: Result) -> Result { + match res { + Ok(it) => Ok(it), + Err(e) => { + self.emit(e); + Err(ErrorEmitted { _private: () }) + } + } + } + + fn expand_result_option(&mut self, res: ExpandResult>) -> Result { + match (res.value, res.err) { + (None, Some(err)) => { + self.emit(err); + Err(ErrorEmitted { _private: () }) + } + (Some(value), opt_err) => { + if let Some(err) = opt_err { + self.emit(err); + } + Ok(value) + } + (None, None) => unreachable!("`ExpandResult` without value or error"), + } + } +} + +impl ErrorSink for &'_ mut dyn FnMut(mbe::ExpandError) { + fn emit(&mut self, err: mbe::ExpandError) { + self(err); + } +} + +fn err(msg: impl Into) -> mbe::ExpandError { + mbe::ExpandError::Other(msg.into()) +} + pub fn expand_eager_macro( db: &dyn AstDatabase, krate: CrateId, macro_call: InFile, def: MacroDefId, resolver: &dyn Fn(ast::Path) -> Option, -) -> Option { - let args = macro_call.value.token_tree()?; - let parsed_args = mbe::ast_to_token_tree(&args)?.0; + mut error_sink: &mut dyn FnMut(mbe::ExpandError), +) -> Result { + let parsed_args = error_sink.option_with( + || Some(mbe::ast_to_token_tree(¯o_call.value.token_tree()?)?.0), + || err("malformed macro invocation"), + )?; // Note: // When `lazy_expand` is called, its *parent* file must be already exists. @@ -55,17 +125,21 @@ pub fn expand_eager_macro( }); let arg_file_id: MacroCallId = arg_id.into(); - let parsed_args = mbe::token_tree_to_syntax_node(&parsed_args, FragmentKind::Expr).ok()?.0; + let parsed_args = + error_sink.result(mbe::token_tree_to_syntax_node(&parsed_args, FragmentKind::Expr))?.0; let result = eager_macro_recur( db, InFile::new(arg_file_id.as_file(), parsed_args.syntax_node()), krate, resolver, + error_sink, )?; - let subtree = to_subtree(&result)?; + let subtree = error_sink.option(to_subtree(&result), || err("failed to parse macro result"))?; if let MacroDefKind::BuiltInEager(eager) = def.kind { - let (subtree, fragment) = eager.expand(db, arg_id, &subtree).value?; + let res = eager.expand(db, arg_id, &subtree); + + let (subtree, fragment) = error_sink.expand_result_option(res)?; let eager = EagerCallLoc { def, fragment, @@ -74,9 +148,9 @@ pub fn expand_eager_macro( file_id: macro_call.file_id, }; - Some(db.intern_eager_expansion(eager)) + Ok(db.intern_eager_expansion(eager)) } else { - None + panic!("called `expand_eager_macro` on non-eager macro def {:?}", def); } } @@ -91,13 +165,16 @@ fn lazy_expand( def: &MacroDefId, macro_call: InFile, krate: CrateId, -) -> Option> { +) -> ExpandResult>> { let ast_id = db.ast_id_map(macro_call.file_id).ast_id(¯o_call.value); let id: MacroCallId = def.as_lazy_macro(db, krate, MacroCallKind::FnLike(macro_call.with_value(ast_id))).into(); - db.parse_or_expand(id.as_file()).map(|node| InFile::new(id.as_file(), node)) + let err = db.macro_expand_error(id); + let value = db.parse_or_expand(id.as_file()).map(|node| InFile::new(id.as_file(), node)); + + ExpandResult { value, err } } fn eager_macro_recur( @@ -105,7 +182,8 @@ fn eager_macro_recur( curr: InFile, krate: CrateId, macro_resolver: &dyn Fn(ast::Path) -> Option, -) -> Option { + mut error_sink: &mut dyn FnMut(mbe::ExpandError), +) -> Result { let original = curr.value.clone(); let children = curr.value.descendants().filter_map(ast::MacroCall::cast); @@ -113,7 +191,8 @@ fn eager_macro_recur( // Collect replacement for child in children { - let def: MacroDefId = macro_resolver(child.path()?)?; + let def = error_sink + .option_with(|| macro_resolver(child.path()?), || err("failed to resolve macro"))?; let insert = match def.kind { MacroDefKind::BuiltInEager(_) => { let id: MacroCallId = expand_eager_macro( @@ -122,17 +201,21 @@ fn eager_macro_recur( curr.with_value(child.clone()), def, macro_resolver, + error_sink, )? .into(); - db.parse_or_expand(id.as_file())? + db.parse_or_expand(id.as_file()) + .expect("successful macro expansion should be parseable") } MacroDefKind::Declarative | MacroDefKind::BuiltIn(_) | MacroDefKind::BuiltInDerive(_) | MacroDefKind::ProcMacro(_) => { - let expanded = lazy_expand(db, &def, curr.with_value(child.clone()), krate)?; + let res = lazy_expand(db, &def, curr.with_value(child.clone()), krate); + let val = error_sink.expand_result_option(res)?; + // replace macro inside - eager_macro_recur(db, expanded, krate, macro_resolver)? + eager_macro_recur(db, val, krate, macro_resolver, error_sink)? } }; @@ -140,5 +223,5 @@ fn eager_macro_recur( } let res = rewriter.rewrite(&original); - Some(res) + Ok(res) } -- cgit v1.2.3