Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(traits): added checks for duplicated trait associated items (types, consts, functions) #2927

Merged
merged 16 commits into from
Oct 5, 2023
Merged

feat(traits): added checks for duplicated trait associated items (types, consts, functions) #2927

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5d0de2a
feat(traits): added checks for duplicate trait associated items (type…
nickysn Sep 30, 2023
aa8d93f
fix(traits): avoid compiler panic, when a trait method override is fo…
nickysn Sep 30, 2023
3c51b48
fix(traits): report duplicated functions in the trait implementation …
nickysn Sep 30, 2023
4598fa1
refactor(traits): simplify code via the use of `..`. No functional ch…
nickysn Oct 2, 2023
9dfa68e
chore(traits): apply cargo fmt changes
nickysn Oct 2, 2023
a6407cd
refactor(traits): duplicate check refactored to use the module system
nickysn Oct 4, 2023
68941cf
refactor(traits): removed DuplicateType::TraitAssociatedItem, because…
nickysn Oct 4, 2023
e9991f6
fix(traits): when registering the trait impl function in the struct n…
nickysn Oct 4, 2023
f16e710
refactor(traits): cargo fmt
nickysn Oct 4, 2023
68d4f35
Merge branch 'master' into trait_dup_items_check
nickysn Oct 5, 2023
1251c7e
refactor(traits): merge the loop that checks for duplicate items in t…
nickysn Oct 5, 2023
d5eca96
refactor(traits): always generate a FuncId for a trait function, rega…
nickysn Oct 5, 2023
c79c350
refactor(traits): when adding consts to the trait namespace, always c…
nickysn Oct 5, 2023
b1d75e3
refactor(traits): added TODO comment for replacing the trait type ali…
nickysn Oct 5, 2023
e52c7f7
refactor(traits): only push the trait function body to the unresolved…
nickysn Oct 5, 2023
de49025
Merge branch 'master' into trait_dup_items_check
nickysn Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ fn collect_trait_impl(

if let Some(struct_type) = get_struct_type(&typ) {
errors.extend(take_errors(trait_impl.file_id, resolver));
let current_def_map = def_maps.get_mut(&crate_id).unwrap();
let current_def_map = def_maps.get_mut(&struct_type.borrow().id.krate()).unwrap();
match add_method_to_struct_namespace(
current_def_map,
struct_type,
Expand Down
127 changes: 45 additions & 82 deletions compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::{collections::HashMap, vec};
use std::vec;

use fm::FileId;
use noirc_errors::Location;

use crate::{
graph::CrateId,
hir::def_collector::dc_crate::{UnresolvedStruct, UnresolvedTrait},
node_interner::TraitId,
node_interner::{FuncId, StmtId, TraitId, TypeAliasId},
parser::SubModule,
FunctionDefinition, Ident, LetStatement, NoirFunction, NoirStruct, NoirTrait, NoirTraitImpl,
NoirTypeAlias, ParsedModule, TraitImplItem, TraitItem, TypeImpl,
Expand Down Expand Up @@ -316,85 +316,6 @@ impl<'a> ModCollector<'a> {
errors
}

fn check_for_duplicate_trait_items(
&mut self,
trait_items: &Vec<TraitItem>,
) -> Vec<(CompilationError, FileId)> {
let mut errors: Vec<(CompilationError, FileId)> = vec![];

let mut functions_and_consts: HashMap<&Ident, &TraitItem> = HashMap::new();
let mut types: HashMap<&Ident, &TraitItem> = HashMap::new();

for trait_item in trait_items {
match trait_item {
TraitItem::Function { name, .. } => {
if let Some(prev_item) = functions_and_consts.insert(name, trait_item) {
let error = match prev_item {
TraitItem::Function { name: prev_name, .. } => {
DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedFunction,
first_def: prev_name.clone(),
second_def: name.clone(),
}
}
TraitItem::Constant { name: prev_name, .. } => {
DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedItem,
first_def: prev_name.clone(),
second_def: name.clone(),
}
}
TraitItem::Type { .. } => {
unreachable!();
}
};
errors.push((error.into(), self.file_id));
}
}
TraitItem::Constant { name, .. } => {
if let Some(prev_item) = functions_and_consts.insert(name, trait_item) {
let error = match prev_item {
TraitItem::Function { name: prev_name, .. } => {
DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedItem,
first_def: prev_name.clone(),
second_def: name.clone(),
}
}
TraitItem::Constant { name: prev_name, .. } => {
DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedConst,
first_def: prev_name.clone(),
second_def: name.clone(),
}
}
TraitItem::Type { .. } => {
unreachable!();
}
};
errors.push((error.into(), self.file_id));
}
}
TraitItem::Type { name } => {
if let Some(prev_item) = types.insert(name, trait_item) {
if let TraitItem::Type { name: prev_name } = prev_item {
let error = DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedType,
first_def: prev_name.clone(),
second_def: name.clone(),
};
errors.push((error.into(), self.file_id));
} else {
unreachable!();
}
}
}
}
}

errors
}

/// Collect any traits definitions declared within the ast.
/// Returns a vector of errors if any traits were already defined.
fn collect_traits(
Expand Down Expand Up @@ -429,7 +350,49 @@ impl<'a> ModCollector<'a> {
errors.push((error.into(), self.file_id));
}

errors.append(&mut self.check_for_duplicate_trait_items(&trait_definition.items));
for trait_item in &trait_definition.items {
match trait_item {
TraitItem::Function { name, .. } => {
if let Err((first_def, second_def)) = self.def_collector.def_map.modules
[id.0.local_id.0]
.declare_function(name.clone(), FuncId::dummy_id())
jfecher marked this conversation as resolved.
Show resolved Hide resolved
{
let error = DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedFunction,
first_def,
second_def,
};
errors.push((error.into(), self.file_id));
}
}
TraitItem::Constant { name, .. } => {
if let Err((first_def, second_def)) = self.def_collector.def_map.modules
[id.0.local_id.0]
.declare_global(name.clone(), StmtId::dummy_id())
{
let error = DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedConst,
first_def,
second_def,
};
errors.push((error.into(), self.file_id));
}
}
TraitItem::Type { name } => {
if let Err((first_def, second_def)) = self.def_collector.def_map.modules
[id.0.local_id.0]
.declare_type_alias(name.clone(), TypeAliasId::dummy_id())
{
let error = DefCollectorErrorKind::Duplicate {
typ: DuplicateType::TraitAssociatedType,
first_def,
second_def,
};
errors.push((error.into(), self.file_id));
}
}
}
}

// Add all functions that have a default implementation in the trait
let mut unresolved_functions =
Expand Down
2 changes: 0 additions & 2 deletions compiler/noirc_frontend/src/hir/def_collector/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ pub enum DuplicateType {
TraitAssociatedType,
TraitAssociatedConst,
TraitAssociatedFunction,
TraitAssociatedItem,
}

#[derive(Error, Debug, Clone)]
Expand Down Expand Up @@ -86,7 +85,6 @@ impl fmt::Display for DuplicateType {
DuplicateType::TraitAssociatedType => write!(f, "trait associated type"),
DuplicateType::TraitAssociatedConst => write!(f, "trait associated constant"),
DuplicateType::TraitAssociatedFunction => write!(f, "trait associated function"),
DuplicateType::TraitAssociatedItem => write!(f, "trait associated item"),
}
}
}
Expand Down