Apply clang-format to source

Author: asuhan

.clang-format

@@ -0,0 +1,62 @@
+BasedOnStyle:  Chromium
+---
+Language:        Cpp
+AccessModifierOffset: -1
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: true
+AlignAfterOpenBracket: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakAfterDefinitionReturnType: false
+AlwaysBreakTemplateDeclarations: true
+AlwaysBreakBeforeMultilineStrings: true
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackArguments: false
+BinPackParameters: false
+ColumnLimit:     80
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: false
+NamespaceIndentation: None
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+SpacesBeforeTrailingComments: 2
+Cpp11BracedListStyle: true
+Standard:        Cpp11
+IndentWidth:     2
+TabWidth:        8
+UseTab:          Never
+BreakBeforeBraces: Attach
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterCStyleCast: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat:   false
+...
+

UaParser.cpp

@@ -35,7 +35,8 @@ struct AgentStore : GenericStore {
   std::string patchMinorVersionReplacement;
 };
 
-void mark_placeholders(i2tuple& replacement_map, const std::string& device_property) {
+void mark_placeholders(i2tuple& replacement_map,
+                       const std::string& device_property) {
   auto loc = device_property.rfind("$");
   while (loc != std::string::npos) {
     const auto replacement = device_property.substr(loc + 1, 1);
@@ -56,7 +57,8 @@ DeviceStore fill_device_store(const YAML::Node& device_parser) {
     const auto key = it->first.as<std::string>();
     const auto value = it->second.as<std::string>();
     if (key == "regex") {
-      device.regExpr.assign(value, boost::regex::optimize | boost::regex::normal);
+      device.regExpr.assign(value,
+                            boost::regex::optimize | boost::regex::normal);
     } else if (key == "regex_flag" && value == "i") {
       regex_flag = true;
     } else if (key == "device_replacement") {
@@ -73,7 +75,9 @@ DeviceStore fill_device_store(const YAML::Node& device_parser) {
     }
   }
   if (regex_flag == true) {
-    device.regExpr.assign(device.regExpr.str(), boost::regex::optimize | boost::regex::icase | boost::regex::normal);
+    device.regExpr.assign(
+        device.regExpr.str(),
+        boost::regex::optimize | boost::regex::icase | boost::regex::normal);
   }
   return device;
 }
@@ -89,7 +93,8 @@ AgentStore fill_agent_store(const YAML::Node& node,
     const auto key = it->first.as<std::string>();
     const auto value = it->second.as<std::string>();
     if (key == "regex") {
-      agent_store.regExpr.assign(value, boost::regex::optimize | boost::regex::normal);
+      agent_store.regExpr.assign(value,
+                                 boost::regex::optimize | boost::regex::normal);
     } else if (key == repl) {
       agent_store.replacement = value;
       mark_placeholders(agent_store.replacementMap, agent_store.replacement);
@@ -112,15 +117,21 @@ struct UAStore {
 
     const auto& user_agent_parsers = regexes["user_agent_parsers"];
     for (const auto& user_agent : user_agent_parsers) {
-      const auto browser =
-          fill_agent_store(user_agent, "family_replacement", "v1_replacement", "v2_replacement", "v3_replacement");
+      const auto browser = fill_agent_store(user_agent,
+                                            "family_replacement",
+                                            "v1_replacement",
+                                            "v2_replacement",
+                                            "v3_replacement");
       browserStore.push_back(browser);
     }
 
     const auto& os_parsers = regexes["os_parsers"];
     for (const auto& o : os_parsers) {
-      const auto os =
-          fill_agent_store(o, "os_replacement", "os_v1_replacement", "os_v2_replacement", "os_v3_replacement");
+      const auto os = fill_agent_store(o,
+                                       "os_replacement",
+                                       "os_v1_replacement",
+                                       "os_v2_replacement",
+                                       "os_v3_replacement");
       osStore.push_back(os);
     }
 
@@ -139,15 +150,19 @@ struct UAStore {
 // HELPERS //
 /////////////
 
-void replace_all_placeholders(std::string& ua_property, const boost::smatch& result, const i2tuple& replacement_map) {
-  for (auto iter = replacement_map.rbegin(); iter != replacement_map.rend(); ++iter) {
+void replace_all_placeholders(std::string& ua_property,
+                              const boost::smatch& result,
+                              const i2tuple& replacement_map) {
+  for (auto iter = replacement_map.rbegin(); iter != replacement_map.rend();
+       ++iter) {
     ua_property.replace(iter->first, 2, result[iter->second].str());
   }
   boost::algorithm::trim(ua_property);
   return;
 }
 
-uap_cpp::Device parse_device_impl(const std::string& ua, const UAStore* ua_store) {
+uap_cpp::Device parse_device_impl(const std::string& ua,
+                                  const UAStore* ua_store) {
   uap_cpp::Device device;
 
   for (const auto& d : ua_store->deviceStore) {
@@ -185,13 +200,22 @@ uap_cpp::Device parse_device_impl(const std::string& ua, const UAStore* ua_store
 }
 
 template <class AGENT, class AGENT_STORE>
-void fill_agent(AGENT& agent, const AGENT_STORE& store, const boost::smatch& m, const bool os) {
+void fill_agent(AGENT& agent,
+                const AGENT_STORE& store,
+                const boost::smatch& m,
+                const bool os) {
   if (m.size() > 1) {
     agent.family =
-        !store.replacement.empty() ? boost::regex_replace(store.replacement, boost::regex("\\$1"), m[1].str()) : m[1];
+        !store.replacement.empty()
+            ? boost::regex_replace(
+                  store.replacement, boost::regex("\\$1"), m[1].str())
+            : m[1];
   } else {
     agent.family =
-        !store.replacement.empty() ? boost::regex_replace(store.replacement, boost::regex("\\$1"), m[0].str()) : m[0];
+        !store.replacement.empty()
+            ? boost::regex_replace(
+                  store.replacement, boost::regex("\\$1"), m[0].str())
+            : m[0];
   }
   boost::algorithm::trim(agent.family);
 
@@ -206,7 +230,8 @@ void fill_agent(AGENT& agent, const AGENT_STORE& store, const boost::smatch& m,
   // }
 
   if (!store.majorVersionReplacement.empty()) {
-    agent.major = boost::regex_replace(store.majorVersionReplacement, boost::regex("\\$1"), m[1].str());
+    agent.major = boost::regex_replace(
+        store.majorVersionReplacement, boost::regex("\\$1"), m[1].str());
   } else if (m.size() > 2) {
     agent.major = m[2].str();
   }
@@ -225,7 +250,8 @@ void fill_agent(AGENT& agent, const AGENT_STORE& store, const boost::smatch& m,
   }
 }
 
-uap_cpp::Agent parse_browser_impl(const std::string& ua, const UAStore* ua_store) {
+uap_cpp::Agent parse_browser_impl(const std::string& ua,
+                                  const UAStore* ua_store) {
   uap_cpp::Agent browser;
 
   for (const auto& b : ua_store->browserStore) {
@@ -257,7 +283,8 @@ uap_cpp::Agent parse_os_impl(const std::string& ua, const UAStore* ua_store) {
 
 namespace uap_cpp {
 
-UserAgentParser::UserAgentParser(const std::string& regexes_file_path) : regexes_file_path_{regexes_file_path} {
+UserAgentParser::UserAgentParser(const std::string& regexes_file_path)
+    : regexes_file_path_{regexes_file_path} {
   ua_store_ = new UAStore(regexes_file_path);
 }
 
@@ -280,32 +307,38 @@ UserAgent UserAgentParser::parse(const std::string& ua) const {
 
 Device UserAgentParser::parse_device(const std::string& ua) const {
   try {
-    return parse_device_impl(ua, static_cast<const UAStore*> (ua_store_));
+    return parse_device_impl(ua, static_cast<const UAStore*>(ua_store_));
   } catch (...) {
     return Device();
   }
 }
 
 Agent UserAgentParser::parse_os(const std::string& ua) const {
   try {
-    return parse_os_impl(ua, static_cast<const UAStore*> (ua_store_));
+    return parse_os_impl(ua, static_cast<const UAStore*>(ua_store_));
   } catch (...) {
     return Agent();
   }
 }
 
 Agent UserAgentParser::parse_browser(const std::string& ua) const {
   try {
-    return parse_browser_impl(ua, static_cast<const UAStore*> (ua_store_));
+    return parse_browser_impl(ua, static_cast<const UAStore*>(ua_store_));
   } catch (...) {
     return Agent();
   }
 }
 
 DeviceType UserAgentParser::device_type(const std::string& ua) const {
   // https://gist.github.com/dalethedeveloper/1503252/931cc8b613aaa930ef92a4027916e6687d07feac
-  static boost::regex rx_mob("Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune", boost::regex::optimize | boost::regex::normal);
-  static boost::regex rx_tabl("(tablet|ipad|playbook|silk)|(android(?!.*mobile))", boost::regex::icase | boost::regex::optimize | boost::regex::normal);
+  static boost::regex rx_mob(
+      "Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-"
+      "Accelerated|(hpw|web)OS|Fennec|Minimo|Opera "
+      "M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune",
+      boost::regex::optimize | boost::regex::normal);
+  static boost::regex rx_tabl(
+      "(tablet|ipad|playbook|silk)|(android(?!.*mobile))",
+      boost::regex::icase | boost::regex::optimize | boost::regex::normal);
   boost::smatch m;
   try {
     if (boost::regex_search(ua, m, rx_tabl)) {

UaParser.h

@@ -23,7 +23,8 @@ struct Agent : Generic {
   std::string toString() const { return family + " " + toVersionString(); }
 
   std::string toVersionString() const {
-    return (major.empty() ? "0" : major) + "." + (minor.empty() ? "0" : minor) + "." + (patch.empty() ? "0" : patch);
+    return (major.empty() ? "0" : major) + "." + (minor.empty() ? "0" : minor) +
+           "." + (patch.empty() ? "0" : patch);
   }
 };
 
@@ -33,30 +34,30 @@ struct UserAgent {
   Agent os;
   Agent browser;
 
-  std::string toFullString() const { return browser.toString() + "/" + os.toString(); }
+  std::string toFullString() const {
+    return browser.toString() + "/" + os.toString();
+  }
 
   bool isSpider() const { return device.family == "Spider"; }
 };
 
-enum DeviceType {
-  kUnknown = 0, kDesktop, kMobile, kTablet
-};
+enum DeviceType { kUnknown = 0, kDesktop, kMobile, kTablet };
 
 class UserAgentParser {
-public:
+ public:
   explicit UserAgentParser(const std::string& regexes_file_path);
 
   UserAgent parse(const std::string&) const;
 
   Device parse_device(const std::string&) const;
   Agent parse_os(const std::string&) const;
   Agent parse_browser(const std::string&) const;
-  
+
   DeviceType device_type(const std::string&) const;
 
   ~UserAgentParser();
 
-private:
+ private:
   const std::string regexes_file_path_;
   const void* ua_store_;
 };

UaParserTest.cpp

@@ -10,7 +10,8 @@ const uap_cpp::UserAgentParser g_ua_parser(UA_CORE_DIR + "/regexes.yaml");
 
 TEST(UserAgentParser, basic) {
   const auto uagent = g_ua_parser.parse(
-      "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 "
+      "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) "
+      "AppleWebKit/534.46 "
       "(KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3");
   ASSERT_EQ("Mobile Safari", uagent.browser.family);
   ASSERT_EQ("5", uagent.browser.major);
@@ -84,19 +85,23 @@ TEST(OsVersion, test_ua) {
 }
 
 TEST(BrowserVersion, firefox_user_agent_strings) {
-  test_browser_or_os(UA_CORE_DIR + "/test_resources/firefox_user_agent_strings.yaml", true);
+  test_browser_or_os(
+      UA_CORE_DIR + "/test_resources/firefox_user_agent_strings.yaml", true);
 }
 
 TEST(BrowserVersion, opera_mini_user_agent_strings) {
-  test_browser_or_os(UA_CORE_DIR + "/test_resources/opera_mini_user_agent_strings.yaml", true);
+  test_browser_or_os(
+      UA_CORE_DIR + "/test_resources/opera_mini_user_agent_strings.yaml", true);
 }
 
 TEST(BrowserVersion, pgts_browser_list) {
-  test_browser_or_os(UA_CORE_DIR + "/test_resources/pgts_browser_list.yaml", true);
+  test_browser_or_os(UA_CORE_DIR + "/test_resources/pgts_browser_list.yaml",
+                     true);
 }
 
 TEST(OsVersion, additional_os_tests) {
-  test_browser_or_os(UA_CORE_DIR + "/test_resources/additional_os_tests.yaml", false);
+  test_browser_or_os(UA_CORE_DIR + "/test_resources/additional_os_tests.yaml",
+                     false);
 }
 
 TEST(DeviceFamily, test_device) {