From 8ec96ec8065bb42570ddc5ecd843331a31990032 Mon Sep 17 00:00:00 2001
From: Jason Xu <40355221+JasonBrave@users.noreply.github.com>
Date: Fri, 7 Mar 2025 00:50:28 -0500
Subject: [PATCH] Address most comments

---
 .gitignore                            |  2 +-
 frontends/verilog/verilog_frontend.cc | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c209ff4f..239ae742b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ __pycache__
 /qtcreator.config
 /qtcreator.creator
 /qtcreator.creator.user
+/compile_commands.json
 /coverage.info
 /coverage_html
 /Makefile.conf
@@ -53,4 +54,3 @@ __pycache__
 /venv
 /boost
 /ffi
-/compile_commands.json
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index d2cea3599..fd317bf22 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -686,11 +686,11 @@ struct VerilogFileList : public Pass {
 		log("\n");
 		log("    -F file_list_path\n");
 		log("        File list file contains list of Verilog files to be parsed, any\n");
-		log("        ' path is treated relative to the file list file'\n");
+		log("          path is treated relative to the file list file\n");
 		log("\n");
 		log("    -f file_list_path\n");
 		log("        File list file contains list of Verilog files to be parsed, any\n");
-		log("        ' path is treated relative to current working directroy'\n");
+		log("          path is treated relative to current working directroy\n");
 		log("\n");
 	}
 
@@ -710,21 +710,21 @@ struct VerilogFileList : public Pass {
 				continue;
 			}
 
-			std::string verilog_file_path;
+			std::filesystem::path verilog_file_path;
 			if (relative_to_file_list_path) {
-				verilog_file_path = file_list_parent_dir.string() + '/' + v_file_name;
+				verilog_file_path = file_list_parent_dir / v_file_name;
 			} else {
-				verilog_file_path = std::filesystem::current_path().string() + '/' + v_file_name;
+				verilog_file_path = std::filesystem::current_path() / v_file_name;
 			}
 
-			bool is_sv = (std::filesystem::path(verilog_file_path).extension() == ".sv");
+			bool is_sv = (verilog_file_path.extension() == ".sv");
 
-			std::string command = "read_verilog";
+			std::vector<std::string> read_verilog_cmd = {"read_verilog", "-defer"};
 			if (is_sv) {
-				command += " -sv";
+				read_verilog_cmd.push_back("-sv");
 			}
-			command = command + ' ' + verilog_file_path;
-			Pass::call(design, command);
+			read_verilog_cmd.push_back(verilog_file_path.string());
+			Pass::call(design, read_verilog_cmd);
 		}
 
 		flist.close();
@@ -748,9 +748,7 @@ struct VerilogFileList : public Pass {
 			break;
 		}
 
-		if (args.size() != argidx) {
-			cmd_error(args, argidx, "Extra argument.");
-		}
+		extra_args(args, argidx, design);
 	}
 } VerilogFilelist;