From c11ad24fd7d961432cfdbca7497ba229d3b4f38d Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 6 Aug 2019 16:45:48 -0700
Subject: Use std::stoi instead of atoi(<str>.c_str())

---
 passes/cmds/add.cc      |  2 +-
 passes/cmds/chformal.cc |  4 ++--
 passes/cmds/qwp.cc      |  2 +-
 passes/cmds/scc.cc      |  4 ++--
 passes/cmds/select.cc   | 16 ++++++++--------
 passes/cmds/setundef.cc |  2 +-
 passes/cmds/show.cc     |  2 +-
 passes/cmds/tee.cc      |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'passes/cmds')

diff --git a/passes/cmds/add.cc b/passes/cmds/add.cc
index af6f7043d..971de1d00 100644
--- a/passes/cmds/add.cc
+++ b/passes/cmds/add.cc
@@ -130,7 +130,7 @@ struct AddPass : public Pass {
 				if (arg == "-global_input")
 					arg_flag_global = true;
 				arg_name = args[++argidx];
-				arg_width = atoi(args[++argidx].c_str());
+				arg_width = std::stoi(args[++argidx]);
 				continue;
 			}
 			break;
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 7e32da65f..c97b204af 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -106,12 +106,12 @@ struct ChformalPass : public Pass {
 			}
 			if (mode == 0 && args[argidx] == "-delay" && argidx+1 < args.size()) {
 				mode = 'd';
-				mode_arg = atoi(args[++argidx].c_str());
+				mode_arg = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (mode == 0 && args[argidx] == "-skip" && argidx+1 < args.size()) {
 				mode = 's';
-				mode_arg = atoi(args[++argidx].c_str());
+				mode_arg = std::stoi(args[++argidx]);
 				continue;
 			}
 			if ((mode == 0 || mode == 'c') && args[argidx] == "-assert2assume") {
diff --git a/passes/cmds/qwp.cc b/passes/cmds/qwp.cc
index adbe89e31..4d53b3995 100644
--- a/passes/cmds/qwp.cc
+++ b/passes/cmds/qwp.cc
@@ -830,7 +830,7 @@ struct QwpPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-grid" && argidx+1 < args.size()) {
-				config.grid = 1.0 / atoi(args[++argidx].c_str());
+				config.grid = 1.0 / std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-dump" && argidx+1 < args.size()) {
diff --git a/passes/cmds/scc.cc b/passes/cmds/scc.cc
index 99f4fbae8..ad924e1bf 100644
--- a/passes/cmds/scc.cc
+++ b/passes/cmds/scc.cc
@@ -269,11 +269,11 @@ struct SccPass : public Pass {
 		size_t argidx;
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			if (args[argidx] == "-max_depth" && argidx+1 < args.size()) {
-				maxDepth = atoi(args[++argidx].c_str());
+				maxDepth = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-expect" && argidx+1 < args.size()) {
-				expect = atoi(args[++argidx].c_str());
+				expect = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-nofeedback") {
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index b5e8ef1af..e857e655f 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -517,7 +517,7 @@ static void select_op_expand(RTLIL::Design *design, std::string arg, char mode,
 		size_t endpos = arg.find_first_not_of("0123456789", pos);
 		if (endpos == std::string::npos)
 			endpos = arg.size();
-		levels = atoi(arg.substr(pos, endpos-pos).c_str());
+		levels = std::stoi(arg.substr(pos, endpos-pos));
 		pos = endpos;
 	}
 
@@ -526,7 +526,7 @@ static void select_op_expand(RTLIL::Design *design, std::string arg, char mode,
 		if (endpos == std::string::npos)
 			endpos = arg.size();
 		if (int(endpos) > pos)
-			rem_objects = atoi(arg.substr(pos, endpos-pos).c_str());
+			rem_objects = std::stoi(arg.substr(pos, endpos-pos));
 		pos = endpos;
 	}
 
@@ -823,15 +823,15 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 		if (arg_memb.substr(0, 2) == "s:") {
 			size_t delim = arg_memb.substr(2).find(':');
 			if (delim == std::string::npos) {
-				int width = atoi(arg_memb.substr(2).c_str());
+				int width = std::stoi(arg_memb.substr(2));
 				for (auto &it : mod->wires_)
 					if (it.second->width == width)
 						sel.selected_members[mod->name].insert(it.first);
 			} else {
 				std::string min_str = arg_memb.substr(2, delim);
 				std::string max_str = arg_memb.substr(2+delim+1);
-				int min_width = min_str.empty() ? 0 : atoi(min_str.c_str());
-				int max_width = max_str.empty() ? -1 : atoi(max_str.c_str());
+				int min_width = min_str.empty() ? 0 : std::stoi(min_str);
+				int max_width = max_str.empty() ? -1 : std::stoi(max_str);
 				for (auto &it : mod->wires_)
 					if (min_width <= it.second->width && (it.second->width <= max_width || max_width == -1))
 						sel.selected_members[mod->name].insert(it.first);
@@ -1230,15 +1230,15 @@ struct SelectPass : public Pass {
 				continue;
 			}
 			if (arg == "-assert-count" && argidx+1 < args.size()) {
-				assert_count = atoi(args[++argidx].c_str());
+				assert_count = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (arg == "-assert-max" && argidx+1 < args.size()) {
-				assert_max = atoi(args[++argidx].c_str());
+				assert_max = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (arg == "-assert-min" && argidx+1 < args.size()) {
-				assert_min = atoi(args[++argidx].c_str());
+				assert_min = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (arg == "-clear") {
diff --git a/passes/cmds/setundef.cc b/passes/cmds/setundef.cc
index 3eedc86b8..0e3c0c853 100644
--- a/passes/cmds/setundef.cc
+++ b/passes/cmds/setundef.cc
@@ -210,7 +210,7 @@ struct SetundefPass : public Pass {
 			if (args[argidx] == "-random" && !got_value && argidx+1 < args.size()) {
 				got_value = true;
 				worker.next_bit_mode = MODE_RANDOM;
-				worker.next_bit_state = atoi(args[++argidx].c_str()) + 1;
+				worker.next_bit_state = std::stoi(args[++argidx]) + 1;
 				for (int i = 0; i < 10; i++)
 					worker.next_bit();
 				continue;
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index cf729215f..3af477bd9 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -740,7 +740,7 @@ struct ShowPass : public Pass {
 				continue;
 			}
 			if (arg == "-colors" && argidx+1 < args.size()) {
-				colorSeed = atoi(args[++argidx].c_str());
+				colorSeed = std::stoi(args[++argidx]);
 				for (int i = 0; i < 100; i++)
 					colorSeed = ShowWorker::xorshift32(colorSeed);
 				continue;
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index 1a44bdaec..e0a74099a 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -79,7 +79,7 @@ struct TeePass : public Pass {
 				continue;
 			}
 			if (GetSize(args[argidx]) >= 2 && (args[argidx][0] == '-' || args[argidx][0] == '+') && args[argidx][1] >= '0' && args[argidx][1] <= '9') {
-				log_verbose_level += atoi(args[argidx].c_str());
+				log_verbose_level += std::stoi(args[argidx]);
 				continue;
 			}
 			break;
-- 
cgit v1.2.3


From 48d0f994064557dc0832748e17133ee2eac88cbf Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 7 Aug 2019 11:09:17 -0700
Subject: stoi -> atoi

---
 passes/cmds/add.cc      |  2 +-
 passes/cmds/chformal.cc |  4 ++--
 passes/cmds/qwp.cc      |  2 +-
 passes/cmds/scc.cc      |  4 ++--
 passes/cmds/select.cc   | 16 ++++++++--------
 passes/cmds/setundef.cc |  2 +-
 passes/cmds/show.cc     |  2 +-
 passes/cmds/tee.cc      |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'passes/cmds')

diff --git a/passes/cmds/add.cc b/passes/cmds/add.cc
index 971de1d00..af6f7043d 100644
--- a/passes/cmds/add.cc
+++ b/passes/cmds/add.cc
@@ -130,7 +130,7 @@ struct AddPass : public Pass {
 				if (arg == "-global_input")
 					arg_flag_global = true;
 				arg_name = args[++argidx];
-				arg_width = std::stoi(args[++argidx]);
+				arg_width = atoi(args[++argidx].c_str());
 				continue;
 			}
 			break;
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index c97b204af..7e32da65f 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -106,12 +106,12 @@ struct ChformalPass : public Pass {
 			}
 			if (mode == 0 && args[argidx] == "-delay" && argidx+1 < args.size()) {
 				mode = 'd';
-				mode_arg = std::stoi(args[++argidx]);
+				mode_arg = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (mode == 0 && args[argidx] == "-skip" && argidx+1 < args.size()) {
 				mode = 's';
-				mode_arg = std::stoi(args[++argidx]);
+				mode_arg = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if ((mode == 0 || mode == 'c') && args[argidx] == "-assert2assume") {
diff --git a/passes/cmds/qwp.cc b/passes/cmds/qwp.cc
index 4d53b3995..adbe89e31 100644
--- a/passes/cmds/qwp.cc
+++ b/passes/cmds/qwp.cc
@@ -830,7 +830,7 @@ struct QwpPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-grid" && argidx+1 < args.size()) {
-				config.grid = 1.0 / std::stoi(args[++argidx]);
+				config.grid = 1.0 / atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-dump" && argidx+1 < args.size()) {
diff --git a/passes/cmds/scc.cc b/passes/cmds/scc.cc
index ad924e1bf..99f4fbae8 100644
--- a/passes/cmds/scc.cc
+++ b/passes/cmds/scc.cc
@@ -269,11 +269,11 @@ struct SccPass : public Pass {
 		size_t argidx;
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			if (args[argidx] == "-max_depth" && argidx+1 < args.size()) {
-				maxDepth = std::stoi(args[++argidx]);
+				maxDepth = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-expect" && argidx+1 < args.size()) {
-				expect = std::stoi(args[++argidx]);
+				expect = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-nofeedback") {
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index e857e655f..b5e8ef1af 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -517,7 +517,7 @@ static void select_op_expand(RTLIL::Design *design, std::string arg, char mode,
 		size_t endpos = arg.find_first_not_of("0123456789", pos);
 		if (endpos == std::string::npos)
 			endpos = arg.size();
-		levels = std::stoi(arg.substr(pos, endpos-pos));
+		levels = atoi(arg.substr(pos, endpos-pos).c_str());
 		pos = endpos;
 	}
 
@@ -526,7 +526,7 @@ static void select_op_expand(RTLIL::Design *design, std::string arg, char mode,
 		if (endpos == std::string::npos)
 			endpos = arg.size();
 		if (int(endpos) > pos)
-			rem_objects = std::stoi(arg.substr(pos, endpos-pos));
+			rem_objects = atoi(arg.substr(pos, endpos-pos).c_str());
 		pos = endpos;
 	}
 
@@ -823,15 +823,15 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 		if (arg_memb.substr(0, 2) == "s:") {
 			size_t delim = arg_memb.substr(2).find(':');
 			if (delim == std::string::npos) {
-				int width = std::stoi(arg_memb.substr(2));
+				int width = atoi(arg_memb.substr(2).c_str());
 				for (auto &it : mod->wires_)
 					if (it.second->width == width)
 						sel.selected_members[mod->name].insert(it.first);
 			} else {
 				std::string min_str = arg_memb.substr(2, delim);
 				std::string max_str = arg_memb.substr(2+delim+1);
-				int min_width = min_str.empty() ? 0 : std::stoi(min_str);
-				int max_width = max_str.empty() ? -1 : std::stoi(max_str);
+				int min_width = min_str.empty() ? 0 : atoi(min_str.c_str());
+				int max_width = max_str.empty() ? -1 : atoi(max_str.c_str());
 				for (auto &it : mod->wires_)
 					if (min_width <= it.second->width && (it.second->width <= max_width || max_width == -1))
 						sel.selected_members[mod->name].insert(it.first);
@@ -1230,15 +1230,15 @@ struct SelectPass : public Pass {
 				continue;
 			}
 			if (arg == "-assert-count" && argidx+1 < args.size()) {
-				assert_count = std::stoi(args[++argidx]);
+				assert_count = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (arg == "-assert-max" && argidx+1 < args.size()) {
-				assert_max = std::stoi(args[++argidx]);
+				assert_max = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (arg == "-assert-min" && argidx+1 < args.size()) {
-				assert_min = std::stoi(args[++argidx]);
+				assert_min = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (arg == "-clear") {
diff --git a/passes/cmds/setundef.cc b/passes/cmds/setundef.cc
index 0e3c0c853..3eedc86b8 100644
--- a/passes/cmds/setundef.cc
+++ b/passes/cmds/setundef.cc
@@ -210,7 +210,7 @@ struct SetundefPass : public Pass {
 			if (args[argidx] == "-random" && !got_value && argidx+1 < args.size()) {
 				got_value = true;
 				worker.next_bit_mode = MODE_RANDOM;
-				worker.next_bit_state = std::stoi(args[++argidx]) + 1;
+				worker.next_bit_state = atoi(args[++argidx].c_str()) + 1;
 				for (int i = 0; i < 10; i++)
 					worker.next_bit();
 				continue;
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 3af477bd9..cf729215f 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -740,7 +740,7 @@ struct ShowPass : public Pass {
 				continue;
 			}
 			if (arg == "-colors" && argidx+1 < args.size()) {
-				colorSeed = std::stoi(args[++argidx]);
+				colorSeed = atoi(args[++argidx].c_str());
 				for (int i = 0; i < 100; i++)
 					colorSeed = ShowWorker::xorshift32(colorSeed);
 				continue;
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index e0a74099a..1a44bdaec 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -79,7 +79,7 @@ struct TeePass : public Pass {
 				continue;
 			}
 			if (GetSize(args[argidx]) >= 2 && (args[argidx][0] == '-' || args[argidx][0] == '+') && args[argidx][1] >= '0' && args[argidx][1] <= '9') {
-				log_verbose_level += std::stoi(args[argidx]);
+				log_verbose_level += atoi(args[argidx].c_str());
 				continue;
 			}
 			break;
-- 
cgit v1.2.3


From 6d77236f3845cd8785e7bdd4da3c5ef966be6043 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 7 Aug 2019 12:20:08 -0700
Subject: substr() -> compare()

---
 passes/cmds/cover.cc   |  2 +-
 passes/cmds/select.cc  | 50 +++++++++++++++++++++++++-------------------------
 passes/cmds/setattr.cc |  2 +-
 passes/cmds/show.cc    |  6 +++---
 4 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'passes/cmds')

diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
index 1128116b4..628ac4c5e 100644
--- a/passes/cmds/cover.cc
+++ b/passes/cmds/cover.cc
@@ -121,7 +121,7 @@ struct CoverPass : public Pass {
 			}
 			break;
 		}
-		while (argidx < args.size() && args[argidx].substr(0, 1) != "-")
+		while (argidx < args.size() && args[argidx].compare(0, 1, "-") != 0)
 			patterns.push_back(args[argidx++]);
 		extra_args(args, argidx, design);
 
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index b5e8ef1af..59d10a1b8 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -34,7 +34,7 @@ static bool match_ids(RTLIL::IdString id, std::string pattern)
 {
 	if (id == pattern)
 		return true;
-	if (id.size() > 0 && id[0] == '\\' && id.substr(1) == pattern)
+	if (id.size() > 0 && id[0] == '\\' && id.compare(1, std::string::npos, pattern.c_str()) == 0)
 		return true;
 	if (patmatch(pattern.c_str(), id.c_str()))
 		return true;
@@ -124,11 +124,11 @@ static bool match_attr(const dict<RTLIL::IdString, RTLIL::Const> &attributes, st
 	size_t pos = match_expr.find_first_of("<!=>");
 
 	if (pos != std::string::npos) {
-		if (match_expr.substr(pos, 2) == "!=")
+		if (match_expr.compare(pos, 2, "!=") == 0)
 			return match_attr(attributes, match_expr.substr(0, pos), match_expr.substr(pos+2), '!');
-		if (match_expr.substr(pos, 2) == "<=")
+		if (match_expr.compare(pos, 2, "<=") == 0)
 			return match_attr(attributes, match_expr.substr(0, pos), match_expr.substr(pos+2), '[');
-		if (match_expr.substr(pos, 2) == ">=")
+		if (match_expr.compare(pos, 2, ">=") == 0)
 			return match_attr(attributes, match_expr.substr(0, pos), match_expr.substr(pos+2), ']');
 		return match_attr(attributes, match_expr.substr(0, pos), match_expr.substr(pos+1), match_expr[pos]);
 	}
@@ -711,32 +711,32 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 				log_cmd_error("Must have at least one element on the stack for operator %%a.\n");
 			select_op_alias(design, work_stack[work_stack.size()-1]);
 		} else
-		if (arg == "%x" || (arg.size() > 2 && arg.substr(0, 2) == "%x" && (arg[2] == ':' || arg[2] == '*' || arg[2] == '.' || ('0' <= arg[2] && arg[2] <= '9')))) {
+		if (arg == "%x" || (arg.size() > 2 && arg.compare(0, 2, "%x") == 0 && (arg[2] == ':' || arg[2] == '*' || arg[2] == '.' || ('0' <= arg[2] && arg[2] <= '9')))) {
 			if (work_stack.size() < 1)
 				log_cmd_error("Must have at least one element on the stack for operator %%x.\n");
 			select_op_expand(design, arg, 'x', false);
 		} else
-		if (arg == "%ci" || (arg.size() > 3 && arg.substr(0, 3) == "%ci" && (arg[3] == ':' || arg[3] == '*' || arg[3] == '.' || ('0' <= arg[3] && arg[3] <= '9')))) {
+		if (arg == "%ci" || (arg.size() > 3 && arg.compare(0, 3, "%ci") == 0 && (arg[3] == ':' || arg[3] == '*' || arg[3] == '.' || ('0' <= arg[3] && arg[3] <= '9')))) {
 			if (work_stack.size() < 1)
 				log_cmd_error("Must have at least one element on the stack for operator %%ci.\n");
 			select_op_expand(design, arg, 'i', false);
 		} else
-		if (arg == "%co" || (arg.size() > 3 && arg.substr(0, 3) == "%co" && (arg[3] == ':' || arg[3] == '*' || arg[3] == '.' || ('0' <= arg[3] && arg[3] <= '9')))) {
+		if (arg == "%co" || (arg.size() > 3 && arg.compare(0, 3, "%co") == 0 && (arg[3] == ':' || arg[3] == '*' || arg[3] == '.' || ('0' <= arg[3] && arg[3] <= '9')))) {
 			if (work_stack.size() < 1)
 				log_cmd_error("Must have at least one element on the stack for operator %%co.\n");
 			select_op_expand(design, arg, 'o', false);
 		} else
-		if (arg == "%xe" || (arg.size() > 3 && arg.substr(0, 3) == "%xe" && (arg[3] == ':' || arg[3] == '*' || arg[3] == '.' || ('0' <= arg[3] && arg[3] <= '9')))) {
+		if (arg == "%xe" || (arg.size() > 3 && arg.compare(0, 3, "%xe") == 0 && (arg[3] == ':' || arg[3] == '*' || arg[3] == '.' || ('0' <= arg[3] && arg[3] <= '9')))) {
 			if (work_stack.size() < 1)
 				log_cmd_error("Must have at least one element on the stack for operator %%xe.\n");
 			select_op_expand(design, arg, 'x', true);
 		} else
-		if (arg == "%cie" || (arg.size() > 4 && arg.substr(0, 4) == "%cie" && (arg[4] == ':' || arg[4] == '*' || arg[4] == '.' || ('0' <= arg[4] && arg[4] <= '9')))) {
+		if (arg == "%cie" || (arg.size() > 4 && arg.compare(0, 4, "%cie") == 0 && (arg[4] == ':' || arg[4] == '*' || arg[4] == '.' || ('0' <= arg[4] && arg[4] <= '9')))) {
 			if (work_stack.size() < 1)
 				log_cmd_error("Must have at least one element on the stack for operator %%cie.\n");
 			select_op_expand(design, arg, 'i', true);
 		} else
-		if (arg == "%coe" || (arg.size() > 4 && arg.substr(0, 4) == "%coe" && (arg[4] == ':' || arg[4] == '*' || arg[4] == '.' || ('0' <= arg[4] && arg[4] <= '9')))) {
+		if (arg == "%coe" || (arg.size() > 4 && arg.compare(0, 4, "%coe") == 0 && (arg[4] == ':' || arg[4] == '*' || arg[4] == '.' || ('0' <= arg[4] && arg[4] <= '9')))) {
 			if (work_stack.size() < 1)
 				log_cmd_error("Must have at least one element on the stack for operator %%coe.\n");
 			select_op_expand(design, arg, 'o', true);
@@ -766,7 +766,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 	} else {
 		size_t pos = arg.find('/');
 		if (pos == std::string::npos) {
-			if (arg.find(':') == std::string::npos || arg.substr(0, 1) == "A")
+			if (arg.find(':') == std::string::npos || arg.compare(0, 1, "A") == 0)
 				arg_mod = arg;
 			else
 				arg_mod = "*", arg_memb = arg;
@@ -787,7 +787,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 	sel.full_selection = false;
 	for (auto &mod_it : design->modules_)
 	{
-		if (arg_mod.substr(0, 2) == "A:") {
+		if (arg_mod.compare(0, 2, "A:") == 0) {
 			if (!match_attr(mod_it.second->attributes, arg_mod.substr(2)))
 				continue;
 		} else
@@ -800,27 +800,27 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 		}
 
 		RTLIL::Module *mod = mod_it.second;
-		if (arg_memb.substr(0, 2) == "w:") {
+		if (arg_memb.compare(0, 2, "w:") == 0) {
 			for (auto &it : mod->wires_)
 				if (match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "i:") {
+		if (arg_memb.compare(0, 2, "i:") == 0) {
 			for (auto &it : mod->wires_)
 				if (it.second->port_input && match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "o:") {
+		if (arg_memb.compare(0, 2, "o:") == 0) {
 			for (auto &it : mod->wires_)
 				if (it.second->port_output && match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "x:") {
+		if (arg_memb.compare(0, 2, "x:") == 0) {
 			for (auto &it : mod->wires_)
 				if ((it.second->port_input || it.second->port_output) && match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "s:") {
+		if (arg_memb.compare(0, 2, "s:") == 0) {
 			size_t delim = arg_memb.substr(2).find(':');
 			if (delim == std::string::npos) {
 				int width = atoi(arg_memb.substr(2).c_str());
@@ -837,27 +837,27 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 						sel.selected_members[mod->name].insert(it.first);
 			}
 		} else
-		if (arg_memb.substr(0, 2) == "m:") {
+		if (arg_memb.compare(0, 2, "m:") == 0) {
 			for (auto &it : mod->memories)
 				if (match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "c:") {
+		if (arg_memb.compare(0, 2, "c:") ==0) {
 			for (auto &it : mod->cells_)
 				if (match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "t:") {
+		if (arg_memb.compare(0, 2, "t:") == 0) {
 			for (auto &it : mod->cells_)
 				if (match_ids(it.second->type, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "p:") {
+		if (arg_memb.compare(0, 2, "p:") == 0) {
 			for (auto &it : mod->processes)
 				if (match_ids(it.first, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "a:") {
+		if (arg_memb.compare(0, 2, "a:") == 0) {
 			for (auto &it : mod->wires_)
 				if (match_attr(it.second->attributes, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
@@ -871,12 +871,12 @@ static void select_stmt(RTLIL::Design *design, std::string arg)
 				if (match_attr(it.second->attributes, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else
-		if (arg_memb.substr(0, 2) == "r:") {
+		if (arg_memb.compare(0, 2, "r:") == 0) {
 			for (auto &it : mod->cells_)
 				if (match_attr(it.second->parameters, arg_memb.substr(2)))
 					sel.selected_members[mod->name].insert(it.first);
 		} else {
-			if (arg_memb.substr(0, 2) == "n:")
+			if (arg_memb.compare(0, 2, "n:") == 0)
 				arg_memb = arg_memb.substr(2);
 			for (auto &it : mod->wires_)
 				if (match_ids(it.first, arg_memb))
@@ -927,7 +927,7 @@ void handle_extra_select_args(Pass *pass, vector<string> args, size_t argidx, si
 {
 	work_stack.clear();
 	for (; argidx < args_size; argidx++) {
-		if (args[argidx].substr(0, 1) == "-") {
+		if (args[argidx].compare(0, 1, "-") == 0) {
 			if (pass != NULL)
 				pass->cmd_error(args, argidx, "Unexpected option in selection arguments.");
 			else
diff --git a/passes/cmds/setattr.cc b/passes/cmds/setattr.cc
index b9fcc3e7a..1ccfc2e86 100644
--- a/passes/cmds/setattr.cc
+++ b/passes/cmds/setattr.cc
@@ -34,7 +34,7 @@ struct setunset_t
 
 	setunset_t(std::string set_name, std::string set_value) : name(RTLIL::escape_id(set_name)), value(), unset(false)
 	{
-		if (set_value.substr(0, 1) == "\"" && set_value.substr(GetSize(set_value)-1) == "\"") {
+		if (set_value.compare(0, 1, "\"") == 0 && set_value.compare(GetSize(set_value)-1, std::string::npos, "\"") == 0) {
 			value = RTLIL::Const(set_value.substr(1, GetSize(set_value)-2));
 		} else {
 			RTLIL::SigSpec sig_value;
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index cf729215f..2e9fc72af 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -527,11 +527,11 @@ struct ShowWorker
 		{
 			currentColor = xorshift32(currentColor);
 			if (wires_on_demand.count(it.first) > 0) {
-				if (it.second.in.size() == 1 && it.second.out.size() > 1 && it.second.in.begin()->substr(0, 1) == "p")
+				if (it.second.in.size() == 1 && it.second.out.size() > 1 && it.second.in.begin()->compare(0, 1, "p") == 0)
 					it.second.out.erase(*it.second.in.begin());
 				if (it.second.in.size() == 1 && it.second.out.size() == 1) {
 					std::string from = *it.second.in.begin(), to = *it.second.out.begin();
-					if (from != to || from.substr(0, 1) != "p")
+					if (from != to || from.compare(0, 1, "p") != 0)
 						fprintf(f, "%s:e -> %s:w [%s, %s];\n", from.c_str(), to.c_str(), nextColor(it.second.color).c_str(), widthLabel(it.second.bits).c_str());
 					continue;
 				}
@@ -808,7 +808,7 @@ struct ShowPass : public Pass {
 			if (f.fail())
 				log_error("Can't open lib file `%s'.\n", filename.c_str());
 			RTLIL::Design *lib = new RTLIL::Design;
-			Frontend::frontend_call(lib, &f, filename, (filename.size() > 3 && filename.substr(filename.size()-3) == ".il") ? "ilang" : "verilog");
+			Frontend::frontend_call(lib, &f, filename, (filename.size() > 3 && filename.compare(filename.size()-3, std::string::npos, ".il") == 0 ? "ilang" : "verilog"));
 			libs.push_back(lib);
 		}
 
-- 
cgit v1.2.3