Reworked ReturnByValue, warn_or_error, expect_date_[identifier_or_]string

1 files changed, 8 insertions, 0 deletions

diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp
index 7ab0dbe..297937a 100644
--- a/src/openvic-simulation/dataloader/NodeTools.cpp
+++ b/src/openvic-simulation/dataloader/NodeTools.cpp
@@ -169,6 +169,14 @@ node_callback_t NodeTools::expect_date(callback_t<Date> callback) {
 	return expect_identifier(expect_date_str(callback));
 }
 
+node_callback_t NodeTools::expect_date_string(callback_t<Date> callback) {
+	return expect_string(expect_date_str(callback));
+}
+
+node_callback_t NodeTools::expect_date_identifier_or_string(callback_t<Date> callback) {
+	return expect_identifier_or_string(expect_date_str(callback));
+}
+
 node_callback_t NodeTools::expect_years(callback_t<Timespan> callback) {
 	return expect_uint<Timespan::day_t>([callback](Timespan::day_t val) -> bool {
 		return callback(Timespan::from_years(val));