Test and fix math_consts_context! macro (#174)

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [12.0.1](https://github.com/ISibboI/evalexpr/compare/12.0.0...12.0.1) - 2024-10-25
+
+### Fixed
+
+ * Fixed the `math_consts_context!` macro that was broken by in 12.0.0 (#173)
+
+### Contributors
+
+My warmhearted thanks goes to:
+
+ * [jeffrey182](https://github.com/jeffrey182)
+
 ## [12.0.0](https://github.com/ISibboI/evalexpr/compare/11.3.1...12.0.0) - 2024-10-17
 
 ### Changed

Cargo.toml

@@ -23,8 +23,8 @@ name = "evalexpr"
 path = "src/lib.rs"
 
 [dependencies]
-regex = { version = "1.11.0", optional = true }
-serde = { version = "1.0.210", features = ["derive"], optional = true }
+regex = { version = "1.11.1", optional = true }
+serde = { version = "1.0.213", features = ["derive"], optional = true }
 rand = { version = "0.8.5", optional = true }
 
 [features]

src/context/mod.rs

@@ -419,12 +419,12 @@ macro_rules! context_map {
     }};
     // add an integer value, and chain the eventual error with the ones in the next values
     ( ($ctx:expr) $k:expr => int $v:expr , $($tt:tt)*) => {{
-        $crate::ContextWithMutableVariables::set_value($ctx, $k.into(), Value::from_int($v.into()))
+        $crate::ContextWithMutableVariables::set_value($ctx, $k.into(), $crate::Value::from_int($v.into()))
             .and($crate::context_map!(($ctx) $($tt)*))
     }};
     // add a float value, and chain the eventual error with the ones in the next values
     ( ($ctx:expr) $k:expr => float $v:expr , $($tt:tt)*) => {{
-        $crate::ContextWithMutableVariables::set_value($ctx, $k.into(), Value::from_float($v.into()))
+        $crate::ContextWithMutableVariables::set_value($ctx, $k.into(), $crate::Value::from_float($v.into()))
             .and($crate::context_map!(($ctx) $($tt)*))
     }};
     // add a value, and chain the eventual error with the ones in the next values

src/context/predefined/mod.rs

@@ -28,11 +28,28 @@ macro_rules! math_consts_context {
         )
     };
     ($($name:ident),*) => {{
-        use $crate::ContextWithMutableVariables;
         $crate::context_map! {
             $(
-                stringify!($name) => core::f64::consts::$name,
+                stringify!($name) => float core::f64::consts::$name,
             )*
         }
     }};
 }
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn math_consts_context() {
+        let context: crate::HashMapContext = math_consts_context!().unwrap();
+
+        {
+            use crate::{Context, Value};
+
+            assert_eq!(
+                context.get_value("PI"),
+                Some(&Value::Float(core::f64::consts::PI))
+            );
+        }
+    }
+}