Check other regex parameters

diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 3abe4e93b90a9972566fab84ca24006c2109c13c..018a3e6cf957265022f1be2f5fd24e6c69d2b126 100644 (file)
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -94,31 +94,46 @@ struct LoggerPass : public Pass {
                        if (args[argidx] == "-warn" && argidx+1 < args.size()) {
                                std::string pattern = args[++argidx];
                                if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);         
-                               log("Added regex '%s' for warnings to warn list.", pattern.c_str());
-                               log_warn_regexes.push_back(std::regex(pattern,
-                                       std::regex_constants::nosubs |
-                                       std::regex_constants::optimize |
-                                       std::regex_constants::egrep));
+                               try {
+                                       log("Added regex '%s' for warnings to warn list.", pattern.c_str());
+                                       log_warn_regexes.push_back(std::regex(pattern,
+                                               std::regex_constants::nosubs |
+                                               std::regex_constants::optimize |
+                                               std::regex_constants::egrep));
+                               }
+                               catch (const std::regex_error& e) {
+                                       log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+                               }
                                continue;
                        }
                        if (args[argidx] == "-nowarn" && argidx+1 < args.size()) {
                                std::string pattern = args[++argidx];
                                if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); 
-                               log("Added regex '%s' for warnings to nowarn list.", pattern.c_str());
-                               log_nowarn_regexes.push_back(std::regex(pattern,
-                                       std::regex_constants::nosubs |
-                                       std::regex_constants::optimize |
-                                       std::regex_constants::egrep));
+                               try {
+                                       log("Added regex '%s' for warnings to nowarn list.", pattern.c_str());
+                                       log_nowarn_regexes.push_back(std::regex(pattern,
+                                               std::regex_constants::nosubs |
+                                               std::regex_constants::optimize |
+                                               std::regex_constants::egrep));
+                               }
+                               catch (const std::regex_error& e) {
+                                       log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+                               }
                                continue;
                        }
                        if (args[argidx] == "-werror" && argidx+1 < args.size()) {
                                std::string pattern = args[++argidx];
                                if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); 
-                               log("Added regex '%s' for warnings to werror list.", pattern.c_str());
-                               log_werror_regexes.push_back(std::regex(pattern,
-                                       std::regex_constants::nosubs |
-                                       std::regex_constants::optimize |
-                                       std::regex_constants::egrep));
+                               try {
+                                       log("Added regex '%s' for warnings to werror list.", pattern.c_str());
+                                       log_werror_regexes.push_back(std::regex(pattern,
+                                               std::regex_constants::nosubs |
+                                               std::regex_constants::optimize |
+                                               std::regex_constants::egrep));
+                               }
+                               catch (const std::regex_error& e) {
+                                       log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+                               }
                                continue;
                        }
                        if (args[argidx] == "-debug") {