diff options
| author | Kamil Rakoczy <krakoczy@antmicro.com> | 2020-07-10 10:14:31 +0200 |
|---|---|---|
| committer | Kamil Rakoczy <krakoczy@antmicro.com> | 2020-07-10 15:03:01 +0200 |
| commit | 0ffaddee5e6422c74fd002f9b1272cfe40839a13 (patch) | |
| tree | 565f93a79b8f29ff4ed0f0d7908f09297159d769 | |
| parent | de649b91943816149e28a49acb4718e41be2589f (diff) | |
| download | yosys-0ffaddee5e6422c74fd002f9b1272cfe40839a13.tar.gz yosys-0ffaddee5e6422c74fd002f9b1272cfe40839a13.tar.bz2 yosys-0ffaddee5e6422c74fd002f9b1272cfe40839a13.zip | |
Fix R/R conflicts
This commit fixes R/R conflicts introduced by commit 7e83a51.
Parameter logic is already defined as part of `param_range_type` rule.
Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>
| -rw-r--r-- | frontends/verilog/verilog_parser.y | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y index dfdb11cf0..1c86c7895 100644 --- a/frontends/verilog/verilog_parser.y +++ b/frontends/verilog/verilog_parser.y @@ -1348,13 +1348,6 @@ param_real: astbuf1->children.push_back(new AstNode(AST_REALVALUE)); } -param_logic: - TOK_LOGIC { - // SV LRM 6.11, Table 6-8: logic -- 4-state, user-defined vector size, unsigned - astbuf1->is_signed = false; - astbuf1->is_logic = true; - } - param_range: range { if ($1 != NULL) { @@ -1366,10 +1359,8 @@ param_integer_type: param_integer param_signed param_range_type: type_vec param_signed param_range param_implicit_type: param_signed param_range -param_integer_vector_type: param_logic param_signed param_range - param_type: - param_integer_type | param_integer_vector_type | param_real | param_range_type | param_implicit_type | + param_integer_type | param_real | param_range_type | param_implicit_type | hierarchical_type_id { astbuf1->is_custom_type = true; astbuf1->children.push_back(new AstNode(AST_WIRETYPE)); |