Interruptible list value enumeration.

Author: kovacsv

Sources/BuiltInNodes/BI_BinaryOperationNodes.cpp

@@ -46,8 +46,7 @@ NE::ValueConstPtr BinaryOperationNode::Calculate (NE::EvaluationEnv& env) const
 	}
 
 	if (NE::IsSingleValue (aValue) && NE::IsSingleValue (bValue)) {
-		NE::ValuePtr result = DoSingleOperation (aValue, bValue);
-		return result;
+		return DoSingleOperation (aValue, bValue);
 	} else {
 		NE::ListValuePtr resultListValue (new NE::ListValue ());
 		std::shared_ptr<ValueCombinationFeature> valueCombination = GetValueCombinationFeature (this);

Sources/BuiltInNodes/BI_InputUINodes.cpp

@@ -787,6 +787,7 @@ NE::ValueConstPtr ListBuilderNode::Calculate (NE::EvaluationEnv& env) const
 	NE::ListValuePtr list (new NE::ListValue ());
 	NE::FlatEnumerate (in, [&] (const NE::ValueConstPtr& innerVal) {
 		list->Push (innerVal);
+		return true;
 	});
 	return list;
 }

Sources/BuiltInNodes/BI_ViewerUINodes.cpp

@@ -103,6 +103,7 @@ void MultiLineViewerNode::Layout::GetTextInfo (const BasicUINode& uiNode,
 				} else {
 					texts.push_back (NE::LocalizeString (L"<empty>"));
 				}
+				return true;
 			});
 		}
 	}

Sources/NodeEngine/NE_Value.cpp

@@ -155,11 +155,14 @@ const NE::ValueConstPtr& ListValue::GetValue (size_t index) const
 	return values[index];
 }
 
-void ListValue::Enumerate (const std::function<void (const ValueConstPtr&)>& processor) const
+bool ListValue::Enumerate (const std::function<bool (const ValueConstPtr&)>& processor) const
 {
 	for (const ValueConstPtr& value : values) {
-		processor (value);
+		if (!processor (value)) {
+			return false;
+		}
 	}
+	return true;
 }
 
 void ListValue::Push (const ValueConstPtr& value)
@@ -183,9 +186,9 @@ const NE::ValueConstPtr& ValueToListValueAdapter::GetValue (size_t) const
 	return val;
 }
 
-void ValueToListValueAdapter::Enumerate (const std::function<void (const ValueConstPtr&)>& processor) const
+bool ValueToListValueAdapter::Enumerate (const std::function<bool (const ValueConstPtr&)>& processor) const
 {
-	processor (val);
+	return processor (val);
 }
 
 bool IsSingleValue (const ValueConstPtr& value)
@@ -227,19 +230,21 @@ IListValueConstPtr CreateListValue (const ValueConstPtr& value)
 	return nullptr;
 }
 
-void FlatEnumerate (const ValueConstPtr& value, const std::function<void (const ValueConstPtr&)>& processor)
+bool FlatEnumerate (const ValueConstPtr& value, const std::function<bool (const ValueConstPtr&)>& processor)
 {
 	if (value == nullptr) {
-		processor (value);
-		return;
+		return processor (value);
 	}
 	IListValueConstPtr listValue = CreateListValue (value);
-	listValue->Enumerate ([&] (const ValueConstPtr& innerValue) {
+	return listValue->Enumerate ([&] (const ValueConstPtr& innerValue) {
 		if (Value::IsType<SingleValue> (innerValue)) {
-			processor (innerValue);
+			if (!processor (innerValue)) {
+				return false;
+			}
 		} else {
-			FlatEnumerate (innerValue, processor);
+			return FlatEnumerate (innerValue, processor);
 		}
+		return true;
 	});
 }
 
@@ -248,6 +253,7 @@ ValueConstPtr FlattenValue (const ValueConstPtr& value)
 	ListValuePtr listValue (new ListValue ());
 	FlatEnumerate (value, [&] (const ValueConstPtr& value) {
 		listValue->Push (value);
+		return true;
 	});
 	return listValue;
 }

Sources/NodeEngine/NE_Value.hpp

@@ -127,7 +127,7 @@ class IListValue
 
 	virtual size_t					GetSize () const = 0;
 	virtual const ValueConstPtr&	GetValue (size_t index) const = 0;
-	virtual void					Enumerate (const std::function<void (const ValueConstPtr&)>& processor) const = 0;
+	virtual bool					Enumerate (const std::function<bool (const ValueConstPtr&)>& processor) const = 0;
 };
 
 class ListValue :	public Value,
