luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parse join_any/join_none still as unsupported.

This commit is contained in:
Wilson Snyder 2019-12-23 15:19:22 -05:00
parent 4afde8b478
commit bacbb4cafd
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/verilog.l
View File

@ -442,6 +442,8 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5}
"inside" { FL; return yINSIDE; }
"int" { FL; return yINT; }
"interface" { FL; return yINTERFACE; }
"join_any" { FL; return yJOIN_ANY; }
"join_none" { FL; return yJOIN_NONE; }
"local" { FL; return yLOCAL__LEX; }
"logic" { FL; return yLOGIC; }
"longint" { FL; return yLONGINT; }
@ -495,8 +497,6 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5}
"ignore_bins" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"illegal_bins" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"intersect" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"join_any" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"join_none" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"matches" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"randomize" { ERROR_RSVD_WORD("SystemVerilog 2005"); }
"randsequence" { ERROR_RSVD_WORD("SystemVerilog 2005"); }

26
src/verilog.y
View File

@ -406,6 +406,8 @@ class AstSenTree;
%token<fl> yINTEGER "integer"
%token<fl> yINTERFACE "interface"
%token<fl> yJOIN "join"
%token<fl> yJOIN_ANY "join_any"
%token<fl> yJOIN_NONE "join_none"
%token<fl> yLOCALPARAM "localparam"
%token<fl> yLOCAL__COLONCOLON "local-then-::"
%token<fl> yLOCAL__ETC "local"
@ -2464,8 +2466,24 @@ seq_block<nodep>: // ==IEEE: seq_block
;
par_block<nodep>: // ==IEEE: par_block
par_blockFront blockDeclStmtList yJOIN endLabelE { $$=$1; $1->addStmtsp($2); SYMP->popScope($1); GRAMMARP->endLabel($<fl>4,$1,$4); }
| par_blockFront /**/ yJOIN endLabelE { $$=$1; SYMP->popScope($1); GRAMMARP->endLabel($<fl>3,$1,$3); }
par_blockFront blockDeclStmtList yJOIN endLabelE
{ $$ = $1; $1->addStmtsp($2);
SYMP->popScope($1); GRAMMARP->endLabel($<fl>4, $1, $4); }
| par_blockFront /**/ yJOIN endLabelE
{ $$ = $1;
SYMP->popScope($1); GRAMMARP->endLabel($<fl>3, $1, $3); }
| par_blockFront blockDeclStmtList yJOIN_ANY endLabelE
{ $$ = $1; $1->addStmtsp($2);
SYMP->popScope($1); GRAMMARP->endLabel($<fl>4, $1, $4); }
| par_blockFront /**/ yJOIN_ANY endLabelE
{ $$ = $1;
SYMP->popScope($1); GRAMMARP->endLabel($<fl>3, $1, $3); }
| par_blockFront blockDeclStmtList yJOIN_NONE endLabelE
{ $$ = $1; $1->addStmtsp($2);
SYMP->popScope($1); GRAMMARP->endLabel($<fl>4, $1, $4); }
| par_blockFront /**/ yJOIN_NONE endLabelE
{ $$ = $1;
SYMP->popScope($1); GRAMMARP->endLabel($<fl>3, $1, $3); }
;
seq_blockFront<beginp>: // IEEE: part of seq_block
@ -2475,7 +2493,9 @@ seq_blockFront<beginp>: // IEEE: part of seq_block
par_blockFront<beginp>: // IEEE: part of par_block
yFORK { $$ = new AstBegin($1, "", NULL); SYMP->pushNew($$);
BBUNSUP($1, "Unsupported: fork statements"); }
BBUNSUP($1, "Unsupported: fork statements");
// When support, record or BBUNSUP yJOIN_ANY/yJOIN_NONE
}
| yFORK ':' idAny/*new-block_identifier*/ { $$ = new AstBegin($<fl>3, *$3, NULL); SYMP->pushNew($$);
BBUNSUP($1, "Unsupported: fork statements"); }
;