Add Node shortcut evaluations for Value::Empty

Relates to #28

src/function/mod.rs

@@ -12,7 +12,7 @@ pub(crate) mod builtin;
 /// use evalexpr::*;
 ///
 /// let mut context = HashMapContext::new();
-/// context.set_function("id", Function::new(Some(1), Box::new(|arguments| {
+/// context.set_function("id".into(), Function::new(Some(1), Box::new(|arguments| {
 ///     Ok(arguments[0].clone())
 /// }))).unwrap(); // Do proper error handling here
 /// assert_eq!(eval_with_context("id(4)", &context), Ok(Value::from(4)));

src/lib.rs

@@ -282,7 +282,9 @@ pub use error::{EvalexprError, EvalexprResult};
 pub use function::Function;
 pub use interface::*;
 pub use tree::Node;
-pub use value::{EmptyType, FloatType, IntType, TupleType, Value, value_type::ValueType};
+pub use value::{
+    EMPTY_VALUE, EmptyType, FloatType, IntType, TupleType, Value, value_type::ValueType,
+};
 
 mod context;
 pub mod error;

src/tree/mod.rs

@@ -1,8 +1,9 @@
 use EmptyContext;
+use EmptyType;
 use FloatType;
 use IntType;
 use token::Token;
-use value::TupleType;
+use value::{EMPTY_VALUE, TupleType};
 
 use crate::{
     context::Context,
@@ -145,6 +146,17 @@ impl Node {
         }
     }
 
+    /// Evaluates the operator tree rooted at this node into an empty value with an the given context.
+    ///
+    /// Fails, if one of the operators in the expression tree fails.
+    pub fn eval_empty_with_context(&self, context: &Context) -> EvalexprResult<EmptyType> {
+        match self.eval_with_context(context) {
+            Ok(Value::Empty) => Ok(EMPTY_VALUE),
+            Ok(value) => Err(EvalexprError::expected_empty(value)),
+            Err(error) => Err(error),
+        }
+    }
+
     /// Evaluates the operator tree rooted at this node into a string with an the given mutable context.
     ///
     /// Fails, if one of the operators in the expression tree fails.
@@ -213,6 +225,17 @@ impl Node {
         }
     }
 
+    /// Evaluates the operator tree rooted at this node into an empty value with an the given mutable context.
+    ///
+    /// Fails, if one of the operators in the expression tree fails.
+    pub fn eval_empty_with_context_mut(&self, context: &mut Context) -> EvalexprResult<EmptyType> {
+        match self.eval_with_context_mut(context) {
+            Ok(Value::Empty) => Ok(EMPTY_VALUE),
+            Ok(value) => Err(EvalexprError::expected_empty(value)),
+            Err(error) => Err(error),
+        }
+    }
+
     /// Evaluates the operator tree rooted at this node into a string with an empty context.
     ///
     /// Fails, if one of the operators in the expression tree fails.
@@ -256,6 +279,13 @@ impl Node {
         self.eval_tuple_with_context(&EmptyContext)
     }
 
+    /// Evaluates the operator tree rooted at this node into an empty value with an empty context.
+    ///
+    /// Fails, if one of the operators in the expression tree fails.
+    pub fn eval_empty(&self) -> EvalexprResult<EmptyType> {
+        self.eval_empty_with_context(&EmptyContext)
+    }
+
     fn children(&self) -> &[Node] {
         &self.children
     }

src/value/mod.rs

@@ -15,6 +15,9 @@ pub type TupleType = Vec<Value>;
 /// The type used to represent empty values in `Value::Empty`.
 pub type EmptyType = ();
 
+/// The value of the empty type to be used in rust.
+pub const EMPTY_VALUE: () = ();
+
 /// The value type used by the parser.
 /// Values can be of different subtypes that are the variants of this enum.
 #[derive(Clone, Debug, PartialEq)]

tests/integration.rs

@@ -234,7 +234,17 @@ fn test_n_ary_functions() {
             "count".into(),
             Function::new(
                 None,
-                Box::new(|arguments| Ok(Value::Int(arguments.len() as IntType))),
+                Box::new(|arguments| {
+                    if arguments.len() == 1 {
+                        if arguments[0] == Value::Empty {
+                            Ok(Value::Int(0))
+                        } else {
+                            Ok(Value::Int(1))
+                        }
+                    } else {
+                        Ok(Value::Int(arguments.len() as IntType))
+                    }
+                }),
             ),
         )
         .unwrap();
@@ -259,13 +269,7 @@ fn test_n_ary_functions() {
         eval_with_context("muladd(3, 6, -4)", &context),
         Ok(Value::Int(14))
     );
-    assert_eq!(
+    assert_eq!(eval_with_context("count()", &context), Ok(Value::Int(0)));
-        eval_with_context("count()", &context),
-        Err(EvalexprError::WrongOperatorArgumentAmount {
-            actual: 0,
-            expected: 1
-        })
-    );
     assert_eq!(
         eval_with_context("count(3, 5.5, 2)", &context),
         Ok(Value::Int(3))
@@ -407,6 +411,12 @@ fn test_shortcut_functions() {
             .eval_tuple_with_context(&context),
         Ok(vec![Value::Int(3), Value::Int(3)])
     );
+    assert_eq!(
+        build_operator_tree("")
+            .unwrap()
+            .eval_empty_with_context(&context),
+        Ok(EMPTY_VALUE)
+    );
 
     assert_eq!(
         eval_string_with_context_mut("string", &mut context),
@@ -458,9 +468,20 @@ fn test_shortcut_functions() {
     assert_eq!(
         build_operator_tree("3,3")
             .unwrap()
-            .eval_tuple_with_context(&mut context),
+            .eval_tuple_with_context_mut(&mut context),
         Ok(vec![Value::Int(3), Value::Int(3)])
     );
+    assert_eq!(
+        build_operator_tree("")
+            .unwrap()
+            .eval_empty_with_context_mut(&mut context),
+        Ok(EMPTY_VALUE)
+    );
+}
+
+#[test]
+fn test_whitespace() {
+    assert!(eval_boolean("2 < = 3").is_err());
 }
 
 #[cfg(feature = "serde")]