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

refactor: remove unwrap() in advanced_resolver. #1318

Merged
merged 2 commits into from
May 15, 2024
Merged

refactor: remove unwrap() in advanced_resolver. #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17bdea8
refactor: remove unwrap() in advanced_resolver. Change walk_xx functi…
He1pa May 15, 2024
2216e92
test: fix failed ut
He1pa May 15, 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
2 changes: 1 addition & 1 deletion kclvm/loader/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pub fn load_packages_with_cache(
);
let node_ty_map = prog_scope.node_ty_map;
let gs = Namer::find_symbols(&program, gs);
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map.clone());
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map.clone())?;
(program, prog_scope.handler.diagnostics.clone(), gs)
} else {
(parse_result.program, IndexSet::default(), gs)
Expand Down
12 changes: 6 additions & 6 deletions kclvm/sema/src/advanced_resolver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl<'ctx> AdvancedResolver<'ctx> {
program: &'ctx Program,
gs: GlobalState,
node_ty_map: NodeTyMap,
) -> GlobalState {
) -> anyhow::Result<GlobalState> {
let mut advanced_resolver = Self {
gs,
ctx: Context {
Expand Down Expand Up @@ -128,14 +128,14 @@ impl<'ctx> AdvancedResolver<'ctx> {
);
for module in modules.iter() {
advanced_resolver.ctx.current_filename = Some(module.filename.clone());
advanced_resolver.walk_module(module);
advanced_resolver.walk_module(module)?;
}
advanced_resolver.leave_scope()
}
}

advanced_resolver.gs.build_sema_db();
advanced_resolver.gs
Ok(advanced_resolver.gs)
}

fn enter_root_scope(
Expand Down Expand Up @@ -303,7 +303,7 @@ mod tests {
None,
)
.node_ty_map;
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map);
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map).unwrap();
let base_path = Path::new(".").canonicalize().unwrap();
// print_symbols_info(&gs);
let except_symbols = vec![
Expand Down Expand Up @@ -1232,7 +1232,7 @@ mod tests {
let gs = GlobalState::default();
let gs = Namer::find_symbols(&program, gs);
let node_ty_map = resolver::resolve_program(&mut program).node_ty_map;
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map);
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map).unwrap();
let base_path = Path::new(".").canonicalize().unwrap();

let test_cases = vec![
Expand Down Expand Up @@ -1309,7 +1309,7 @@ mod tests {
let gs = GlobalState::default();
let gs = Namer::find_symbols(&program, gs);
let node_ty_map = resolver::resolve_program(&mut program).node_ty_map;
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map);
let gs = AdvancedResolver::resolve_program(&program, gs, node_ty_map).unwrap();
let base_path = Path::new(".").canonicalize().unwrap();

let scope_test_cases = vec![
Expand Down
Loading
Loading