Re-organized linter modules, moved main lint function inside core module

ngeor · ngeor · commit ea756cb1df7a · 2026-02-27T09:14:32.000+01:00
diff --git a/rusty_basic/src/bin/rusty_basic.rs b/rusty_basic/src/bin/rusty_basic.rs
@@ -3,7 +3,7 @@ use std::fs::File;
 
 use rusty_basic::instruction_generator::{generate_instructions, unwrap_linter_context};
 use rusty_basic::interpreter::{InterpreterTrait, new_default_interpreter};
-use rusty_linter::{LinterContext, lint};
+use rusty_linter::core::{LinterContext, lint};
 use rusty_parser::{Program, parse_main_file};
 
 fn main() {
diff --git a/rusty_basic/src/instruction_generator/calls.rs b/rusty_basic/src/instruction_generator/calls.rs
@@ -1,5 +1,5 @@
 use rusty_common::{AtPos, Position, Positioned};
-use rusty_linter::ScopeName;
+use rusty_linter::core::ScopeName;
 use rusty_parser::*;
 
 use crate::instruction_generator::{AddressOrLabel, Instruction, InstructionGenerator};
diff --git a/rusty_basic/src/instruction_generator/dim.rs b/rusty_basic/src/instruction_generator/dim.rs
@@ -1,5 +1,5 @@
 use rusty_common::*;
-use rusty_linter::ScopeName;
+use rusty_linter::core::ScopeName;
 use rusty_parser::*;
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/instruction_generator/expression.rs b/rusty_basic/src/instruction_generator/expression.rs
@@ -1,5 +1,5 @@
 use rusty_common::*;
-use rusty_linter::VariableInfo;
+use rusty_linter::core::VariableInfo;
 use rusty_parser::*;
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/instruction_generator/main.rs b/rusty_basic/src/instruction_generator/main.rs
@@ -1,5 +1,6 @@
 use rusty_common::{AtPos, CaseInsensitiveString, Position, Positioned};
-use rusty_linter::{LinterContext, Names, ScopeName};
+use rusty_linter::core::{LinterContext, ScopeName};
+use rusty_linter::names::Names;
 use rusty_parser::{
     Assignment, BareName, BuiltInFunction, BuiltInSub, DimVar, Expression, ExpressionType, FileHandle, FunctionImplementation, GlobalStatement, HasExpressionType, Name, Parameter, Program, Statement, Statements, SubImplementation, TypeQualifier, UserDefinedTypes
 };
diff --git a/rusty_basic/src/instruction_generator/subprogram_info.rs b/rusty_basic/src/instruction_generator/subprogram_info.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use rusty_common::Positioned;
-use rusty_linter::ScopeName;
+use rusty_linter::core::ScopeName;
 use rusty_parser::*;
 
 /// Holds information about a subprogram that is needed at runtime.
diff --git a/rusty_basic/src/instruction_generator/test_utils.rs b/rusty_basic/src/instruction_generator/test_utils.rs
@@ -1,5 +1,5 @@
 use rusty_common::NoPosContainer;
-use rusty_linter::lint;
+use rusty_linter::core::lint;
 use rusty_parser::{UserDefinedTypes, parse};
 
 use crate::instruction_generator::{
diff --git a/rusty_basic/src/interpreter/built_ins/chr.rs b/rusty_basic/src/interpreter/built_ins/chr.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::BuiltInFunction;
 
 use crate::RuntimeError;
diff --git a/rusty_basic/src/interpreter/built_ins/color.rs b/rusty_basic/src/interpreter/built_ins/color.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 
 use crate::RuntimeError;
 use crate::interpreter::interpreter_trait::InterpreterTrait;
diff --git a/rusty_basic/src/interpreter/built_ins/def_seg.rs b/rusty_basic/src/interpreter/built_ins/def_seg.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 
 use crate::RuntimeError;
 use crate::interpreter::interpreter_trait::InterpreterTrait;
diff --git a/rusty_basic/src/interpreter/built_ins/input.rs b/rusty_basic/src/interpreter/built_ins/input.rs
@@ -1,6 +1,6 @@
 use std::convert::TryFrom;
 
-use rusty_linter::qualifier_of_variant;
+use rusty_linter::core::qualifier_of_variant;
 use rusty_parser::{FileHandle, TypeQualifier};
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/interpreter/built_ins/mkd.rs b/rusty_basic/src/interpreter/built_ins/mkd.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::BuiltInFunction;
 use rusty_variant::f64_to_bytes;
 
diff --git a/rusty_basic/src/interpreter/built_ins/open.rs b/rusty_basic/src/interpreter/built_ins/open.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::{FileAccess, FileHandle, FileMode};
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/interpreter/built_ins/poke.rs b/rusty_basic/src/interpreter/built_ins/poke.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 
 use super::peek::INDICATOR_KEYS_ADDRESS;
 use crate::RuntimeError;
diff --git a/rusty_basic/src/interpreter/built_ins/read.rs b/rusty_basic/src/interpreter/built_ins/read.rs
@@ -1,4 +1,4 @@
-use rusty_linter::{CastVariant, qualifier_of_variant};
+use rusty_linter::core::{CastVariant, qualifier_of_variant};
 
 use crate::RuntimeError;
 use crate::interpreter::interpreter_trait::InterpreterTrait;
diff --git a/rusty_basic/src/interpreter/built_ins/space.rs b/rusty_basic/src/interpreter/built_ins/space.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::BuiltInFunction;
 
 use crate::RuntimeError;
diff --git a/rusty_basic/src/interpreter/built_ins/string_fn.rs b/rusty_basic/src/interpreter/built_ins/string_fn.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::BuiltInFunction;
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/interpreter/context.rs b/rusty_basic/src/interpreter/context.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use rusty_common::CaseInsensitiveString;
-use rusty_linter::{QBNumberCast, ScopeName};
+use rusty_linter::core::{QBNumberCast, ScopeName};
 use rusty_parser::{BareName, BuiltInFunction, TypeQualifier};
 use rusty_variant::{UserDefinedTypeValue, VArray, Variant, bytes_to_i32, i32_to_bytes};
 
diff --git a/rusty_basic/src/interpreter/error.rs b/rusty_basic/src/interpreter/error.rs
@@ -1,4 +1,4 @@
-use rusty_linter::LintError;
+use rusty_linter::core::LintError;
 use rusty_variant::{SubscriptOutOfRangeError, VariantError};
 
 use crate::error_envelope::ErrorEnvelope;
diff --git a/rusty_basic/src/interpreter/handlers/cast.rs b/rusty_basic/src/interpreter/handlers/cast.rs
@@ -1,4 +1,4 @@
-use rusty_linter::CastVariant;
+use rusty_linter::core::CastVariant;
 use rusty_parser::TypeQualifier;
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/interpreter/handlers/logical.rs b/rusty_basic/src/interpreter/handlers/logical.rs
@@ -1,4 +1,4 @@
-use rusty_linter::CastVariant;
+use rusty_linter::core::CastVariant;
 use rusty_parser::TypeQualifier;
 
 use crate::RuntimeError;
diff --git a/rusty_basic/src/interpreter/handlers/var_path.rs b/rusty_basic/src/interpreter/handlers/var_path.rs
@@ -1,4 +1,4 @@
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::BareName;
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/interpreter/main.rs b/rusty_basic/src/interpreter/main.rs
@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 
 use rusty_common::*;
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::UserDefinedTypes;
 use rusty_variant::Variant;
 
diff --git a/rusty_basic/src/interpreter/test_utils.rs b/rusty_basic/src/interpreter/test_utils.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::Read;
 
-use rusty_linter::lint;
+use rusty_linter::core::lint;
 use rusty_parser::{UserDefinedTypes, parse_main_file};
 
 use crate::RuntimeErrorPos;
diff --git a/rusty_basic/src/interpreter/variant_casts.rs b/rusty_basic/src/interpreter/variant_casts.rs
@@ -1,6 +1,6 @@
 use std::convert::TryFrom;
 
-use rusty_linter::QBNumberCast;
+use rusty_linter::core::QBNumberCast;
 use rusty_parser::FileHandle;
 use rusty_variant::Variant;
 
diff --git a/rusty_linter/src/converter/expr_rules/qualify_name.rs b/rusty_linter/src/converter/expr_rules/qualify_name.rs
@@ -1,6 +1,6 @@
 use rusty_parser::{AsBareName, BuiltInFunction, ExpressionType, Name, ToBareName, TypeQualifier};
 
-use crate::LintError;
+use crate::core::LintError;
 
 /// Validates and normalizes the given name
 pub fn qualify_name(expression_type: &ExpressionType, name: Name) -> Result<Name, LintError> {
diff --git a/rusty_linter/src/core/main.rs b/rusty_linter/src/core/main.rs
@@ -0,0 +1,15 @@
+use rusty_parser::Program;
+
+use crate::converter::common::Convertible;
+use crate::core::{LintErrorPos, LinterContext};
+use crate::post_linter::post_linter;
+use crate::pre_linter::pre_lint_program;
+
+pub fn lint(program: Program) -> Result<(Program, LinterContext), LintErrorPos> {
+    // first pass, get user defined types and functions/subs
+    let mut context = pre_lint_program(&program)?;
+    // convert to fully typed
+    let program = program.convert(&mut context)?;
+    // lint and reduce
+    post_linter(program, &context).map(|program| (program, context))
+}
diff --git a/rusty_linter/src/core/mod.rs b/rusty_linter/src/core/mod.rs
@@ -3,6 +3,7 @@ mod casting;
 mod const_value_resolver;
 mod error;
 mod linter_context;
+mod main;
 mod name_scope;
 mod qb_casting;
 mod qualify_variant;
@@ -20,6 +21,7 @@ pub use self::casting::*;
 pub use self::const_value_resolver::*;
 pub use self::error::*;
 pub use self::linter_context::*;
+pub use self::main::*;
 pub use self::name_scope::*;
 pub use self::qb_casting::*;
 pub use self::qualify_variant::*;
diff --git a/rusty_linter/src/core/visitor.rs b/rusty_linter/src/core/visitor.rs
@@ -1,7 +1,7 @@
 use rusty_common::{Position, Positioned};
 use rusty_parser::*;
 
-use crate::LintErrorPos;
+use crate::core::LintErrorPos;
 
 /// The result of a visitor.
 pub type VisitResult = Result<(), LintErrorPos>;
diff --git a/rusty_linter/src/lib.rs b/rusty_linter/src/lib.rs
@@ -1,28 +1,8 @@
 mod built_ins;
 mod converter;
-mod core;
-mod names;
+pub mod core;
+pub mod names;
 mod post_linter;
 mod pre_linter;
 #[cfg(test)]
 mod tests;
-
-use rusty_parser::Program;
-
-pub use self::core::{
-    CastVariant, LintError, LinterContext, QBNumberCast, RedimInfo, ScopeName, VariableInfo, qualifier_of_variant
-};
-pub use self::names::Names;
-use crate::converter::common::Convertible;
-use crate::core::LintErrorPos;
-use crate::post_linter::post_linter;
-use crate::pre_linter::pre_lint_program;
-
-pub fn lint(program: Program) -> Result<(Program, LinterContext), LintErrorPos> {
-    // first pass, get user defined types and functions/subs
-    let mut context = pre_lint_program(&program)?;
-    // convert to fully typed
-    let program = program.convert(&mut context)?;
-    // lint and reduce
-    post_linter(program, &context).map(|program| (program, context))
-}
diff --git a/rusty_linter/src/post_linter/main.rs b/rusty_linter/src/post_linter/main.rs
@@ -1,7 +1,6 @@
 use rusty_parser::Program;
 
-use crate::LinterContext;
-use crate::core::{LintErrorPos, Visitor};
+use crate::core::{LintErrorPos, LinterContext, Visitor};
 use crate::post_linter::expression_reducer::ExpressionReducer;
 use crate::post_linter::post_conversion_linter::PostConversionLinter;
 use crate::post_linter::{
diff --git a/rusty_linter/src/post_linter/undefined_function_reducer.rs b/rusty_linter/src/post_linter/undefined_function_reducer.rs
@@ -1,8 +1,7 @@
 use rusty_parser::{AsBareName, Expression};
 
 use super::expression_reducer::*;
-use crate::LinterContext;
-use crate::core::{LintErrorPos, binary_cast};
+use crate::core::{LintErrorPos, LinterContext, binary_cast};
 
 /// Finds undefined functions and converts them to zeroes.
 pub struct UndefinedFunctionReducer<'a> {
diff --git a/rusty_linter/src/post_linter/user_defined_function_linter.rs b/rusty_linter/src/post_linter/user_defined_function_linter.rs
@@ -2,7 +2,6 @@ use rusty_common::*;
 use rusty_parser::*;
 
 use super::post_conversion_linter::PostConversionLinter;
-use crate::LinterContext;
 use crate::core::*;
 
 pub struct UserDefinedFunctionLinter<'a> {
diff --git a/rusty_linter/src/post_linter/user_defined_sub_linter.rs b/rusty_linter/src/post_linter/user_defined_sub_linter.rs
@@ -3,8 +3,7 @@ use rusty_parser::SubCall;
 
 use super::post_conversion_linter::PostConversionLinter;
 use super::user_defined_function_linter::lint_call_args;
-use crate::LinterContext;
-use crate::core::{LintError, LintErrorPos};
+use crate::core::{LintError, LintErrorPos, LinterContext};
 
 pub struct UserDefinedSubLinter<'a> {
     pub linter_context: &'a LinterContext,
diff --git a/rusty_linter/src/tests/test_utils.rs b/rusty_linter/src/tests/test_utils.rs
@@ -1,7 +1,6 @@
 use rusty_parser::{Program, parse};
 
-use crate::core::LintErrorPos;
-use crate::{LinterContext, lint};
+use crate::core::{LintErrorPos, LinterContext, lint};
 
 /// Lints the given string and returns the results.
 ///

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use rusty_linter::QBNumberCast;`
	`1`	`+use rusty_linter::core::QBNumberCast;`
`2`	`2`	`use rusty_parser::BuiltInFunction;`
`3`	`3`
`4`	`4`	`use crate::RuntimeError;`