From c2c885d85baf913eed5147fab0d580366c5a4f93 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Sun, 14 Sep 2025 15:59:18 -0500 Subject: [PATCH] Get less errors in name_analysis module. --- src/name_analysis/gather.rs | 20 +------------------- src/name_analysis/mod.rs | 3 +-- src/name_analysis/resolve.rs | 23 ++--------------------- src/name_analysis/symbol.rs | 5 +---- 4 files changed, 5 insertions(+), 46 deletions(-) diff --git a/src/name_analysis/gather.rs b/src/name_analysis/gather.rs index 9a6e391..e73145e 100644 --- a/src/name_analysis/gather.rs +++ b/src/name_analysis/gather.rs @@ -1,22 +1,4 @@ -use crate::ast::node::call_expression::*; -use crate::ast::node::class::*; -use crate::ast::node::closure::*; -use crate::ast::node::compilation_unit::*; -use crate::ast::node::d_string::*; -use crate::ast::node::expression::*; -use crate::ast::node::function::*; -use crate::ast::node::generics::*; -use crate::ast::node::implements_list::*; -use crate::ast::node::interface::*; -use crate::ast::node::level::*; -use crate::ast::node::literal::*; -use crate::ast::node::module::*; -use crate::ast::node::named::Named; -use crate::ast::node::names::*; -use crate::ast::node::object_access::*; -use crate::ast::node::statement::*; -use crate::ast::node::type_use::*; -use crate::ast::node::use_statement::*; +use crate::ast::node::*; use crate::diagnostic::DmDiagnostic; use crate::name_analysis::fqn_context::FqnContext; use crate::name_analysis::symbol::*; diff --git a/src/name_analysis/mod.rs b/src/name_analysis/mod.rs index ca13b36..e30d127 100644 --- a/src/name_analysis/mod.rs +++ b/src/name_analysis/mod.rs @@ -19,8 +19,7 @@ The resolve phase has one main responsibility: resolve all references based on t `scope_id` property. */ -use crate::ast::node::compilation_unit::CompilationUnit; -use crate::ast::node::named::Named; +use crate::ast::node::CompilationUnit; use crate::diagnostic::DmDiagnostic; use crate::name_analysis::gather::gather_compilation_unit; use crate::name_analysis::resolve::resolve_compilation_unit; diff --git a/src/name_analysis/resolve.rs b/src/name_analysis/resolve.rs index 98c6689..4f41f77 100644 --- a/src/name_analysis/resolve.rs +++ b/src/name_analysis/resolve.rs @@ -1,29 +1,10 @@ -use crate::ast::node::call_expression::*; -use crate::ast::node::class::*; -use crate::ast::node::closure::*; -use crate::ast::node::compilation_unit::*; -use crate::ast::node::d_string::*; -use crate::ast::node::expression::*; -use crate::ast::node::function::*; -use crate::ast::node::generics::*; -use crate::ast::node::implements_list::*; -use crate::ast::node::interface::*; -use crate::ast::node::level::*; -use crate::ast::node::literal::*; -use crate::ast::node::module::*; -use crate::ast::node::names::*; -use crate::ast::node::object_access::*; -use crate::ast::node::statement::*; -use crate::ast::node::tuple_arguments::*; -use crate::ast::node::type_use::*; -use crate::ast::node::use_statement::*; +use crate::ast::node::named::Named; +use crate::ast::node::*; use crate::diagnostic::DmDiagnostic; use crate::name_analysis::symbol::Symbol; use crate::name_analysis::symbol_table::{SymbolLookupError, SymbolTable}; use codespan_reporting::diagnostic::{Diagnostic, Label}; -use std::ops::DerefMut; use std::range::Range; -use crate::ast::node::named::Named; /* Type Use */ fn resolve_type_use( diff --git a/src/name_analysis/symbol.rs b/src/name_analysis/symbol.rs index 6b71d05..fc76f65 100644 --- a/src/name_analysis/symbol.rs +++ b/src/name_analysis/symbol.rs @@ -1,6 +1,3 @@ -use crate::ast::node::named::Named; -use crate::ast::node::names::Identifier; -use crate::ast::node::use_statement::UseStatement; use std::cell::RefCell; use std::fmt::{Debug, Display, Formatter}; use std::ops::Deref; @@ -28,7 +25,7 @@ impl SourceDefinition { range: borrowed.range(), } } - + pub fn file_id(&self) -> usize { self.file_id }