improve numeric enum name

FuelLabs · Aug 26, 2024 · 4e725c2 · 4e725c2
1 parent 9c9c05e
commit 4e725c2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/sway-core/src/language/ty/declaration/function.rs b/sway-core/src/language/ty/declaration/function.rs
@@ -573,15 +573,15 @@ impl TyFunctionSig {
 
     pub fn is_concrete(&self, engines: &Engines) -> bool {
         self.return_type
-            .is_concrete(engines, NumericIsNonConcrete::No)
+            .is_concrete(engines, TreatNumericAs::Concrete)
             && self
                 .parameters
                 .iter()
-                .all(|p| p.is_concrete(engines, NumericIsNonConcrete::No))
+                .all(|p| p.is_concrete(engines, TreatNumericAs::Concrete))
             && self
                 .type_parameters
                 .iter()
-                .all(|p| p.is_concrete(engines, NumericIsNonConcrete::No))
+                .all(|p| p.is_concrete(engines, TreatNumericAs::Concrete))
     }
 
     /// Returns a String representing the function.

diff --git a/sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs b/sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs
@@ -523,7 +523,7 @@ fn type_check_encode_append(
     };
 
     // only supported types
-    if item_type.is_concrete(engines, NumericIsNonConcrete::Yes) {
+    if item_type.is_concrete(engines, TreatNumericAs::Abstract) {
         match &*engines.te().get(item_type) {
             TypeInfo::Boolean
             | TypeInfo::UnsignedInteger(IntegerBits::Eight)

diff --git a/sway-core/src/semantic_analysis/ast_node/expression/typed_expression.rs b/sway-core/src/semantic_analysis/ast_node/expression/typed_expression.rs
@@ -1866,13 +1866,13 @@ impl ty::TyExpression {
             .fold_while(None, |last, current| match last {
                 None => Continue(Some(current.return_type)),
                 Some(last) => {
-                    if last.is_concrete(engines, NumericIsNonConcrete::Yes) {
+                    if last.is_concrete(engines, TreatNumericAs::Abstract) {
                         return Done(Some(last));
                     }
 
                     if current
                         .return_type
-                        .is_concrete(engines, NumericIsNonConcrete::Yes)
+                        .is_concrete(engines, TreatNumericAs::Abstract)
                     {
                         return Done(Some(current.return_type));
                     }

diff --git a/sway-core/src/semantic_analysis/ast_node/expression/typed_expression/method_application.rs b/sway-core/src/semantic_analysis/ast_node/expression/typed_expression/method_application.rs
@@ -60,7 +60,7 @@ pub(crate) fn type_check_method_application(
                 x.return_type
                     .extract_inner_types(engines, IncludeSelf::Yes)
                     .iter()
-                    .any(|x| !x.is_concrete(engines, NumericIsNonConcrete::Yes))
+                    .any(|x| !x.is_concrete(engines, TreatNumericAs::Abstract))
             })
             .unwrap_or_default();
         let needs_second_pass = has_errors || is_not_concrete;

diff --git a/sway-core/src/type_system/id.rs b/sway-core/src/type_system/id.rs
@@ -27,9 +27,9 @@ pub enum IncludeSelf {
     No,
 }
 
-pub enum NumericIsNonConcrete {
-    Yes,
-    No,
+pub enum TreatNumericAs {
+    Abstract,
+    Concrete,
 }
 
 /// A identifier to uniquely refer to our type terms
@@ -464,13 +464,13 @@ impl TypeId {
     pub(crate) fn is_concrete(
         &self,
         engines: &Engines,
-        numeric_non_concrete: NumericIsNonConcrete,
+        numeric_non_concrete: TreatNumericAs,
     ) -> bool {
         let nested_types = (*self).extract_nested_types(engines);
         !nested_types
             .into_iter()
             .any(|x| match numeric_non_concrete {
-                NumericIsNonConcrete::Yes => matches!(
+                TreatNumericAs::Abstract => matches!(
                     x,
                     TypeInfo::UnknownGeneric { .. }
                         | TypeInfo::Custom { .. }
@@ -479,7 +479,7 @@ impl TypeId {
                         | TypeInfo::TypeParam(..)
                         | TypeInfo::Numeric
                 ),
-                NumericIsNonConcrete::No => matches!(
+                TreatNumericAs::Concrete => matches!(
                     x,
                     TypeInfo::UnknownGeneric { .. }
                         | TypeInfo::Custom { .. }

diff --git a/sway-core/src/type_system/priv_prelude.rs b/sway-core/src/type_system/priv_prelude.rs
@@ -16,6 +16,6 @@ pub use super::{
         type_parameter::TypeParameter,
     },
     engine::TypeEngine,
-    id::{IncludeSelf, NumericIsNonConcrete, TypeId},
+    id::{IncludeSelf, TreatNumericAs, TypeId},
     info::{AbiEncodeSizeHint, AbiName, TypeInfo, TypeSourceInfo},
 };