diff options
Diffstat (limited to 'build2/variable.txx')
| -rw-r--r-- | build2/variable.txx | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/build2/variable.txx b/build2/variable.txx index 7bb30e9..7d16408 100644 --- a/build2/variable.txx +++ b/build2/variable.txx @@ -63,17 +63,13 @@ namespace build2 catch (const invalid_argument&) {} // Fall through. } - { - diag_record dr (error); - - dr << "invalid " << value_traits<T>::value_type.name - << " value '" << ns << "'"; + diag_record dr (fail); - if (var != nullptr) - dr << " in variable " << var->name; - } + dr << "invalid " << value_traits<T>::value_type.name + << " value '" << ns << "'"; - throw failed (); + if (var != nullptr) + dr << " in variable " << var->name; } template <typename T, bool empty> @@ -97,17 +93,13 @@ namespace build2 catch (const invalid_argument&) {} // Fall through. } - { - diag_record dr (error); + diag_record dr (fail); - dr << "invalid " << value_traits<T>::value_type.name - << " value '" << ns << "'"; + dr << "invalid " << value_traits<T>::value_type.name + << " value '" << ns << "'"; - if (var != nullptr) - dr << " in variable " << var->name; - } - - throw failed (); + if (var != nullptr) + dr << " in variable " << var->name; } template <typename T, bool empty> @@ -131,17 +123,13 @@ namespace build2 catch (const invalid_argument&) {} // Fall through. } - { - diag_record dr (error); - - dr << "invalid " << value_traits<T>::value_type.name - << " value '" << ns << "'"; + diag_record dr (fail); - if (var != nullptr) - dr << " in variable " << var->name; - } + dr << "invalid " << value_traits<T>::value_type.name + << " value '" << ns << "'"; - throw failed (); + if (var != nullptr) + dr << " in variable " << var->name; } template <typename T> |