From: Alberto Gonzalez <boqwxp@airmail.cc>
Date: Wed, 27 May 2020 23:15:07 +0000 (+0000)
Subject: printattrs: Refactor indentation string building for clarity.
X-Git-Tag: working-ls180~528^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f671c99cb89820c7a26035f51c1a6cb62e73280c;p=yosys.git

printattrs: Refactor indentation string building for clarity.

Co-Authored-By: whitequark <whitequark@whitequark.org>
---

diff --git a/passes/cmds/printattrs.cc b/passes/cmds/printattrs.cc
index 7f86823e3..d4d57fd85 100644
--- a/passes/cmds/printattrs.cc
+++ b/passes/cmds/printattrs.cc
@@ -35,11 +35,17 @@ struct PrintAttrsPass : public Pass {
 		log("\n");
 	}
 
+	static std::string get_indent_str(const unsigned int indent) {
+		//Build the format string (e.g. "%4s")
+		std::string format_str = stringf("%%%ds", indent);
+		return stringf(format_str.c_str(), " "); //Use the format string with " " as %s 
+	}
+
 	static void log_const(const RTLIL::IdString &s, const RTLIL::Const &x, const unsigned int indent) {
 		if (x.flags == RTLIL::CONST_FLAG_STRING)
-			log("%s(* %s=\"%s\" *)\n", stringf(stringf("%%%ds", indent).c_str(), " ").c_str(), log_id(s), x.decode_string().c_str());
+			log("%s(* %s=\"%s\" *)\n", get_indent_str(indent).c_str(), log_id(s), x.decode_string().c_str());
 		else if (x.flags == RTLIL::CONST_FLAG_NONE)
-			log("%s(* %s=%s *)\n", stringf(stringf("%%%ds", indent).c_str(), " ").c_str(), log_id(s), x.as_string().c_str());
+			log("%s(* %s=%s *)\n", get_indent_str(indent).c_str(), log_id(s), x.as_string().c_str());
 		else
 			log_assert(x.flags == RTLIL::CONST_FLAG_STRING || x.flags == RTLIL::CONST_FLAG_NONE); //intended to fail
 	}
@@ -53,14 +59,14 @@ struct PrintAttrsPass : public Pass {
 		for (auto mod : design->selected_modules())
 		{
 			if (design->selected_whole_module(mod)) {
-				log("%s%s\n", stringf(stringf("%%%ds", indent).c_str(), " ").c_str(), log_id(mod->name));
+				log("%s%s\n", get_indent_str(indent).c_str(), log_id(mod->name));
 				indent += 2;
 				for (auto &it : mod->attributes)
 					log_const(it.first, it.second, indent);
 			}
 
 			for (auto cell : mod->selected_cells()) {
-				log("%s%s\n", stringf(stringf("%%%ds", indent).c_str(), " ").c_str(), log_id(cell->name));
+				log("%s%s\n", get_indent_str(indent).c_str(), log_id(cell->name));
 				indent += 2;
 				for (auto &it : cell->attributes)
 					log_const(it.first, it.second, indent);
@@ -68,7 +74,7 @@ struct PrintAttrsPass : public Pass {
 			}
 
 			for (auto wire : mod->selected_wires()) {
-				log("%s%s\n", stringf(stringf("%%%ds", indent).c_str(), " ").c_str(), log_id(wire->name));
+				log("%s%s\n", get_indent_str(indent).c_str(), log_id(wire->name));
 				indent += 2;
 				for (auto &it : wire->attributes)
 					log_const(it.first, it.second, indent);