From 4a4a1649522ae837746d2bd195050621e176f451 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Thu, 9 Nov 2017 19:40:42 +0000 Subject: COMPMID-556: When an EnumListOption contains some invalid values: still keep the valid ones Change-Id: I4f5acc9af09587f0ec46482f6aea737fa42f35fc Reviewed-on: http://mpd-gerrit.cambridge.arm.com/95186 Tested-by: Kaizen Reviewed-by: Georgios Pinitas --- tests/framework/command_line/EnumListOption.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tests/framework/command_line') diff --git a/tests/framework/command_line/EnumListOption.h b/tests/framework/command_line/EnumListOption.h index d19bfbdc0f..6155a5da4c 100644 --- a/tests/framework/command_line/EnumListOption.h +++ b/tests/framework/command_line/EnumListOption.h @@ -87,12 +87,12 @@ bool EnumListOption::parse(std::string value) _values.clear(); _is_set = true; - try - { - std::stringstream stream{ value }; - std::string item; + std::stringstream stream{ value }; + std::string item; - while(!std::getline(stream, item, ',').fail()) + while(!std::getline(stream, item, ',').fail()) + { + try { std::stringstream item_stream(item); T typed_value{}; @@ -103,8 +103,8 @@ bool EnumListOption::parse(std::string value) { if(_allowed_values.count(typed_value) == 0) { - _values.clear(); - return false; + _is_set = false; + continue; } _values.emplace_back(typed_value); @@ -112,13 +112,13 @@ bool EnumListOption::parse(std::string value) _is_set = _is_set && !item_stream.fail(); } - - return _is_set; - } - catch(const std::invalid_argument &) - { - return false; + catch(const std::invalid_argument &) + { + _is_set = false; + } } + + return _is_set; } template -- cgit v1.2.1