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

Add parser helper rule for optional task port list 

There are a few places in the grammar where it is possible to specify a
task/function port list in parenthesis or nothing. E.g. task and function
prototypes. Factor this out into a common rule to be able to remove some
duplicated code.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2022-02-26 12:50:41 +01:00
parent d480c4d7d0
commit ad9f5a3aa6
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
parse.y
View File

@ -621,7 +621,8 @@ static void current_function_set_statement(const YYLTYPE&loc, std::vector<Statem
%type <data_type> enum_data_type enum_base_type %type <data_type> enum_data_type enum_base_type
%type <tf_ports> tf_item_declaration tf_item_list tf_item_list_opt %type <tf_ports> tf_item_declaration tf_item_list tf_item_list_opt
%type <tf_ports> tf_port_declaration tf_port_item tf_port_item_list tf_port_list tf_port_list_opt %type <tf_ports> tf_port_declaration tf_port_item tf_port_item_list
%type <tf_ports> tf_port_list tf_port_list_opt tf_port_list_parens_opt
%type <named_pexpr> modport_simple_port port_name parameter_value_byname %type <named_pexpr> modport_simple_port port_name parameter_value_byname
%type <named_pexprs> port_name_list parameter_value_byname_list %type <named_pexprs> port_name_list parameter_value_byname_list
@ -928,25 +929,14 @@ class_item /* IEEE1800-2005: A.1.8 */
/* External class method definitions... */ /* External class method definitions... */
| K_extern method_qualifier_opt K_function K_new ';' | K_extern method_qualifier_opt K_function K_new tf_port_list_parens_opt ';'
{ yyerror(@1, "sorry: External constructors are not yet supported."); }
| K_extern method_qualifier_opt K_function K_new '(' tf_port_list_opt ')' ';'
{ yyerror(@1, "sorry: External constructors are not yet supported."); } { yyerror(@1, "sorry: External constructors are not yet supported."); }
| K_extern method_qualifier_opt K_function data_type_or_implicit_or_void | K_extern method_qualifier_opt K_function data_type_or_implicit_or_void
IDENTIFIER ';' IDENTIFIER tf_port_list_parens_opt ';'
{ yyerror(@1, "sorry: External methods are not yet supported."); { yyerror(@1, "sorry: External methods are not yet supported.");
delete[] $5; delete[] $5;
} }
| K_extern method_qualifier_opt K_function data_type_or_implicit_or_void | K_extern method_qualifier_opt K_task IDENTIFIER tf_port_list_parens_opt ';'
IDENTIFIER '(' tf_port_list_opt ')' ';'
{ yyerror(@1, "sorry: External methods are not yet supported.");
delete[] $5;
}
| K_extern method_qualifier_opt K_task IDENTIFIER ';'
{ yyerror(@1, "sorry: External methods are not yet supported.");
delete[] $4;
}
| K_extern method_qualifier_opt K_task IDENTIFIER '(' tf_port_list_opt ')' ';'
{ yyerror(@1, "sorry: External methods are not yet supported."); { yyerror(@1, "sorry: External methods are not yet supported.");
delete[] $4; delete[] $4;
} }
@ -1937,10 +1927,8 @@ modport_simple_port
; ;
modport_tf_port modport_tf_port
: K_task IDENTIFIER : K_task IDENTIFIER tf_port_list_parens_opt
| K_task IDENTIFIER '(' tf_port_list_opt ')' | K_function data_type_or_implicit_or_void IDENTIFIER tf_port_list_parens_opt
| K_function data_type_or_implicit_or_void IDENTIFIER
| K_function data_type_or_implicit_or_void IDENTIFIER '(' tf_port_list_opt ')'
; ;
non_integer_type /* IEEE1800-2005: A.2.2.1 */ non_integer_type /* IEEE1800-2005: A.2.2.1 */
@ -6817,6 +6805,13 @@ tf_port_list_opt
| { $$ = 0; } | { $$ = 0; }
; ;
/* A task or function prototype can be declared with the task/function name
* followed by a port list in parenthesis or or just the task/function name by
* itself. When a port list is used it might be empty. */
tf_port_list_parens_opt
: '(' tf_port_list_opt ')' { $$ = $2; }
| { $$ = 0; }
/* Note that the lexor notices the "table" keyword and starts /* Note that the lexor notices the "table" keyword and starts
the UDPTABLE state. It needs to happen there so that all the the UDPTABLE state. It needs to happen there so that all the
characters in the table are interpreted in that mode. It is still characters in the table are interpreted in that mode. It is still