From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 14 Feb 2015 07:41:03 +0000 (+0100)
Subject: Fixed handling of "//" in filenames in verilog pre-processor
X-Git-Tag: yosys-0.6~442
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef151b0b30c7b7253aceba6d184e7721a4eff0c0;p=yosys.git

Fixed handling of "//" in filenames in verilog pre-processor
---

diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index 4e5d16599..e2118630e 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -201,7 +201,7 @@ static void input_file(std::istream &f, std::string filename)
 	insert_input("");
 	auto it = input_buffer.begin();
 
-	input_buffer.insert(it, "`file_push " + filename + "\n");
+	input_buffer.insert(it, "`file_push \"" + filename + "\"\n");
 	while ((rc = readsome(f, buffer, sizeof(buffer)-1)) > 0) {
 		buffer[rc] = 0;
 		input_buffer.insert(it, buffer);
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index cb8fafcb2..13b3e2bfc 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -85,6 +85,10 @@ YOSYS_NAMESPACE_END
 	fn_stack.push_back(current_filename);
 	ln_stack.push_back(frontend_verilog_yyget_lineno());
 	current_filename = yytext+11;
+	if (!current_filename.empty() && current_filename.front() == '"')
+		current_filename = current_filename.substr(1);
+	if (!current_filename.empty() && current_filename.back() == '"')
+		current_filename = current_filename.substr(0, current_filename.size()-1);
 	frontend_verilog_yyset_lineno(0);
 }