From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 13 Feb 2020 21:06:13 +0000 (-0800)
Subject: verilog: ignore '&&&' when not in -specify mode
X-Git-Tag: working-ls180~790^2~4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e51dc1856aae456e15cafd484997bfbd102175e;p=yosys.git

verilog: ignore '&&&' when not in -specify mode
---

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 9b43c250e..18fa2966b 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -440,7 +440,7 @@ import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
 }
 
 "&&&" {
-	if (!specify_mode) REJECT;
+	if (!specify_mode) return TOK_IGNORED_SPECIFY_AND;
 	return TOK_SPECIFY_AND;
 }
 
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 9b1b07f86..f37c6d99b 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -146,7 +146,7 @@ struct specify_rise_fall {
 %token TOK_DPI_FUNCTION TOK_POSEDGE TOK_NEGEDGE TOK_OR TOK_AUTOMATIC
 %token TOK_CASE TOK_CASEX TOK_CASEZ TOK_ENDCASE TOK_DEFAULT
 %token TOK_FUNCTION TOK_ENDFUNCTION TOK_TASK TOK_ENDTASK TOK_SPECIFY
-%token TOK_IGNORED_SPECIFY TOK_ENDSPECIFY TOK_SPECPARAM TOK_SPECIFY_AND
+%token TOK_IGNORED_SPECIFY TOK_ENDSPECIFY TOK_SPECPARAM TOK_SPECIFY_AND TOK_IGNORED_SPECIFY_AND
 %token TOK_GENERATE TOK_ENDGENERATE TOK_GENVAR TOK_REAL
 %token TOK_SYNOPSYS_FULL_CASE TOK_SYNOPSYS_PARALLEL_CASE
 %token TOK_SUPPLY0 TOK_SUPPLY1 TOK_TO_SIGNED TOK_TO_UNSIGNED
@@ -1117,6 +1117,7 @@ system_timing_arg :
 
 system_timing_args :
 	system_timing_arg |
+	system_timing_args TOK_IGNORED_SPECIFY_AND system_timing_arg |
 	system_timing_args ',' system_timing_arg ;
 
 path_delay_expression :
@@ -1137,9 +1138,9 @@ ignspec_constant_expression:
 ignspec_expr:
 	expr { delete $1; } |
 	expr ':' expr ':' expr {
-                delete $1;
-                delete $3;
-                delete $5;
+		delete $1;
+		delete $3;
+		delete $5;
 	};
 
 ignspec_id:
diff --git a/tests/various/specify.v b/tests/various/specify.v
index 5006e4c38..aa8aca4bc 100644
--- a/tests/various/specify.v
+++ b/tests/various/specify.v
@@ -51,3 +51,9 @@ specify
   $setuphold(d, posedge clk, 1:2:3, 4:5:6);
 endspecify
 endmodule
+
+module test5(input clk, d, e, output q);
+specify
+  $setup(d, posedge clk &&& e, 1:2:3);
+endspecify
+endmodule