Move linter context into core module

ngeor · ngeor · commit 0df96d80309b · 2026-02-24T20:34:37.000+01:00
diff --git a/rusty_linter/src/converter/common/convertible.rs b/rusty_linter/src/converter/common/convertible.rs
@@ -1,7 +1,6 @@
 use rusty_common::{AtPos, Position, Positioned};
 
-use crate::converter::common::Context;
-use crate::core::LintErrorPos;
+use crate::core::{Context, LintErrorPos};
 
 /// Convert from the current type into the target type O.
 /// By default, O is the same as the current type.
diff --git a/rusty_linter/src/converter/common/mod.rs b/rusty_linter/src/converter/common/mod.rs
@@ -1,8 +1,6 @@
-mod context;
 mod convertible;
 mod program_rules;
 mod types;
 
-pub use self::context::*;
 pub use self::convertible::*;
 pub use self::types::*;
diff --git a/rusty_linter/src/converter/common/program_rules.rs b/rusty_linter/src/converter/common/program_rules.rs
@@ -3,8 +3,8 @@ use rusty_parser::{
     DimVar, FunctionImplementation, GlobalStatement, GlobalStatementPos, Program, Statement, Statements, SubImplementation
 };
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn};
-use crate::core::{IntoQualified, LintErrorPos, ScopeName};
+use crate::converter::common::{Convertible, ConvertibleIn};
+use crate::core::{Context, IntoQualified, LintErrorPos, ScopeName};
 use crate::names::ImplicitVars;
 
 impl Convertible for Program {
diff --git a/rusty_linter/src/converter/dim_rules/array_dimension.rs b/rusty_linter/src/converter/dim_rules/array_dimension.rs
@@ -1,7 +1,7 @@
 use rusty_parser::ArrayDimension;
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn};
-use crate::core::LintErrorPos;
+use crate::converter::common::{Convertible, ConvertibleIn};
+use crate::core::{Context, LintErrorPos};
 
 impl Convertible for ArrayDimension {
     fn convert(self, ctx: &mut Context) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/dim_rules/dim_type_rules.rs b/rusty_linter/src/converter/dim_rules/dim_type_rules.rs
@@ -1,8 +1,8 @@
 use rusty_common::*;
 use rusty_parser::*;
 
-use crate::converter::common::{DimNameState, *};
-use crate::core::{IntoTypeQualifier, LintError, LintErrorPos, ValidateStringLength};
+use crate::converter::common::{Convertible, DimContext, DimNameState};
+use crate::core::{Context, IntoTypeQualifier, LintError, LintErrorPos, ValidateStringLength};
 
 pub fn on_dim_type(
     dim_type: DimType,
diff --git a/rusty_linter/src/converter/dim_rules/main.rs b/rusty_linter/src/converter/dim_rules/main.rs
@@ -1,11 +1,11 @@
 use rusty_common::*;
 use rusty_parser::*;
 
-use crate::converter::common::{Context, ConvertibleIn, DimContext, DimNameState};
+use crate::converter::common::{ConvertibleIn, DimContext, DimNameState};
 use crate::converter::dim_rules::dim_type_rules::on_dim_type;
 use crate::converter::dim_rules::redim::on_redim_type;
 use crate::converter::dim_rules::validation;
-use crate::core::{LintError, LintErrorPos};
+use crate::core::{Context, LintError, LintErrorPos};
 
 impl ConvertibleIn<DimContext> for DimList {
     fn convert_in(self, ctx: &mut Context, dim_context: DimContext) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/dim_rules/param_rules.rs b/rusty_linter/src/converter/dim_rules/param_rules.rs
@@ -1,10 +1,10 @@
 use rusty_common::Position;
 use rusty_parser::Parameter;
 
-use crate::converter::common::{Context, ConvertibleIn};
+use crate::converter::common::ConvertibleIn;
 use crate::converter::dim_rules::param_type_rules::on_param_type;
 use crate::converter::dim_rules::validation;
-use crate::core::LintErrorPos;
+use crate::core::{Context, LintErrorPos};
 
 impl ConvertibleIn<Position> for Parameter {
     fn convert_in(self, ctx: &mut Context, pos: Position) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/dim_rules/param_type_rules.rs b/rusty_linter/src/converter/dim_rules/param_type_rules.rs
@@ -1,9 +1,8 @@
 use rusty_common::Position;
 use rusty_parser::{BareName, ParamType};
 
-use crate::converter::common::Context;
 use crate::converter::dim_rules::dim_type_rules;
-use crate::core::LintErrorPos;
+use crate::core::{Context, LintErrorPos};
 
 pub fn on_param_type(
     dim_type: ParamType,
diff --git a/rusty_linter/src/converter/dim_rules/redim.rs b/rusty_linter/src/converter/dim_rules/redim.rs
@@ -1,8 +1,8 @@
 use rusty_common::*;
 use rusty_parser::*;
 
-use crate::converter::common::{Context, Convertible, DimNameState};
-use crate::core::{IntoTypeQualifier, LintError, LintErrorPos, ValidateStringLength};
+use crate::converter::common::{Convertible, DimNameState};
+use crate::core::{Context, IntoTypeQualifier, LintError, LintErrorPos, ValidateStringLength};
 
 pub fn on_redim_type(
     var_type: DimType,
diff --git a/rusty_linter/src/converter/dim_rules/validation.rs b/rusty_linter/src/converter/dim_rules/validation.rs
@@ -1,8 +1,7 @@
 use rusty_common::{AtPos, Position, Positioned};
 use rusty_parser::{AsBareName, DimVar, Parameter, TypedName, VarType};
 
-use crate::converter::common::Context;
-use crate::core::{ConstLookup, IntoTypeQualifier, LintError, LintErrorPos};
+use crate::core::{ConstLookup, Context, IntoTypeQualifier, LintError, LintErrorPos};
 
 pub fn validate<T>(
     var_name: &TypedName<T>,
diff --git a/rusty_linter/src/converter/expr_rules/binary.rs b/rusty_linter/src/converter/expr_rules/binary.rs
@@ -1,7 +1,7 @@
 use rusty_parser::{Expression, ExpressionPos, Operator};
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContextPos};
-use crate::core::{LintErrorPos, binary_cast};
+use crate::converter::common::{ConvertibleIn, ExprContextPos};
+use crate::core::{Context, LintErrorPos, binary_cast};
 
 pub fn convert(
     ctx: &mut Context,
diff --git a/rusty_linter/src/converter/expr_rules/built_in_function.rs b/rusty_linter/src/converter/expr_rules/built_in_function.rs
@@ -1,11 +1,10 @@
 use rusty_common::Position;
 use rusty_parser::{BuiltInFunction, Expression, Expressions};
 
-use crate::converter::common::Context;
 use crate::converter::expr_rules::function::{
     convert_function_args, functions_must_have_arguments
 };
-use crate::core::LintErrorPos;
+use crate::core::{Context, LintErrorPos};
 
 pub fn convert(
     ctx: &mut Context,
diff --git a/rusty_linter/src/converter/expr_rules/function.rs b/rusty_linter/src/converter/expr_rules/function.rs
@@ -3,9 +3,9 @@ use rusty_parser::{
     AsBareName, BareName, Expression, ExpressionType, Expressions, Name, VariableInfo
 };
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContext, ExprContextPos};
+use crate::converter::common::{ConvertibleIn, ExprContext, ExprContextPos};
 use crate::converter::expr_rules::qualify_name::*;
-use crate::core::{IntoQualified, IntoTypeQualifier, LintError, LintErrorPos, LintResult};
+use crate::core::{Context, IntoQualified, IntoTypeQualifier, LintError, LintErrorPos, LintResult};
 
 pub fn convert(
     ctx: &mut Context,
diff --git a/rusty_linter/src/converter/expr_rules/main.rs b/rusty_linter/src/converter/expr_rules/main.rs
@@ -1,11 +1,11 @@
 use rusty_common::*;
 use rusty_parser::*;
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContext, ExprContextPos};
+use crate::converter::common::{ConvertibleIn, ExprContext, ExprContextPos};
 use crate::converter::expr_rules::{
     binary, built_in_function, function, property, unary, variable
 };
-use crate::core::LintErrorPos;
+use crate::core::{Context, LintErrorPos};
 
 //
 // ExpressionPos ConvertibleIn
diff --git a/rusty_linter/src/converter/expr_rules/property.rs b/rusty_linter/src/converter/expr_rules/property.rs
@@ -3,11 +3,11 @@ use rusty_parser::{
     AsBareName, BareName, ElementType, Expression, ExpressionType, HasExpressionType, Name, ToBareName, UserDefinedType, VariableInfo
 };
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContext, ExprContextPos};
+use crate::converter::common::{ConvertibleIn, ExprContext, ExprContextPos};
 use crate::converter::expr_rules::variable::{
     AssignToFunction, ExistingConst, ExistingVar, VarAsUserDefinedFunctionCall, VarResolve, add_as_new_implicit_var
 };
-use crate::core::{LintError, LintErrorPos};
+use crate::core::{Context, LintError, LintErrorPos};
 
 pub fn convert(
     ctx: &mut Context,
diff --git a/rusty_linter/src/converter/expr_rules/unary.rs b/rusty_linter/src/converter/expr_rules/unary.rs
@@ -3,8 +3,8 @@ use rusty_parser::{
     Expression, ExpressionPos, ExpressionType, HasExpressionType, TypeQualifier, UnaryOperator
 };
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContextPos};
-use crate::core::{LintError, LintErrorPos};
+use crate::converter::common::{ConvertibleIn, ExprContextPos};
+use crate::core::{Context, LintError, LintErrorPos};
 
 pub fn convert(
     ctx: &mut Context,
diff --git a/rusty_linter/src/converter/expr_rules/variable.rs b/rusty_linter/src/converter/expr_rules/variable.rs
@@ -4,10 +4,10 @@ use rusty_parser::{
 };
 use rusty_variant::Variant;
 
-use crate::converter::common::{Context, ExprContext, ExprContextPos};
+use crate::converter::common::{ExprContext, ExprContextPos};
 use crate::converter::expr_rules::qualify_name::*;
 use crate::core::{
-    ConstLookup, IntoQualified, IntoTypeQualifier, LintError, LintErrorPos, LintResult, qualifier_of_const_variant
+    ConstLookup, Context, IntoQualified, IntoTypeQualifier, LintError, LintErrorPos, LintResult, qualifier_of_const_variant
 };
 
 pub fn convert(
diff --git a/rusty_linter/src/converter/mod.rs b/rusty_linter/src/converter/mod.rs
@@ -7,7 +7,7 @@ mod statement;
 
 use rusty_parser::Program;
 
-pub use self::common::Context;
+use crate::Context;
 use crate::converter::common::Convertible;
 use crate::core::LintErrorPos;
 use crate::pre_linter::PreLinterResult;
diff --git a/rusty_linter/src/converter/statement/assignment.rs b/rusty_linter/src/converter/statement/assignment.rs
@@ -1,8 +1,8 @@
 use rusty_common::{AtPos, Position, Positioned};
 use rusty_parser::{Assignment, Expression, ExpressionPos, Statement};
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContext};
-use crate::core::LintErrorPos;
+use crate::converter::common::{ConvertibleIn, ExprContext};
+use crate::core::{Context, LintErrorPos};
 
 pub fn on_assignment(
     a: Assignment,
diff --git a/rusty_linter/src/converter/statement/const_rules.rs b/rusty_linter/src/converter/statement/const_rules.rs
@@ -1,9 +1,8 @@
 use rusty_common::*;
 use rusty_parser::*;
 
-use crate::converter::common::Context;
 use crate::core::{
-    CastVariant, ConstEvaluator, LintError, LintErrorPos, LintResult, qualifier_of_const_variant
+    CastVariant, ConstEvaluator, Context, LintError, LintErrorPos, LintResult, qualifier_of_const_variant
 };
 
 pub fn on_const(ctx: &mut Context, c: Constant) -> Result<Statement, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/do_loop.rs b/rusty_linter/src/converter/statement/do_loop.rs
@@ -1,7 +1,7 @@
 use rusty_parser::DoLoop;
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn};
-use crate::core::LintErrorPos;
+use crate::converter::common::{Convertible, ConvertibleIn};
+use crate::core::{Context, LintErrorPos};
 
 impl Convertible for DoLoop {
     fn convert(self, ctx: &mut Context) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/for_loop.rs b/rusty_linter/src/converter/statement/for_loop.rs
@@ -1,7 +1,7 @@
 use rusty_parser::ForLoop;
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn, ExprContext};
-use crate::core::LintErrorPos;
+use crate::converter::common::{Convertible, ConvertibleIn, ExprContext};
+use crate::core::{Context, LintErrorPos};
 
 impl Convertible for ForLoop {
     fn convert(self, ctx: &mut Context) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/if_blocks.rs b/rusty_linter/src/converter/statement/if_blocks.rs
@@ -1,7 +1,7 @@
 use rusty_parser::{ConditionalBlock, IfBlock};
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn};
-use crate::core::LintErrorPos;
+use crate::converter::common::{Convertible, ConvertibleIn};
+use crate::core::{Context, LintErrorPos};
 
 impl Convertible for ConditionalBlock {
     fn convert(self, ctx: &mut Context) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/main.rs b/rusty_linter/src/converter/statement/main.rs
@@ -1,9 +1,9 @@
 use rusty_common::*;
 use rusty_parser::{ExitObject, Statement};
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn, DimContext, ExprContext};
+use crate::converter::common::{Convertible, ConvertibleIn, DimContext, ExprContext};
 use crate::converter::statement::{assignment, const_rules};
-use crate::core::{LintError, LintErrorPos, ScopeKind};
+use crate::core::{Context, LintError, LintErrorPos, ScopeKind};
 
 impl ConvertibleIn<Position> for Statement {
     fn convert_in(self, ctx: &mut Context, pos: Position) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/print.rs b/rusty_linter/src/converter/statement/print.rs
@@ -1,7 +1,7 @@
 use rusty_parser::{Print, PrintArg};
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn};
-use crate::core::LintErrorPos;
+use crate::converter::common::{Convertible, ConvertibleIn};
+use crate::core::{Context, LintErrorPos};
 
 impl Convertible for Print {
     fn convert(self, ctx: &mut Context) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/select_case.rs b/rusty_linter/src/converter/statement/select_case.rs
@@ -1,7 +1,7 @@
 use rusty_parser::{CaseBlock, CaseExpression, SelectCase};
 
-use crate::converter::common::{Context, Convertible, ConvertibleIn};
-use crate::core::LintErrorPos;
+use crate::converter::common::{Convertible, ConvertibleIn};
+use crate::core::{Context, LintErrorPos};
 
 impl Convertible for SelectCase {
     fn convert(self, ctx: &mut Context) -> Result<Self, LintErrorPos> {
diff --git a/rusty_linter/src/converter/statement/sub_call.rs b/rusty_linter/src/converter/statement/sub_call.rs
@@ -1,7 +1,7 @@
 use rusty_parser::{BuiltInSub, Statement, SubCall};
 
-use crate::converter::common::{Context, ConvertibleIn, ExprContext};
-use crate::core::LintErrorPos;
+use crate::converter::common::{ConvertibleIn, ExprContext};
+use crate::core::{Context, LintErrorPos};
 
 impl Context {
     pub fn sub_call(&mut self, sub_call: SubCall) -> Result<Statement, LintErrorPos> {
diff --git a/rusty_linter/src/core/context.rs b/rusty_linter/src/core/context.rs
diff --git a/rusty_linter/src/core/mod.rs b/rusty_linter/src/core/mod.rs
@@ -1,6 +1,7 @@
 mod can_cast_to;
 mod casting;
 mod const_value_resolver;
+mod context;
 mod error;
 mod name_scope;
 mod qb_casting;
@@ -16,6 +17,7 @@ mod visitor;
 pub use self::can_cast_to::*;
 pub use self::casting::*;
 pub use self::const_value_resolver::*;
+pub use self::context::*;
 pub use self::error::*;
 pub use self::name_scope::*;
 pub use self::qb_casting::*;
diff --git a/rusty_linter/src/lib.rs b/rusty_linter/src/lib.rs
@@ -9,8 +9,9 @@ mod tests;
 
 use rusty_parser::Program;
 
-pub use self::converter::Context;
-pub use self::core::{CastVariant, LintError, QBNumberCast, ScopeName, qualifier_of_variant};
+pub use self::core::{
+    CastVariant, Context, LintError, QBNumberCast, ScopeName, qualifier_of_variant
+};
 pub use self::names::Names;
 use crate::converter::convert;
 use crate::core::LintErrorPos;
