update vendor

tekezo · tekezo · commit 7aa659d68ce9 · 2019-02-12T11:39:14.000+09:00
diff --git a/src/vendor/cget/cget/pkg/pqrs-org__cpp-osx-input_source_selector/install/include/pqrs/osx/input_source_selector.hpp b/src/vendor/cget/cget/pkg/pqrs-org__cpp-osx-input_source_selector/install/include/pqrs/osx/input_source_selector.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-// pqrs::osx::input_source_selector v3.1
+// pqrs::osx::input_source_selector v3.2
 
 // (C) Copyright Takayama Fumihiko 2019.
 // Distributed under the Boost Software License, Version 1.0.
diff --git a/src/vendor/cget/cget/pkg/pqrs-org__cpp-osx-input_source_selector/install/include/pqrs/osx/input_source_selector/extra/nlohmann_json.hpp b/src/vendor/cget/cget/pkg/pqrs-org__cpp-osx-input_source_selector/install/include/pqrs/osx/input_source_selector/extra/nlohmann_json.hpp
@@ -29,36 +29,47 @@ inline void to_json(nlohmann::json& j, const specifier& s) {
 inline void from_json(const nlohmann::json& j, specifier& s) {
   using namespace std::string_literals;
 
-  try {
-    if (!j.is_object()) {
-      throw pqrs::json::unmarshal_error("json must be object, but is `"s + j.dump() + "`"s);
-    }
+  if (!j.is_object()) {
+    throw pqrs::json::unmarshal_error("json must be object, but is `"s + j.dump() + "`"s);
+  }
+
+  for (const auto& [key, value] : j.items()) {
+    if (key == "language") {
+      if (!value.is_string()) {
+        throw pqrs::json::unmarshal_error("`"s + key + "` must be string, but is `"s + value.dump() + "`"s);
+      }
 
-    for (const auto& [key, value] : j.items()) {
-      if (key == "language") {
-        if (!value.is_string()) {
-          throw pqrs::json::unmarshal_error("`"s + key + "` must be string, but is `"s + value.dump() + "`"s);
-        }
+      try {
         s.set_language(value.get<std::string>());
+      } catch (std::regex_error& e) {
+        throw pqrs::json::unmarshal_error(e.what() + ": `\""s + key + "\":" + value.dump() + "`"s);
+      }
+
+    } else if (key == "input_source_id") {
+      if (!value.is_string()) {
+        throw pqrs::json::unmarshal_error("`"s + key + "` must be string, but is `"s + value.dump() + "`"s);
+      }
 
-      } else if (key == "input_source_id") {
-        if (!value.is_string()) {
-          throw pqrs::json::unmarshal_error("`"s + key + "` must be string, but is `"s + value.dump() + "`"s);
-        }
+      try {
         s.set_input_source_id(value.get<std::string>());
+      } catch (std::regex_error& e) {
+        throw pqrs::json::unmarshal_error(e.what() + ": `\""s + key + "\":" + value.dump() + "`"s);
+      }
 
-      } else if (key == "input_mode_id") {
-        if (!value.is_string()) {
-          throw pqrs::json::unmarshal_error("`"s + key + "` must be string, but is `"s + value.dump() + "`"s);
-        }
-        s.set_input_mode_id(value.get<std::string>());
+    } else if (key == "input_mode_id") {
+      if (!value.is_string()) {
+        throw pqrs::json::unmarshal_error("`"s + key + "` must be string, but is `"s + value.dump() + "`"s);
+      }
 
-      } else {
-        throw pqrs::json::unmarshal_error("unknown key: `"s + key + "`"s);
+      try {
+        s.set_input_mode_id(value.get<std::string>());
+      } catch (std::regex_error& e) {
+        throw pqrs::json::unmarshal_error(e.what() + ": `\""s + key + "\":" + value.dump() + "`"s);
       }
+
+    } else {
+      throw pqrs::json::unmarshal_error("unknown key: `"s + key + "`"s);
     }
-  } catch (std::regex_error& e) {
-    throw pqrs::json::unmarshal_error(e.what() + ": `"s + j.dump() + "`"s);
   }
 }
 } // namespace input_source_selector
