Various fixes, refactors and general cleanup

1 files changed, 14 insertions, 0 deletions

diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp
index 7dd6e16..2367f86 100644
--- a/src/openvic-simulation/dataloader/NodeTools.cpp
+++ b/src/openvic-simulation/dataloader/NodeTools.cpp
@@ -220,6 +220,20 @@ node_callback_t NodeTools::expect_list(node_callback_t callback) {
 	return expect_list_and_length(default_length_callback, callback);
 }
 
+node_callback_t NodeTools::expect_length(callback_t<size_t> callback) {
+	return [callback](ast::NodeCPtr node) -> bool {
+		bool ret = true;
+		ret &= expect_list_and_length(
+			[callback, &ret](size_t size) -> size_t {
+				ret &= callback(size);
+				return 0;
+			},
+			success_callback
+		)(node);
+		return ret;
+	};
+}
+
 node_callback_t NodeTools::expect_dictionary_and_length(length_callback_t length_callback, key_value_callback_t callback) {
 	return expect_list_and_length(length_callback, expect_assign(callback));
 }