@@ -147,7 +147,7 @@ class ListValue :	public Value,
 
 	virtual size_t					GetSize () const override;
 	virtual const ValueConstPtr&	GetValue (size_t index) const override;
-	virtual void					Enumerate (const std::function<void (const ValueConstPtr&)>& processor) const override;
+	virtual bool					Enumerate (const std::function<bool (const ValueConstPtr&)>& processor) const override;
 
 	void							Push (const ValueConstPtr& value);
 
@@ -162,7 +162,7 @@ class ValueToListValueAdapter : public IListValue
 
 	virtual size_t					GetSize () const override;
 	virtual const ValueConstPtr&	GetValue (size_t index) const override;
-	virtual void					Enumerate (const std::function<void (const ValueConstPtr&)>& processor) const override;
+	virtual bool					Enumerate (const std::function<bool (const ValueConstPtr&)>& processor) const override;
 
 private:
 	const ValueConstPtr& val;
@@ -199,6 +199,7 @@ bool IsComplexType (const ValueConstPtr& val)
 			if (!IsComplexType<Type> (innerVal)) {
 				isType = false;
 			}
+			return isType;
 		});
 		return isType;
 	}
@@ -211,7 +212,7 @@ bool				IsListValue (const ValueConstPtr& value);
 ValueConstPtr		CreateSingleValue (const ValueConstPtr& value);
 IListValueConstPtr	CreateListValue (const ValueConstPtr& value);
 
-void				FlatEnumerate (const ValueConstPtr& value, const std::function<void (const ValueConstPtr&)>& processor);
+bool				FlatEnumerate (const ValueConstPtr& value, const std::function<bool (const ValueConstPtr&)>& processor);
 ValueConstPtr		FlattenValue (const ValueConstPtr& value);
 
 }

Sources/NodeEngineTest/BinaryOperationNodesTest.cpp

@@ -40,9 +40,11 @@ TEST (TestAdditionNodeWithList)
 
 	ValueConstPtr val = op->Evaluate (EmptyEvaluationEnv);
 	ASSERT (Value::IsType<ListValue> (val));
+	ASSERT (IsComplexType<NumberValue> (val));
 	std::vector<double> values;
 	FlatEnumerate (val, [&] (const ValueConstPtr& v) {
 		values.push_back (NumberValue::ToDouble (v));
+		return true;
 	});
 	ASSERT (values == std::vector<double> ({ 0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 12.0, 14.0, 16.0, 18.0 }));
 }

Sources/NodeEngineTest/ListValueNodeTest.cpp

@@ -77,6 +77,7 @@ class ListSummer : public SerializableTestNode
 		if (IsComplexType<NumberValue> (val)) {
 			NE::FlatEnumerate (val, [&] (const NE::ValueConstPtr& value) {
 				result += IntValue::Get (value);
+				return true;
 			});
 		}
 		return ValueConstPtr (new IntValue (result));

Sources/NodeEngineTest/MultiInputSlotTest.cpp

@@ -81,6 +81,7 @@ class FlattenerNode : public SerializableTestNode
 		ListValuePtr result (new ListValue ());
 		FlatEnumerate (val, [&] (const ValueConstPtr& flatVal) {
 			result->Push (flatVal->Clone ());
+			return true;
 		});
 		return result;
 	}

Sources/NodeEngineTest/NodeConnectionTest.cpp

@@ -186,6 +186,7 @@ class MultiAdditionNode : public SerializableTestNode
 		int sum = 0;
 		FlatEnumerate (result, [&] (const ValueConstPtr& val) {
 			sum += IntValue::Get (val);
+			return true;
 		});
 		return ValuePtr (new IntValue (sum));
 	}