refactor: Implement ConstLookup trait for names_inner

Author: ngeor

rusty_linter/src/converter/dim_rules/validation.rs

@@ -1,8 +1,7 @@
 use crate::converter::common::Context;
-use crate::core::IntoTypeQualifier;
+use crate::core::{ConstLookup, IntoTypeQualifier};
 use crate::core::{HasSubprograms, HasUserDefinedTypes};
 use crate::core::{LintError, LintErrorPos};
-use crate::names::ManyNamesTrait;
 use rusty_common::{AtPos, Position, Positioned};
 use rusty_parser::{AsBareName, DimVar, Parameter, TypedName, VarType};
 

rusty_linter/src/converter/expr_rules/variable.rs

@@ -1,10 +1,10 @@
 use crate::converter::common::{Context, ExprContext, ExprContextPos};
 use crate::converter::expr_rules::qualify_name::*;
 use crate::core::{
-    qualifier_of_const_variant, HasSubprograms, IntoQualified, IntoTypeQualifier, LintResult,
+    qualifier_of_const_variant, ConstLookup, HasSubprograms, IntoQualified, IntoTypeQualifier,
+    LintResult,
 };
 use crate::core::{LintError, LintErrorPos};
-use crate::names::ManyNamesTrait;
 use rusty_common::{AtPos, Position};
 use rusty_parser::{AsBareName, BuiltInFunction};
 use rusty_parser::{

rusty_linter/src/names/mod.rs

@@ -7,4 +7,3 @@ mod traits;
 
 pub use implicit_vars::ImplicitVars;
 pub use names::Names;
-pub use traits::*;

rusty_linter/src/names/names_inner.rs

@@ -3,9 +3,12 @@ use std::collections::HashMap;
 use rusty_parser::{AsBareName, BareName, Name, TypeQualifier, VariableInfo};
 use rusty_variant::Variant;
 
-use crate::names::{
-    name_info::NameInfo,
-    traits::{ManyNamesTrait, SingleNameTrait},
+use crate::{
+    core::ConstLookup,
+    names::{
+        name_info::NameInfo,
+        traits::{ManyNamesTrait, SingleNameTrait},
+    },
 };
 
 /// Stores information about multiple constants or variable names.
@@ -57,6 +60,14 @@ impl NamesInner {
     }
 }
 
+impl ConstLookup for NamesInner {
+    fn get_const_value(&self, bare_name: &BareName) -> Option<&rusty_variant::Variant> {
+        self.0
+            .get(bare_name)
+            .and_then(|name_info| name_info.get_const_value())
+    }
+}
+
 impl ManyNamesTrait for NamesInner {
     fn get_compact(&self, bare_name: &BareName, qualifier: TypeQualifier) -> Option<&VariableInfo> {
         self.0
@@ -70,12 +81,6 @@ impl ManyNamesTrait for NamesInner {
             .and_then(|name_info| name_info.get_extended())
     }
 
-    fn get_const_value(&self, bare_name: &BareName) -> Option<&rusty_variant::Variant> {
-        self.0
-            .get(bare_name)
-            .and_then(|name_info| name_info.get_const_value())
-    }
-
     fn collect_var_info(
         &self,
         bare_name: &BareName,

rusty_linter/src/names/traits.rs

@@ -1,6 +1,8 @@
 use rusty_parser::{BareName, BuiltInStyle, TypeQualifier, VariableInfo};
 use rusty_variant::Variant;
 
+use crate::core::ConstLookup;
+
 pub trait SingleNameTrait {
     fn get_compact(&self, qualifier: TypeQualifier) -> Option<&VariableInfo>;
 
@@ -13,13 +15,11 @@ pub trait SingleNameTrait {
     fn insert_compact(&mut self, variable_info: VariableInfo);
 }
 
-pub trait ManyNamesTrait {
+pub trait ManyNamesTrait: ConstLookup {
     fn get_compact(&self, bare_name: &BareName, qualifier: TypeQualifier) -> Option<&VariableInfo>;
 
     fn get_extended(&self, bare_name: &BareName) -> Option<&VariableInfo>;
 
-    fn get_const_value(&self, bare_name: &BareName) -> Option<&Variant>;
-
     fn collect_var_info(
         &self,
         bare_name: &BareName,