Minor fixes

Author: karusb

CMakeLists.txt

@@ -11,8 +11,8 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 include(GNUInstallDirs)
-add_library(BazPO INTERFACE
-            include/BazPO.hpp)
+
+add_library(BazPO INTERFACE)
 
 target_include_directories(
   BazPO

include/BazPO.hpp

@@ -454,12 +454,14 @@ namespace BazPO
         {
             if (pair.second.Mandatory && !pair.second.Exists)
             {
-                *m_outputStream << pair.second.Parameter << " is a required parameter" << std::endl;
+                PrintOptionUsage(pair.second);
+                *m_outputStream << " is a required parameter" << std::endl;
                 if (m_askInputForMandatoryOptions)
                 {
+                    PrintOptionUsage(pair.second);
+                    *m_outputStream << ": ";
                     std::string temp;
-                    *m_outputStream << pair.second.Parameter << ": " << std::endl;
-                    *m_inputStream >> temp;
+                    std::getline(*m_inputStream, temp);
 
                     m_inputStorage.push_back(temp);
                     pair.second.Value = m_inputStorage.back().c_str();
@@ -566,10 +568,18 @@ namespace BazPO
             str.append("[").append(value).append("]");
         return str;
     }
-
+    namespace _detail
+    {
+        class OptionMismatchException
+            : public std::exception
+        {
+            const char* err = "Tagless options cannot be combined with other options!";
+            virtual const char* what() const noexcept override { return err; };
+        };
+    }
     void Cli::ThrowOnOptionMismatch(bool tagless)
     {
-        std::exception e("Tagless options cannot be combined with other options!");
+        _detail::OptionMismatchException e;
         if ((IsTagless() && IsNormal()) || (!IsTagless() && tagless) || (IsNormal() && tagless))
             throw e;
     }

manualtest/BazPOManual.cpp

@@ -15,8 +15,9 @@ int main(int argc,const char* argv[])
     auto aoption = po.GetOption("-a");
 
     std::cout << "EXISTS:" << aoption.exists() << std::endl;
+    std::cout << "VALUE:" << aoption.value() << std::endl;
     std::cout << "INT:" << aoption.value_as<int>() << std::endl;
     std::cout << "BOOL:" << aoption.value_bool() << std::endl;
-    std::cout << aoption.value();
+
     while (1);
 }

test/CMakeLists.txt

@@ -8,7 +8,6 @@ FetchContent_Declare(
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 enable_testing()
-
 add_executable(
   BazPOTest
   test.cpp

test/test.cpp

@@ -359,6 +359,38 @@ TEST_F(ProgramOptionsTest, mandatory_option_asked_when_not_provided) {
     EXPECT_EQ(std::string("input"), a.value());
 }
 
+TEST_F(ProgramOptionsTest, multi_line_input_parsed_correctly) {
+    int argc = 1;
+    const char* argv[] = { "programoptions" };
+    std::stringstream str("input input2 input3");
+    Cli po(argc, argv);
+    po.UserInputRequiredForAbsentMandatoryOptions();
+    po.Add("-a", "--alpha", "Option A", true);
+    po.ChangeIO(&std::cout, &str);
+
+    po.ParseArguments();
+
+    auto a = po.GetOption("-a");
+    EXPECT_EQ(true, a.exists());
+    EXPECT_EQ(std::string("input input2 input3"), a.value());
+}
+
+TEST_F(ProgramOptionsTest, multi_line_double_parsed_correctly) {
+    int argc = 1;
+    const char* argv[] = { "programoptions" };
+    std::stringstream str("15.87396509125677 \r\n");
+    Cli po(argc, argv);
+    po.UserInputRequiredForAbsentMandatoryOptions();
+    po.Add("-a", "--alpha", "Option A", true);
+    po.ChangeIO(&std::cout, &str);
+
+    po.ParseArguments();
+
+    auto a = po.GetOption("-a");
+    EXPECT_EQ(true, a.exists());
+    EXPECT_EQ(15.87396509125677, a.value_as<double>());
+}
+
 TEST_F(ProgramOptionsTest, function_option_executes_successfully) {
     bool executed = false;
     int argc = 2;