T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add better error messages for duplicate term declarations

Browse Source
This commit is contained in:
Nick Fitzgerald
2021-11-01 13:55:28 -07:00
committed by Chris Fallin
parent 22e18a9d98
commit 8f5dffab72
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cranelift/isle/isle/src/sema.rs
View File

@@ -198,6 +198,8 @@ pub struct TermEnv {
pub struct Term {
/// This term's id.
pub id: TermId,
/// The source position where this term was declared.
pub decl_pos: Pos,
/// The name of this term.
pub name: Sym,
/// The parameter types to this term.
@@ -776,11 +778,15 @@ impl TermEnv {
&ast::Def::Decl(ref decl) => {
let tid = TermId(self.terms.len());
let name = tyenv.intern_mut(&decl.term);
if self.term_map.contains_key(&name) {
if let Some(tid) = self.term_map.get(&name) {
tyenv.report_error(
decl.pos,
format!("Duplicate decl for '{}'", decl.term.0),
);
tyenv.report_error(
self.terms[tid.index()].decl_pos,
format!("Duplicate decl for '{}'", decl.term.0),
);
}
self.term_map.insert(name, tid);
@@ -817,6 +823,7 @@ impl TermEnv {
self.terms.push(Term {
id: tid,
decl_pos: decl.pos,
name,
arg_tys,
ret_ty,
@@ -855,6 +862,7 @@ impl TermEnv {
let ret_ty = id;
self.terms.push(Term {
id: tid,
decl_pos: pos,
name: variant.fullname,
arg_tys,
ret_ty,