From 3cb75b903e12b31acd26075110c5bba64f9d04f8 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Tue, 26 Jun 2018 17:44:44 +0200
Subject: [PATCH] Correcting the logic for sized types in vectors

---
 include/CLI/Option.hpp | 18 ++++++++++++------
 tests/AppTest.cpp      |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 3bb24340..a1e65ffb 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -560,12 +560,18 @@ class Option : public OptionBase<Option> {
             local_result = !callback_(partial_result);
 
         } else {
-            // For now, vector of non size 1 types are not supported but possibility included here
-            if((get_items_expected() > 0 && results_.size() != static_cast<size_t>(get_items_expected())) ||
-               (get_items_expected() < 0 && results_.size() < static_cast<size_t>(-get_items_expected())))
-                throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
-            else
-                local_result = !callback_(results_);
+            // Exact number required
+            if(get_items_expected() > 0) {
+                if(results_.size() != static_cast<size_t>(get_items_expected()))
+                    throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
+                // Variable length list
+            } else if(get_items_expected() < 0) {
+                // Require that this be a multiple of expected size and at least as many as expected
+                if(results_.size() < static_cast<size_t>(-get_items_expected()) ||
+                   results_.size() % static_cast<size_t>(std::abs(get_type_size())) != 0)
+                    throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
+            }
+            local_result = !callback_(results_);
         }
 
         if(local_result)
diff --git a/tests/AppTest.cpp b/tests/AppTest.cpp
index 14b7bdcc..ee4d45dc 100644
--- a/tests/AppTest.cpp
+++ b/tests/AppTest.cpp
@@ -1593,5 +1593,5 @@ TEST_F(TApp, RepeatingMultiArgumentOptions) {
 
     app.reset();
     args.pop_back();
-    ASSERT_THROW(run(), CLI::ValidationError);
+    ASSERT_THROW(run(), CLI::ArgumentMismatch);
 }