Skip to content

Remove special case 'mod' path simplification #63

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

Merged
Imberflur merged 1 commit into from
Nov 6, 2025
Merged

Remove special case 'mod' path simplification #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 1 addition & 13 deletions bauble/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,22 +465,11 @@ impl From<TypeRegistry> for BaubleContext {
}
}

fn preprocess_path(path: TypePath<&str>) -> TypePath<&str> {
if let Some((path, end)) = path.split_end()
&& end.as_str() == "mod"
{
path
} else {
path
}
}

impl BaubleContext {
/// * `path` describes the bauble "module" that the file corresponds to. That is it say, what
/// prefix path is necessary inside of bauble to reference the context of this file.
/// * `source` is the string of Bauble text to be parsed.
pub fn register_file(&mut self, path: TypePath<&str>, source: impl Into<String>) -> FileId {
let path = preprocess_path(path);
let node = self.root_node.build_nodes(path);
let id = FileId(self.files.len());
node.source = Some(id);
Expand Down Expand Up @@ -532,10 +521,9 @@ impl BaubleContext {
let ids = paths
.into_iter()
.map(|(path, source)| {
let processed_path = preprocess_path(path.borrow());
let file_id = self
.root_node
.node_at(processed_path)
.node_at(path.borrow())
.and_then(|node| node.source);
match file_id {
Some(id) => {
Expand Down
Loading