From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 20 Feb 2020 10:41:37 +0000 (+0100)
Subject: check for regex errors
X-Git-Tag: working-ls180~788^2~7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=419e67c1706367a3a10feb70a1d7a2f9cafb591b;p=yosys.git

check for regex errors
---

diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 947b178c5..3abe4e93b 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -151,22 +151,26 @@ struct LoggerPass : public Pass {
 				if (type=="error" && count!=1)
 					log_cmd_error("Expected error message occurrences must be 1 !\n");
 				log("Added regex '%s' for warnings to expected %s list.\n", pattern.c_str(), type.c_str());
-				if (type=="error")
-					log_expect_error.push_back(std::make_pair(std::regex(pattern,
-						std::regex_constants::nosubs |
-						std::regex_constants::optimize |
-						std::regex_constants::egrep), LogExpectedItem(pattern, count)));
-				else if (type=="warning")
-					log_expect_warning.push_back(std::make_pair(std::regex(pattern,
-						std::regex_constants::nosubs |
-						std::regex_constants::optimize |
-						std::regex_constants::egrep), LogExpectedItem(pattern, count)));
-				else
-					log_expect_log.push_back(std::make_pair(std::regex(pattern,
-						std::regex_constants::nosubs |
-						std::regex_constants::optimize |
-						std::regex_constants::egrep), LogExpectedItem(pattern, count)));
-
+				try {
+					if (type=="error")
+						log_expect_error.push_back(std::make_pair(std::regex(pattern,
+							std::regex_constants::nosubs |
+							std::regex_constants::optimize |
+							std::regex_constants::egrep), LogExpectedItem(pattern, count)));
+					else if (type=="warning")
+						log_expect_warning.push_back(std::make_pair(std::regex(pattern,
+							std::regex_constants::nosubs |
+							std::regex_constants::optimize |
+							std::regex_constants::egrep), LogExpectedItem(pattern, count)));
+					else
+						log_expect_log.push_back(std::make_pair(std::regex(pattern,
+							std::regex_constants::nosubs |
+							std::regex_constants::optimize |
+							std::regex_constants::egrep), LogExpectedItem(pattern, count)));
+				}
+				catch (const std::regex_error& e) {
+					log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+				}
 				continue;
 			}
 			if (args[argidx] == "-expect-no-warnings") {