From 59ac676daebf7f6c81f8b127b12fb2d7024848a5 Mon Sep 17 00:00:00 2001
From: Ben Cumming <bcumming@cscs.ch>
Date: Thu, 27 May 2021 17:24:03 +0200
Subject: [PATCH] correctly forward wrapped error type (#1556)
The C++ label parse code was returning the error type in the value part of a `parse_hopefully<std::any>`,
and not in the error slot.
---
arbor/morph/label_parse.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arbor/morph/label_parse.cpp b/arbor/morph/label_parse.cpp
index 855e6e7a..7321bdef 100644
--- a/arbor/morph/label_parse.cpp
+++ b/arbor/morph/label_parse.cpp
@@ -352,7 +352,7 @@ parse_hopefully<std::any> eval(const s_expr& e) {
// Evaluate the arguments, and return error state if an error occurred.
auto args = eval_args(e.tail());
if (!args) {
- return args.error();
+ return util::unexpected(args.error());
}
// Find all candidate functions that match the name of the function.
--
GitLab