Refactor DefaultNumericTypes into submodule.

ISibboI · Dec 27, 2024 · 81adc0d · 81adc0d
1 parent 8b28dfb
commit 81adc0d
Show file tree

Hide file tree

Showing 13 changed files with 337 additions and 304 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,11 +26,13 @@ path = "src/lib.rs"
 regex = { version = "1.11.1", optional = true }
 serde = { version = "1.0.213", features = ["derive"], optional = true }
 rand = { version = "0.8.5", optional = true }
+# num-traits = { version = "0.2.19", optional = true }
 
 [features]
 serde = ["dep:serde"]
 regex = ["dep:regex"]
 rand = ["dep:rand"]
+# num-traits = ["dep:num-traits"]
 
 [dev-dependencies]
 ron = "0.8.1"

diff --git a/src/context/mod.rs b/src/context/mod.rs
@@ -10,7 +10,7 @@ use crate::{
     error::EvalexprResultValue,
     function::Function,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprNumericTypes},
+        numeric_types::{default_numeric_types::DefaultNumericTypes, EvalexprNumericTypes},
         value_type::ValueType,
         Value,
     },

diff --git a/src/error/mod.rs b/src/error/mod.rs
@@ -10,7 +10,7 @@ use std::ops::RangeInclusive;
 use crate::{
     token::PartialToken,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprNumericTypes},
+        numeric_types::{default_numeric_types::DefaultNumericTypes, EvalexprNumericTypes},
         value_type::ValueType,
     },
 };
@@ -464,7 +464,10 @@ pub type EvalexprResultValue<NumericTypes = DefaultNumericTypes> =
 
 #[cfg(test)]
 mod tests {
-    use crate::{value::numeric_types::DefaultNumericTypes, EvalexprError, Value, ValueType};
+    use crate::{
+        value::numeric_types::default_numeric_types::DefaultNumericTypes, EvalexprError, Value,
+        ValueType,
+    };
 
     /// Tests whose only use is to bring test coverage of trivial lines up, like trivial constructors.
     #[test]

diff --git a/src/function/mod.rs b/src/function/mod.rs
@@ -3,7 +3,7 @@ use std::fmt;
 use crate::{
     error::EvalexprResultValue,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprNumericTypes},
+        numeric_types::{default_numeric_types::DefaultNumericTypes, EvalexprNumericTypes},
         Value,
     },
 };

diff --git a/src/interface/mod.rs b/src/interface/mod.rs
@@ -2,7 +2,7 @@ use crate::{
     error::EvalexprResultValue,
     token, tree,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprNumericTypes},
+        numeric_types::{default_numeric_types::DefaultNumericTypes, EvalexprNumericTypes},
         TupleType,
     },
     Context, ContextWithMutableVariables, EmptyType, EvalexprError, EvalexprResult, HashMapContext,

diff --git a/src/lib.rs b/src/lib.rs
@@ -592,7 +592,10 @@ pub use crate::{
     token::PartialToken,
     tree::Node,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprFloat, EvalexprInt, EvalexprNumericTypes},
+        numeric_types::{
+            default_numeric_types::DefaultNumericTypes, EvalexprFloat, EvalexprInt,
+            EvalexprNumericTypes,
+        },
         value_type::ValueType,
         EmptyType, TupleType, Value, EMPTY_VALUE,
     },

diff --git a/src/operator/mod.rs b/src/operator/mod.rs
@@ -4,7 +4,10 @@ use crate::{
     context::Context,
     error::*,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprFloat, EvalexprInt, EvalexprNumericTypes},
+        numeric_types::{
+            default_numeric_types::DefaultNumericTypes, EvalexprFloat, EvalexprInt,
+            EvalexprNumericTypes,
+        },
         Value,
     },
     ContextWithMutableVariables,

diff --git a/src/token/mod.rs b/src/token/mod.rs
@@ -2,7 +2,9 @@ use std::str::FromStr;
 
 use crate::{
     error::{EvalexprError, EvalexprResult},
-    value::numeric_types::{DefaultNumericTypes, EvalexprInt, EvalexprNumericTypes},
+    value::numeric_types::{
+        default_numeric_types::DefaultNumericTypes, EvalexprInt, EvalexprNumericTypes,
+    },
 };
 
 mod display;
@@ -507,7 +509,7 @@ fn parse_dec_or_hex<NumericTypes: EvalexprNumericTypes>(
 mod tests {
     use crate::{
         token::{char_to_partial_token, tokenize, Token},
-        value::numeric_types::DefaultNumericTypes,
+        value::numeric_types::default_numeric_types::DefaultNumericTypes,
     };
     use std::fmt::Write;
 

diff --git a/src/tree/mod.rs b/src/tree/mod.rs
@@ -2,7 +2,7 @@ use crate::{
     error::EvalexprResultValue,
     token::Token,
     value::{
-        numeric_types::{DefaultNumericTypes, EvalexprNumericTypes},
+        numeric_types::{default_numeric_types::DefaultNumericTypes, EvalexprNumericTypes},
         TupleType, EMPTY_VALUE,
     },
     Context, ContextWithMutableVariables, EmptyType, HashMapContext,

diff --git a/src/value/mod.rs b/src/value/mod.rs
@@ -1,7 +1,7 @@
 use crate::error::{EvalexprError, EvalexprResult, EvalexprResultValue};
 use std::{convert::TryFrom, ops::RangeInclusive};
 
-use self::numeric_types::{DefaultNumericTypes, EvalexprNumericTypes};
+use self::numeric_types::{default_numeric_types::DefaultNumericTypes, EvalexprNumericTypes};
 
 mod display;
 pub mod numeric_types;
@@ -276,7 +276,9 @@ impl<NumericTypes: EvalexprNumericTypes> TryFrom<Value<NumericTypes>> for () {
 
 #[cfg(test)]
 mod tests {
-    use crate::value::{numeric_types::DefaultNumericTypes, TupleType, Value};
+    use crate::value::{
+        numeric_types::default_numeric_types::DefaultNumericTypes, TupleType, Value,
+    };
 
     #[test]
     fn test_value_conversions() {