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

Fix for br988 - support begin/end blocks nested inside generate blocks. 

This is syntax permitted in 1364-2001 but removed in 1364-2005.
This commit is contained in:
Martin Whitaker 2015-08-07 23:28:24 +01:00
parent d3bdc60201
commit d9a1cfd85f
1 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
parse.y
View File

@ -1,7 +1,7 @@
%{ %{
/* /*
* Copyright (c) 1998-2012 Stephen Williams (steve@icarus.com) * Copyright (c) 1998-2015 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -2415,7 +2415,7 @@ module_item
is supposed to be limited to certain kinds of module items, but is supposed to be limited to certain kinds of module items, but
the semantic tests will check that for us. */ the semantic tests will check that for us. */
| K_generate module_item_list_opt K_endgenerate | K_generate generate_item_list_opt K_endgenerate
| K_genvar list_of_identifiers ';' | K_genvar list_of_identifiers ';'
{ pform_genvars(@1, $2); } { pform_genvars(@1, $2); }
@ -2444,25 +2444,6 @@ module_item
K_endcase K_endcase
{ pform_endgenerate(); } { pform_endgenerate(); }
/* Handle some anachronistic syntax cases. */
| K_generate K_begin module_item_list_opt K_end K_endgenerate
{ /* Detect and warn about anachronistic begin/end use */
if (generation_flag > GN_VER2001) {
warn_count += 1;
cerr << @2 << ": warning: Anachronistic use of begin/end to surround generate schemes." << endl;
}
}
| K_generate K_begin ':' IDENTIFIER {
pform_start_generate_nblock(@2, $4);
} module_item_list_opt K_end K_endgenerate
{ /* Detect and warn about anachronistic named begin/end use */
if (generation_flag > GN_VER2001) {
warn_count += 1;
cerr << @2 << ": warning: Anachronistic use of named begin/end to surround generate schemes." << endl;
}
pform_endgenerate();
}
/* specify blocks are parsed but ignored. */ /* specify blocks are parsed but ignored. */
| K_specify K_endspecify | K_specify K_endspecify
@ -2525,6 +2506,16 @@ module_item
{ yyerror(@1, "error: Malformed $attribute parameter list."); } { yyerror(@1, "error: Malformed $attribute parameter list."); }
; ;
module_item_list
: module_item_list module_item
| module_item
;
module_item_list_opt
: module_item_list
|
;
automatic_opt automatic_opt
: K_automatic { $$ = true; } : K_automatic { $$ = true; }
| { $$ = false;} | { $$ = false;}
@ -2544,15 +2535,37 @@ generate_case_item
{ pform_endgenerate(); } { pform_endgenerate(); }
; ;
module_item_list generate_item
: module_item_list module_item : module_item
| module_item /* Handle some anachronistic syntax cases. */
; | K_begin generate_item_list_opt K_end
{ /* Detect and warn about anachronistic begin/end use */
if (generation_flag > GN_VER2001) {
warn_count += 1;
cerr << @1 << ": warning: Anachronistic use of begin/end to surround generate schemes." << endl;
}
}
| K_begin ':' IDENTIFIER {
pform_start_generate_nblock(@1, $3);
} generate_item_list_opt K_end
{ /* Detect and warn about anachronistic named begin/end use */
if (generation_flag > GN_VER2001) {
warn_count += 1;
cerr << @1 << ": warning: Anachronistic use of named begin/end to surround generate schemes." << endl;
}
pform_endgenerate();
}
;
module_item_list_opt generate_item_list
: module_item_list : generate_item_list generate_item
| | generate_item
; ;
generate_item_list_opt
: generate_item_list
|
;
/* A generate block is the thing within a generate scheme. It may be /* A generate block is the thing within a generate scheme. It may be
a single module item, an anonymous block of module items, or a a single module item, an anonymous block of module items, or a
@ -2562,8 +2575,8 @@ module_item_list_opt
generate_block generate_block
: module_item : module_item
| K_begin module_item_list_opt K_end | K_begin generate_item_list_opt K_end
| K_begin ':' IDENTIFIER module_item_list_opt K_end | K_begin ':' IDENTIFIER generate_item_list_opt K_end
{ pform_generate_block_name($3); } { pform_generate_block_name($3); }
; ;