refactor(linter): Refactor types module into smaller modules

Author: ngeor

rusty_linter/src/core/mod.rs

@@ -1,25 +1,31 @@
 mod casting;
 mod const_value_resolver;
 mod error;
+mod name_context;
 mod qb_casting;
 mod qualify_variant;
 mod ref_to_value_visitor;
+mod resolved_param_type;
+mod signature;
 mod string_length;
+mod subprogram_name;
 mod traits;
 mod type_resolver;
 mod type_resolver_impl;
-mod types;
 mod visitor;
 
 pub use self::casting::*;
 pub use self::const_value_resolver::*;
 pub use self::error::*;
+pub use self::name_context::*;
 pub use self::qb_casting::*;
 pub use self::qualify_variant::*;
 pub use self::ref_to_value_visitor::*;
+pub use self::resolved_param_type::*;
+pub use self::signature::*;
 pub use self::string_length::*;
+pub use self::subprogram_name::*;
 pub use self::traits::*;
 pub use self::type_resolver::*;
 pub use self::type_resolver_impl::*;
-pub use self::types::*;
 pub use self::visitor::*;

rusty_linter/src/core/name_context.rs

@@ -0,0 +1,6 @@
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum NameContext {
+    Global,
+    Sub,
+    Function,
+}

rusty_linter/src/core/resolved_param_type.rs

@@ -0,0 +1,21 @@
+use rusty_parser::{BareName, BuiltInStyle, TypeQualifier};
+
+/// A resolved parameter type.
+#[derive(PartialEq)]
+pub enum ResolvedParamType {
+    /// A built-in type.
+    /// The type qualifier indicates the type.
+    /// The style indicates how the parameter was declared:
+    /// Compact: e.g. `A$` or Extended e.g. `A AS STRING`
+    BuiltIn(TypeQualifier, BuiltInStyle),
+
+    /// A user defined type.
+    UserDefined(BareName),
+
+    /// An array type.
+    /// Dimensions are not allowed for parameter types.
+    Array(Box<Self>),
+}
+
+/// A collection of resolved parameter types.
+pub type ResolvedParamTypes = Vec<ResolvedParamType>;

rusty_linter/src/core/types.rs rusty_linter/src/core/signature.rsrusty_linter/src/core/types.rs renamed to rusty_linter/src/core/signature.rs

@@ -1,44 +1,9 @@
 use std::collections::HashMap;
 
 use rusty_common::Positioned;
-use rusty_parser::{BareName, BuiltInStyle, Name, TypeQualifier};
+use rusty_parser::{BareName, TypeQualifier};
 
-/// Holds the resolved name of a subprogram.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub enum SubprogramName {
-    /// The resolved qualified name of a function.
-    Function(Name),
-
-    /// The resolved name of a sub.
-    Sub(BareName),
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum NameContext {
-    Global,
-    Sub,
-    Function,
-}
-
-/// A resolved parameter type.
-#[derive(PartialEq)]
-pub enum ResolvedParamType {
-    /// A built-in type.
-    /// The type qualifier indicates the type.
-    /// The style indicates how the parameter was declared:
-    /// Compact: e.g. `A$` or Extended e.g. `A AS STRING`
-    BuiltIn(TypeQualifier, BuiltInStyle),
-
-    /// A user defined type.
-    UserDefined(BareName),
-
-    /// An array type.
-    /// Dimensions are not allowed for parameter types.
-    Array(Box<Self>),
-}
-
-/// A collection of resolved parameter types.
-pub type ResolvedParamTypes = Vec<ResolvedParamType>;
+use crate::core::ResolvedParamTypes;
 
 /// The signature of a FUNCTION or SUB.
 /// Consists of the resolved parameter types and, in case of a FUNCTION, the return type.

rusty_linter/src/core/subprogram_name.rs

@@ -0,0 +1,11 @@
+use rusty_parser::{BareName, Name};
+
+/// Holds the resolved name of a subprogram.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub enum SubprogramName {
+    /// The resolved qualified name of a function.
+    Function(Name),
+
+    /// The resolved name of a sub.
+    Sub(BareName),
+}

rusty_linter/src/pre_linter/main.rs

@@ -188,7 +188,7 @@ where
 }
 
 /// This is the same as [Parameter],
-/// but the memebers are references.
+/// but the members are references.
 /// It's needed due to the recursive implementation of `RefToValueVisitor`
 /// and the recursive (`Box`) implementation of `ParamType::Array`.
 struct RefParamName<'a>(&'a BareName, &'a ParamType);