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

Jump to bottom

some refactoring #367

Merged
merged 3 commits into from
Jan 5, 2024
Merged

some refactoring #367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efdf232
model/context_bag: some refactoring
kaspar030 Jan 5, 2024
b7f476e
model/context_bag: more refactor
kaspar030 Jan 5, 2024
2905756
model/context_bag: make `ContextBag` derive Default
kaspar030 Jan 5, 2024
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
49 changes: 19 additions & 30 deletions src/model/context_bag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use indexmap::IndexSet;
use super::{BlockAllow, Context, Module};
use crate::nested_env;

#[derive(Default)]
pub struct ContextBag {
pub contexts: Vec<Context>,
pub context_map: HashMap<String, usize>,
Expand All @@ -20,20 +21,11 @@ pub enum IsAncestor {

impl ContextBag {
pub fn new() -> ContextBag {
ContextBag {
contexts: Vec::new(),
context_map: HashMap::new(),
contexts_topo_sorted: None,
//module_map: HashMap::new(),
}
Self::default()
}

pub fn get_by_name(&self, name: &String) -> Option<&Context> {
let id = self.context_map.get(name);
match id {
Some(id) => Some(&self.contexts[*id]),
None => None,
}
self.context_map.get(name).map(|id| &self.contexts[*id])
}

pub fn finalize(&mut self) -> Result<(), Error> {
Expand Down Expand Up @@ -113,22 +105,21 @@ impl ContextBag {

let context = &self.contexts[n];
let parent_var_ops = &self.contexts[context.parent_index.unwrap()].var_options;
let combined_var_opts = if let Some(parent_var_ops) = parent_var_ops {
if let Some(context_var_opts) = &context.var_options {
Some(
let combined_var_opts = parent_var_ops.as_ref().map(|parent_var_ops| {
context.var_options.as_ref().map_or_else(
|| parent_var_ops.clone(),
|context_var_opts| {
parent_var_ops
.into_iter()
.chain(context_var_opts)
.map(|(k, v)| (k.clone(), v.clone()))
.collect(),
)
} else {
Some(parent_var_ops.clone())
}
} else {
None
};
.collect()
},
)
});

let context = &mut self.contexts[n];

if context.var_options.is_none() {
context.var_options = combined_var_opts;
}
Expand Down Expand Up @@ -272,14 +263,12 @@ impl ContextBag {
blocklist: &Option<Vec<String>>,
allowlist: &Option<Vec<String>>,
) -> BlockAllow {
let allowlist_entry = match allowlist {
Some(list) => self.is_ancestor_in_list(context, list),
None => IsAncestor::No,
};
let blocklist_entry = match blocklist {
Some(list) => self.is_ancestor_in_list(context, list),
None => IsAncestor::No,
};
let allowlist_entry = allowlist.as_ref().map_or(IsAncestor::No, |list| {
self.is_ancestor_in_list(context, &list)
});
let blocklist_entry = blocklist.as_ref().map_or(IsAncestor::No, |list| {
self.is_ancestor_in_list(context, &list)
});

if allowlist.is_some() {
if blocklist.is_some() {
Expand Down