Converted Signature to an enum

Author: ngeor

rusty_linter/src/built_ins/data.rs

@@ -3,11 +3,7 @@ use rusty_parser::{Expression, ExpressionPos, Expressions};
 
 use crate::core::{LintError, LintErrorPos, NameScope};
 
-pub fn lint(
-    args: &Expressions,
-    name_scope: NameScope,
-    pos: Position,
-) -> Result<(), LintErrorPos> {
+pub fn lint(args: &Expressions, name_scope: NameScope, pos: Position) -> Result<(), LintErrorPos> {
     if name_scope == NameScope::Global {
         args.iter().try_for_each(require_constant)
     } else {

rusty_linter/src/core/signature.rs

@@ -8,35 +8,28 @@ 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.
 #[derive(PartialEq)]
-pub struct Signature {
-    /// The return type of a FUNCTION, or None if this is the signature of a SUB.
-    q: Option<TypeQualifier>,
+pub enum Signature {
+    /// The signature of a FUNCTION consists of the resolved parameter types
+    /// and the return type.
+    Function(ResolvedParamTypes, TypeQualifier),
 
-    /// The resolved parameter types.
-    param_types: ResolvedParamTypes,
+    /// The signature of a SUB consists of the resolved parameter types.
+    Sub(ResolvedParamTypes),
 }
 
 impl Signature {
-    pub fn new_sub(param_types: ResolvedParamTypes) -> Self {
-        Self {
-            q: None,
-            param_types,
-        }
-    }
-
-    pub fn new_function(q: TypeQualifier, param_types: ResolvedParamTypes) -> Self {
-        Self {
-            q: Some(q),
-            param_types,
-        }
-    }
-
     pub fn qualifier(&self) -> Option<TypeQualifier> {
-        self.q.as_ref().copied()
+        match self {
+            Self::Function(_, q) => Some(*q),
+            Self::Sub(_) => None,
+        }
     }
 
     pub fn param_types(&self) -> &ResolvedParamTypes {
-        &self.param_types
+        match self {
+            Self::Function(param_types, _) => param_types,
+            Self::Sub(param_types) => param_types,
+        }
     }
 }
 
@@ -46,9 +39,12 @@ impl Signature {
 
 impl PartialEq<TypeQualifier> for Signature {
     fn eq(&self, other: &TypeQualifier) -> bool {
-        match &self.q {
-            Some(q) => q == other,
-            _ => false,
+        if let Self::Function(_, q) = self
+            && q == other
+        {
+            true
+        } else {
+            false
         }
     }
 }

rusty_linter/src/pre_linter/main.rs

@@ -55,7 +55,7 @@ impl Visitor<FunctionDeclaration> for MainContext {
         let param_types: ResolvedParamTypes = self.resolve_parameters(params)?;
         let bare_name = name.as_bare_name();
         let q = name.qualify(&self.resolver);
-        let signature = Signature::new_function(q, param_types);
+        let signature = Signature::Function(param_types, q);
         self.functions
             .add_declaration(bare_name.clone(), signature.at_pos(self.declaration_pos))
     }
@@ -71,7 +71,7 @@ impl Visitor<FunctionImplementation> for MainContext {
         let param_types: ResolvedParamTypes = self.resolve_parameters(params)?;
         let bare_name = name.as_bare_name();
         let q = name.qualify(&self.resolver);
-        let signature = Signature::new_function(q, param_types);
+        let signature = Signature::Function(param_types, q);
         self.functions
             .add_implementation(bare_name.clone(), signature.at_pos(self.declaration_pos))
     }
@@ -86,7 +86,7 @@ impl Visitor<SubDeclaration> for MainContext {
             parameters: params,
         } = s;
         let param_types: ResolvedParamTypes = self.resolve_parameters(params)?;
-        let signature = Signature::new_sub(param_types);
+        let signature = Signature::Sub(param_types);
         self.subs
             .add_declaration(bare_name.clone(), signature.at_pos(self.declaration_pos))
     }
@@ -102,7 +102,7 @@ impl Visitor<SubImplementation> for MainContext {
             ..
         } = s;
         let param_types: ResolvedParamTypes = self.resolve_parameters(params)?;
-        let signature = Signature::new_sub(param_types);
+        let signature = Signature::Sub(param_types);
         self.subs
             .add_implementation(bare_name.clone(), signature.at_pos(self.declaration_pos))
     }