From 104ae73748d350b5cc292646f5f851bff96ee947 Mon Sep 17 00:00:00 2001 From: hop311 Date: Sun, 15 Oct 2023 20:38:34 +0100 Subject: allow_empty option for expect_identifier_or_string --- src/openvic-simulation/dataloader/NodeTools.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/openvic-simulation/dataloader/NodeTools.cpp') diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp index c2edb18..77eafcd 100644 --- a/src/openvic-simulation/dataloader/NodeTools.cpp +++ b/src/openvic-simulation/dataloader/NodeTools.cpp @@ -43,15 +43,15 @@ node_callback_t NodeTools::expect_string(callback_t callback, return _expect_type(_abstract_string_node_callback(callback, allow_empty)); } -node_callback_t NodeTools::expect_identifier_or_string(callback_t callback) { - return [callback](ast::NodeCPtr node) -> bool { +node_callback_t NodeTools::expect_identifier_or_string(callback_t callback, bool allow_empty) { + return [callback, allow_empty](ast::NodeCPtr node) -> bool { if (node != nullptr) { ast::AbstractStringNode const* cast_node = node->cast_to(); if (cast_node == nullptr) { cast_node = node->cast_to(); } if (cast_node != nullptr) { - return _abstract_string_node_callback(callback, false)(*cast_node); + return _abstract_string_node_callback(callback, allow_empty)(*cast_node); } Logger::error("Invalid node type ", node->get_type(), " when expecting ", ast::IdentifierNode::get_type_static(), " or ", ast::StringNode::get_type_static()); } else { -- cgit v1.2.3-56-ga3b1