revert change to string_generator so it continues to

throw std::runtime_error like it always had before therefore removing a breaking change before release remove one unnecessary code branch in string_generator
camolezi · Nov 11, 2017 · 8a81273 · 8a81273
1 parent 5a48cab
commit 8a81273
Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/doc/uuid.html b/doc/uuid.html
@@ -501,7 +501,7 @@ <h4><a name="String Generator">String Generator</a></h4>
 boost::uuids::uuid u3 = gen(std::string("0123456789abcdef0123456789abcdef"));
 boost::uuids::uuid u4 = gen(std::wstring(L"01234567-89AB-CDEF-0123-456789ABCDEF"));
 </pre>
-Invalid input will generate a std::invalid_argument exception.
+Invalid input will generate a <tt>std::runtime_error</tt> exception.
 
 <h3><a name="boost/uuid/name_generator.hpp" href="./../../boost/uuid/name_generator.hpp">boost/uuid/name_generator.hpp</a></h3>
 <h4><a name="Synopsis_name_generator">Synopsis</a></h4>

diff --git a/include/boost/uuid/string_generator.hpp b/include/boost/uuid/string_generator.hpp
@@ -89,10 +89,6 @@ struct string_generator {
                     } else {
                         throw_invalid();
                     }
-                } else {
-                    if (is_dash(c)) {
-                        throw_invalid();
-                    }
                 }
             }
 
@@ -192,7 +188,7 @@ struct string_generator {
     }
 
     void throw_invalid() const {
-        BOOST_THROW_EXCEPTION(std::invalid_argument("invalid uuid string"));
+        BOOST_THROW_EXCEPTION(std::runtime_error("invalid uuid string"));
     }
 };
 

diff --git a/test/test_string_generator.cpp b/test/test_string_generator.cpp
@@ -63,27 +63,27 @@ int main(int, char*[])
                            'c', 'd', 'e', 'f', '-',
                             0 , '1', '2', '3', '-',  // 0x00 character is intentional
                            '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-    BOOST_TEST_THROWS(gen(std::string(raw, 36)), std::invalid_argument);
+    BOOST_TEST_THROWS(gen(std::string(raw, 36)), std::runtime_error);
 
-    BOOST_TEST_THROWS(gen("01234567-89ab-cdef-0123456789abcdef"), std::invalid_argument);
-    BOOST_TEST_THROWS(gen("01234567-89ab-cdef0123-456789abcdef"), std::invalid_argument);
-    BOOST_TEST_THROWS(gen("01234567-89abcdef-0123-456789abcdef"), std::invalid_argument);
-    BOOST_TEST_THROWS(gen("0123456789ab-cdef-0123-456789abcdef"), std::invalid_argument);
+    BOOST_TEST_THROWS(gen("01234567-89ab-cdef-0123456789abcdef"), std::runtime_error);
+    BOOST_TEST_THROWS(gen("01234567-89ab-cdef0123-456789abcdef"), std::runtime_error);
+    BOOST_TEST_THROWS(gen("01234567-89abcdef-0123-456789abcdef"), std::runtime_error);
+    BOOST_TEST_THROWS(gen("0123456789ab-cdef-0123-456789abcdef"), std::runtime_error);
 
-    BOOST_TEST_THROWS(gen("{01234567-89AB-CDEF-0123-456789abcdef)"), std::invalid_argument);
-    BOOST_TEST_THROWS(gen("{01234567-89AB-CDEF-0123-456789abcdef"), std::invalid_argument);
-    BOOST_TEST_THROWS(gen("01234567-89AB-CDEF-0123-456789abcdef}"), std::invalid_argument);
+    BOOST_TEST_THROWS(gen("{01234567-89AB-CDEF-0123-456789abcdef)"), std::runtime_error);
+    BOOST_TEST_THROWS(gen("{01234567-89AB-CDEF-0123-456789abcdef"), std::runtime_error);
+    BOOST_TEST_THROWS(gen("01234567-89AB-CDEF-0123-456789abcdef}"), std::runtime_error);
 #ifndef BOOST_NO_STD_WSTRING
-    BOOST_TEST_THROWS(gen(std::wstring(L"{01234567-89AB-CDEF-0123-456789abcdef)")), std::invalid_argument);
-    BOOST_TEST_THROWS(gen(std::wstring(L"{01234567-89AB-CDEF-0123-456789abcdef")), std::invalid_argument);
-    BOOST_TEST_THROWS(gen(std::wstring(L"01234567-89AB-CDEF-0123-456789abcdef}")), std::invalid_argument);
-    BOOST_TEST_THROWS(gen(std::wstring(L"G1234567-89AB-CDEF-0123-456789abcdef}")), std::invalid_argument);
+    BOOST_TEST_THROWS(gen(std::wstring(L"{01234567-89AB-CDEF-0123-456789abcdef)")), std::runtime_error);
+    BOOST_TEST_THROWS(gen(std::wstring(L"{01234567-89AB-CDEF-0123-456789abcdef")), std::runtime_error);
+    BOOST_TEST_THROWS(gen(std::wstring(L"01234567-89AB-CDEF-0123-456789abcdef}")), std::runtime_error);
+    BOOST_TEST_THROWS(gen(std::wstring(L"G1234567-89AB-CDEF-0123-456789abcdef}")), std::runtime_error);
 #endif //BOOST_NO_STD_WSTRING
 
-    BOOST_TEST_THROWS(gen("G1234567-89AB-CDEF-0123-456789abcdef"), std::invalid_argument);
-    BOOST_TEST_THROWS(gen("Have a great big roast-beef sandwich!"), std::invalid_argument);
+    BOOST_TEST_THROWS(gen("G1234567-89AB-CDEF-0123-456789abcdef"), std::runtime_error);
+    BOOST_TEST_THROWS(gen("Have a great big roast-beef sandwich!"), std::runtime_error);
 
-    BOOST_TEST_THROWS(gen("83f8638b-8dca-4152-zzzz-2ca8b33039b4"), std::invalid_argument);
+    BOOST_TEST_THROWS(gen("83f8638b-8dca-4152-zzzz-2ca8b33039b4"), std::runtime_error);
 
     return boost::report_errors();
 }