From 2e8a411df8ef5d34528183a5c962b4f2abb31ec3 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 9 Nov 2016 11:30:11 +0100 Subject: [PATCH] VizFwk : Added support for optional multiple arguments to a command line option --- Fwk/VizFwk/LibCore/cvfProgramOptions.cpp | 4 ++++ Fwk/VizFwk/LibCore/cvfProgramOptions.h | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Fwk/VizFwk/LibCore/cvfProgramOptions.cpp b/Fwk/VizFwk/LibCore/cvfProgramOptions.cpp index 65b2cbd494..4a97b4ca72 100644 --- a/Fwk/VizFwk/LibCore/cvfProgramOptions.cpp +++ b/Fwk/VizFwk/LibCore/cvfProgramOptions.cpp @@ -90,6 +90,10 @@ public: CVF_ASSERT(numParsedValues <= 1); return (numParsedValues == 1) ? true : false; } + else if (m_spec->m_valueReq == OPTIONAL_MULTI_VALUE) + { + return true; + } else { return (numParsedValues >= 1) ? true : false; diff --git a/Fwk/VizFwk/LibCore/cvfProgramOptions.h b/Fwk/VizFwk/LibCore/cvfProgramOptions.h index 57408ea31b..9d6f93584b 100644 --- a/Fwk/VizFwk/LibCore/cvfProgramOptions.h +++ b/Fwk/VizFwk/LibCore/cvfProgramOptions.h @@ -94,9 +94,10 @@ public: enum ValueReq { - NO_VALUE, // A flag option that does not accept any values - SINGLE_VALUE, // Option requires exactly one single value, no more, no less - MULTI_VALUE // Option requires one or more values + NO_VALUE, // A flag option that does not accept any values + SINGLE_VALUE, // Option requires exactly one single value, no more, no less + MULTI_VALUE, // Option requires one or more values + OPTIONAL_MULTI_VALUE // Option can have none, one or more values }; enum OptionFlag