feat: handled all possible signal returns

Author: raphael-goetz

src/context/context.rs

@@ -1,3 +1 @@
-pub struct Context {
-    
-}
+pub struct Context {}

src/context/mod.rs

@@ -1,5 +1,5 @@
-pub mod signal;
 pub mod context;
+pub mod signal;
 
 use crate::error::RuntimeError;
 use std::{
@@ -26,10 +26,7 @@ pub struct ContextEntry {
 
 impl ContextEntry {
     pub fn new(result: NodeResult, parameter: Vec<Value>) -> Self {
-        ContextEntry {
-            result: result,
-            parameter: parameter,
-        }
+        ContextEntry { result, parameter }
     }
 }
 
@@ -53,6 +50,12 @@ pub struct Context {
     context_history: VecDeque<(i32, i32)>,
 }
 
+impl Default for Context {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Context {
     /// Create a new, empty context.
     pub fn new() -> Self {

src/context/signal.rs

@@ -1,5 +1,5 @@
-use tucana::shared::Value;
 use crate::error::RuntimeError;
+use tucana::shared::Value;
 
 #[derive(Debug)]
 pub enum Signal {
@@ -15,12 +15,12 @@ pub enum Signal {
     // - will break the current context and return the value to the upper node
     Return(Value),
     // Will be signaled if the `respond` function has been executed
-    // - will stop the execution of the flow completly 
+    // - will stop the execution of the flow completly
     // - will return the value to the adapter
     Respond(Value),
     // Will be signaled if the `stop` function has been executed
-    // - will stop the execution of the flow completly 
-    Stop
+    // - will stop the execution of the flow completly
+    Stop,
 }
 
 impl PartialEq for Signal {

src/executor/mod.rs

@@ -14,16 +14,18 @@ pub struct Executor<'a> {
 type HandleNodeParameterFn = fn(&mut Executor, node_parameter: &NodeParameter) -> Signal;
 
 impl<'a> Executor<'a> {
- 
-    pub fn new(functions: &'a FunctionStore, nodes: HashMap<i64, NodeFunction>, context: Context) -> Self {
+    pub fn new(
+        functions: &'a FunctionStore,
+        nodes: HashMap<i64, NodeFunction>,
+        context: Context,
+    ) -> Self {
         Executor {
             functions,
             nodes,
-            context
+            context,
         }
     }
 
-
     pub fn execute(&mut self, starting_node_id: i64) -> Signal {
         let mut current_node_id = starting_node_id;
 
@@ -47,7 +49,7 @@ impl<'a> Executor<'a> {
                     }
                     Signal::Failure(error) => return Signal::Failure(error),
                     Signal::Stop => return Signal::Stop,
-                    Signal::Respond(value) => return Signal::Respond(value)
+                    Signal::Respond(value) => return Signal::Respond(value),
                 }
             }
 
@@ -91,16 +93,22 @@ impl<'a> Executor<'a> {
 
         let value = match &node_value.value {
             Some(v) => v,
-            None => return Signal::Failure(RuntimeError::simple_str("NodeValueNotFound", "An error occurred while executing a flow!")) 
+            None => {
+                return Signal::Failure(RuntimeError::simple_str(
+                    "NodeValueNotFound",
+                    "An error occurred while executing a flow!",
+                ));
+            }
         };
 
         match value {
-            tucana::shared::node_value::Value::LiteralValue(value) => return Signal::Success(value.clone()),
-            tucana::shared::node_value::Value::ReferenceValue(_reference_value) => todo!("implement reference values!"),
-            tucana::shared::node_value::Value::NodeFunctionId(id) => {
-                return Executor::execute(self, *id)
-            },
+            tucana::shared::node_value::Value::LiteralValue(value) => {
+                Signal::Success(value.clone())
+            }
+            tucana::shared::node_value::Value::ReferenceValue(_reference_value) => {
+                todo!("implement reference values!")
+            }
+            tucana::shared::node_value::Value::NodeFunctionId(id) => Executor::execute(self, *id),
         }
     }
 }
-

src/implementation/array.rs

@@ -54,7 +54,7 @@ fn at(values: &[Value], _ctx: &mut Context) -> Signal {
         ));
     };
 
-    let item = array.values[index.clone() as usize].clone();
+    let item = array.values[*index as usize].clone();
 
     Signal::Success(item)
 }
@@ -709,7 +709,7 @@ fn min(values: &[Value], _ctx: &mut Context) -> Signal {
 
     match min {
         Some(min) => Signal::Success(Value {
-            kind: Some(Kind::NumberValue(min.clone())),
+            kind: Some(Kind::NumberValue(*min)),
         }),
         None => Signal::Failure(RuntimeError::simple(
             "ArrayEmptyRuntimeError",
@@ -748,7 +748,7 @@ fn max(values: &[Value], _ctx: &mut Context) -> Signal {
 
     match max {
         Some(max) => Signal::Success(Value {
-            kind: Some(Kind::NumberValue(max.clone())),
+            kind: Some(Kind::NumberValue(*max)),
         }),
         None => Signal::Failure(RuntimeError::simple(
             "ArrayEmptyRuntimeError",
@@ -817,7 +817,7 @@ fn join(values: &[Value], _ctx: &mut Context) -> Signal {
         }
     });
 
-    let joined = collector.join(&separator);
+    let joined = collector.join(separator);
 
     Signal::Success(Value {
         kind: Some(Kind::StringValue(joined)),

src/implementation/boolean.rs

@@ -27,7 +27,7 @@ fn as_number(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(value.clone() as i64 as f64)),
+        kind: Some(Kind::NumberValue(*value as i64 as f64)),
     })
 }
 

src/implementation/control.rs

@@ -1,7 +1,7 @@
 use tucana::shared::Value;
 
-use crate::{context::Context, error::RuntimeError, registry::HandlerFn};
 use crate::context::signal::Signal;
+use crate::{context::Context, error::RuntimeError, registry::HandlerFn};
 
 pub fn collect_control_functions() -> Vec<(&'static str, HandlerFn)> {
     vec![

src/implementation/http.rs

@@ -152,7 +152,7 @@ fn create_response(values: &[Value], _ctx: &mut Context) -> Signal {
     fields.insert(
         "status_code".to_string(),
         Value {
-            kind: Some(Kind::NumberValue(http_status_code.clone())),
+            kind: Some(Kind::NumberValue(*http_status_code)),
         },
     );
 
@@ -168,4 +168,3 @@ fn create_response(values: &[Value], _ctx: &mut Context) -> Signal {
         kind: Some(Kind::StructValue(Struct { fields })),
     })
 }
-

src/implementation/mod.rs

@@ -3,10 +3,10 @@ use crate::registry::HandlerFn;
 mod array;
 mod boolean;
 mod control;
+mod http;
 mod number;
 mod object;
 mod text;
-mod http;
 
 pub fn collect() -> Vec<(&'static str, HandlerFn)> {
     let mut result = vec![];

src/implementation/number.rs

@@ -322,7 +322,7 @@ fn exponential(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(base.powf(exponent.clone()))),
+        kind: Some(Kind::NumberValue(base.powf(*exponent))),
     })
 }
 
@@ -363,7 +363,7 @@ fn round_up(values: &[Value], _ctx: &mut Context) -> Signal {
         ));
     };
 
-    let factor = 10_f64.powi(decimal_places.clone() as i32);
+    let factor = 10_f64.powi(*decimal_places as i32);
 
     Signal::Success(Value {
         kind: Some(Kind::NumberValue((value * factor).ceil() / factor)),
@@ -389,7 +389,7 @@ fn round_down(values: &[Value], _ctx: &mut Context) -> Signal {
         ));
     };
 
-    let factor = 10_f64.powi(decimal_places.clone() as i32);
+    let factor = 10_f64.powi(*decimal_places as i32);
 
     Signal::Success(Value {
         kind: Some(Kind::NumberValue((value * factor).floor() / factor)),
@@ -415,7 +415,7 @@ fn round(values: &[Value], _ctx: &mut Context) -> Signal {
         ));
     };
 
-    let factor = 10_f64.powi(decimal_places.clone() as i32);
+    let factor = 10_f64.powi(*decimal_places as i32);
 
     Signal::Success(Value {
         kind: Some(Kind::NumberValue((value * factor).round() / factor)),
@@ -460,7 +460,7 @@ fn root(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(value.powf(root.clone()))),
+        kind: Some(Kind::NumberValue(value.powf(*root))),
     })
 }
 
@@ -484,7 +484,7 @@ fn log(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(value.log(log.clone()))),
+        kind: Some(Kind::NumberValue(value.log(*log))),
     })
 }
 
@@ -572,7 +572,7 @@ fn min(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(lhs.min(rhs.clone()))),
+        kind: Some(Kind::NumberValue(lhs.min(*rhs))),
     })
 }
 
@@ -596,7 +596,7 @@ fn max(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(lhs.max(rhs.clone()))),
+        kind: Some(Kind::NumberValue(lhs.max(*rhs))),
     })
 }
 
@@ -638,9 +638,7 @@ fn random(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(rand::random_range(
-            min.clone()..max.clone(),
-        ))),
+        kind: Some(Kind::NumberValue(rand::random_range(*min..*max))),
     })
 }
 
@@ -810,7 +808,7 @@ fn clamp(values: &[Value], _ctx: &mut Context) -> Signal {
     };
 
     Signal::Success(Value {
-        kind: Some(Kind::NumberValue(value.clamp(min.clone(), max.clone()))),
+        kind: Some(Kind::NumberValue(value.clamp(*min, *max))),
     })
 }