github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 04:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add syntax error on empty case items, per IEEE grammar.

Browse Source
This commit is contained in:
Wilson Snyder 2024-09-25 22:40:28 -04:00
parent a3bbf13506
commit 798bbe98e8
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/verilog.y
View File

@ -2903,7 +2903,7 @@ c_generate_item<nodep>: // IEEE: generate_item (for checkers)
; ;
conditional_generate_construct<nodep>: // ==IEEE: conditional_generate_construct conditional_generate_construct<nodep>: // ==IEEE: conditional_generate_construct
yCASE '(' exprTypeCompare ')' ~c~case_generate_itemListE yENDCASE yCASE '(' exprTypeCompare ')' ~c~case_generate_itemList yENDCASE
{ $$ = new AstGenCase{$1, $3, $5}; } { $$ = new AstGenCase{$1, $3, $5}; }
| yIF '(' exprTypeCompare ')' ~c~generate_block_or_null %prec prLOWER_THAN_ELSE | yIF '(' exprTypeCompare ')' ~c~generate_block_or_null %prec prLOWER_THAN_ELSE
{ $$ = new AstGenIf{$1, $3, $5, nullptr}; } { $$ = new AstGenIf{$1, $3, $5, nullptr}; }
@ -2994,15 +2994,6 @@ genvar_iteration<nodep>: // ==IEEE: genvar_iteration
new AstConst{$2, AstConst::StringToParse{}, "'b1"}}}; } new AstConst{$2, AstConst::StringToParse{}, "'b1"}}}; }
; ;
case_generate_itemListE<caseItemp>: // IEEE: [{ case_generate_itemList }]
/* empty */ { $$ = nullptr; }
| ~c~case_generate_itemList { $$ = $1; }
;
c_case_generate_itemListE<caseItemp>: // IEEE: { case_generate_item } (for checkers)
BISONPRE_COPY(case_generate_itemListE,{s/~c~/c_/g}) // {copied}
;
case_generate_itemList<caseItemp>: // IEEE: { case_generate_itemList } case_generate_itemList<caseItemp>: // IEEE: { case_generate_itemList }
~c~case_generate_item { $$ = $1; } ~c~case_generate_item { $$ = $1; }
| ~c~case_generate_itemList ~c~case_generate_item { $$ = $1; $1->addNext($2); } | ~c~case_generate_itemList ~c~case_generate_item { $$ = $1; $1->addNext($2); }
@ -3621,15 +3612,15 @@ statement_item<nodep>: // IEEE: statement_item
{ $$ = new AstRelease{$1, $2}; v3Global.setHasForceableSignals(); } { $$ = new AstRelease{$1, $2}; v3Global.setHasForceableSignals(); }
// //
// // IEEE: case_statement // // IEEE: case_statement
| unique_priorityE caseStart caseAttrE case_itemListE yENDCASE | unique_priorityE caseStart caseAttrE case_itemList yENDCASE
{ $$ = $2; if ($4) $2->addItemsp($4); { $$ = $2; if ($4) $2->addItemsp($4);
if ($1 == uniq_UNIQUE) $2->uniquePragma(true); if ($1 == uniq_UNIQUE) $2->uniquePragma(true);
if ($1 == uniq_UNIQUE0) $2->unique0Pragma(true); if ($1 == uniq_UNIQUE0) $2->unique0Pragma(true);
if ($1 == uniq_PRIORITY) $2->priorityPragma(true); } if ($1 == uniq_PRIORITY) $2->priorityPragma(true); }
// &&& is part of expr so case_patternListE aliases to case_itemListE // &&& is part of expr so case_patternList aliases to case_itemList
| unique_priorityE caseStart caseAttrE yMATCHES case_patternListE yENDCASE | unique_priorityE caseStart caseAttrE yMATCHES case_itemList yENDCASE
{ $$ = nullptr; BBUNSUP($4, "Unsupported: matches (for tagged union)"); } { $$ = nullptr; BBUNSUP($4, "Unsupported: matches (for tagged union)"); }
| unique_priorityE caseStart caseAttrE yINSIDE case_insideListE yENDCASE | unique_priorityE caseStart caseAttrE yINSIDE case_inside_itemList yENDCASE
{ $$ = $2; if ($5) $2->addItemsp($5); { $$ = $2; if ($5) $2->addItemsp($5);
if (!$2->caseSimple()) $4->v3error("Illegal to have inside on a casex/casez"); if (!$2->caseSimple()) $4->v3error("Illegal to have inside on a casex/casez");
$2->caseInsideSet(); $2->caseInsideSet();
@ -3887,20 +3878,6 @@ caseAttrE:
| caseAttrE yVL_PARALLEL_CASE { GRAMMARP->m_caseAttrp->parallelPragma(true); } | caseAttrE yVL_PARALLEL_CASE { GRAMMARP->m_caseAttrp->parallelPragma(true); }
; ;
case_patternListE<caseItemp>: // IEEE: case_pattern_item
case_itemListE { $$ = $1; }
;
case_itemListE<caseItemp>: // IEEE: [ { case_item } ]
/* empty */ { $$ = nullptr; }
| case_itemList { $$ = $1; }
;
case_insideListE<caseItemp>: // IEEE: [ { case_inside_item } ]
/* empty */ { $$ = nullptr; }
| case_inside_itemList { $$ = $1; }
;
case_itemList<caseItemp>: // IEEE: { case_item + ... } case_itemList<caseItemp>: // IEEE: { case_item + ... }
caseCondList colon stmtBlock { $$ = new AstCaseItem{$2, $1, $3}; } caseCondList colon stmtBlock { $$ = new AstCaseItem{$2, $1, $3}; }
| yDEFAULT colon stmtBlock { $$ = new AstCaseItem{$1, nullptr, $3}; } | yDEFAULT colon stmtBlock { $$ = new AstCaseItem{$1, nullptr, $3}; }

3
test_regress/t/t_case_wild.v
View File

@ -60,9 +60,6 @@ module sub (/*AUTOARG*/
output reg [4:0] out2; output reg [4:0] out2;
always @* begin always @* begin
// Test empty cases
casez (in[0])
endcase
casez (in) casez (in)
24'b0000_0000_0000_0000_0000_0000 : {out1,out2} = {1'b0,5'h00}; 24'b0000_0000_0000_0000_0000_0000 : {out1,out2} = {1'b0,5'h00};
24'b????_????_????_????_????_???1 : {out1,out2} = {1'b1,5'h00}; 24'b????_????_????_????_????_???1 : {out1,out2} = {1'b1,5'h00};

1
test_regress/t/t_pp_underline_bad.v
View File

@ -8,6 +8,7 @@ module t;
// verilator_no_inline_module // verilator_no_inline_module
initial begin initial begin
case (1'b1) // synopsys_full_case case (1'b1) // synopsys_full_case
1'b0: $stop;
endcase endcase
$stop; // Should have failed $stop; // Should have failed
end end