riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Inline productions to follow house style.

This commit is contained in:
Peter Crozier 2020-03-27 16:21:45 +00:00
parent 9a8a644ad1
commit f8c065ed1c
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
frontends/verilog/verilog_parser.y
View File

@ -374,7 +374,9 @@ hierarchical_type_id:
; ;
module: module:
attr module_start TOK_ID { attr TOK_MODULE {
enterTypeScope();
} TOK_ID {
do_not_require_port_stubs = false; do_not_require_port_stubs = false;
AstNode *mod = new AstNode(AST_MODULE); AstNode *mod = new AstNode(AST_MODULE);
ast_stack.back()->children.push_back(mod); ast_stack.back()->children.push_back(mod);
@ -382,9 +384,9 @@ module:
current_ast_mod = mod; current_ast_mod = mod;
port_stubs.clear(); port_stubs.clear();
port_counter = 0; port_counter = 0;
mod->str = *$3; mod->str = *$4;
append_attr(mod, $1); append_attr(mod, $1);
delete $3; delete $4;
} module_para_opt module_args_opt ';' module_body TOK_ENDMODULE { } module_para_opt module_args_opt ';' module_body TOK_ENDMODULE {
if (port_stubs.size() != 0) if (port_stubs.size() != 0)
frontend_verilog_yyerror("Missing details for module port `%s'.", frontend_verilog_yyerror("Missing details for module port `%s'.",
@ -396,9 +398,6 @@ module:
exitTypeScope(); exitTypeScope();
}; };
module_start: TOK_MODULE { enterTypeScope(); }
;
module_para_opt: module_para_opt:
'#' '(' { astbuf1 = nullptr; } module_para_list { if (astbuf1) delete astbuf1; } ')' | /* empty */; '#' '(' { astbuf1 = nullptr; } module_para_list { if (astbuf1) delete astbuf1; } ')' | /* empty */;
@ -500,12 +499,14 @@ module_arg:
}; };
package: package:
attr package_start TOK_ID { attr TOK_PACKAGE {
enterTypeScope();
} TOK_ID {
AstNode *mod = new AstNode(AST_PACKAGE); AstNode *mod = new AstNode(AST_PACKAGE);
ast_stack.back()->children.push_back(mod); ast_stack.back()->children.push_back(mod);
ast_stack.push_back(mod); ast_stack.push_back(mod);
current_ast_mod = mod; current_ast_mod = mod;
mod->str = *$3; mod->str = *$4;
append_attr(mod, $1); append_attr(mod, $1);
} ';' package_body TOK_ENDPACKAGE { } ';' package_body TOK_ENDPACKAGE {
ast_stack.pop_back(); ast_stack.pop_back();
@ -513,9 +514,6 @@ package:
exitTypeScope(); exitTypeScope();
}; };
package_start: TOK_PACKAGE { enterTypeScope(); }
;
package_body: package_body:
package_body package_body_stmt package_body package_body_stmt
| // optional | // optional
@ -526,7 +524,9 @@ package_body_stmt:
localparam_decl; localparam_decl;
interface: interface:
interface_start TOK_ID { TOK_INTERFACE {
enterTypeScope();
} TOK_ID {
do_not_require_port_stubs = false; do_not_require_port_stubs = false;
AstNode *intf = new AstNode(AST_INTERFACE); AstNode *intf = new AstNode(AST_INTERFACE);
ast_stack.back()->children.push_back(intf); ast_stack.back()->children.push_back(intf);
@ -534,8 +534,8 @@ interface:
current_ast_mod = intf; current_ast_mod = intf;
port_stubs.clear(); port_stubs.clear();
port_counter = 0; port_counter = 0;
intf->str = *$2; intf->str = *$3;
delete $2; delete $3;
} module_para_opt module_args_opt ';' interface_body TOK_ENDINTERFACE { } module_para_opt module_args_opt ';' interface_body TOK_ENDINTERFACE {
if (port_stubs.size() != 0) if (port_stubs.size() != 0)
frontend_verilog_yyerror("Missing details for module port `%s'.", frontend_verilog_yyerror("Missing details for module port `%s'.",
@ -546,9 +546,6 @@ interface:
exitTypeScope(); exitTypeScope();
}; };
interface_start: TOK_INTERFACE { enterTypeScope(); }
;
interface_body: interface_body:
interface_body interface_body_stmt |; interface_body interface_body_stmt |;
@ -2234,21 +2231,21 @@ behavioral_stmt:
} opt_arg_list ';'{ } opt_arg_list ';'{
ast_stack.pop_back(); ast_stack.pop_back();
} | } |
attr begin opt_label { attr TOK_BEGIN {
enterTypeScope();
} opt_label {
AstNode *node = new AstNode(AST_BLOCK); AstNode *node = new AstNode(AST_BLOCK);
ast_stack.back()->children.push_back(node); ast_stack.back()->children.push_back(node);
ast_stack.push_back(node); ast_stack.push_back(node);
append_attr(node, $1); append_attr(node, $1);
if ($3 != NULL) if ($4 != NULL)
node->str = *$3; node->str = *$4;
} behavioral_stmt_list TOK_END opt_label { } behavioral_stmt_list TOK_END opt_label {
exitTypeScope(); exitTypeScope();
if ($3 != NULL && $7 != NULL && *$3 != *$7) if ($4 != NULL && $8 != NULL && *$4 != *$8)
frontend_verilog_yyerror("Begin label (%s) and end label (%s) don't match.", $3->c_str()+1, $7->c_str()+1); frontend_verilog_yyerror("Begin label (%s) and end label (%s) don't match.", $4->c_str()+1, $8->c_str()+1);
if ($3 != NULL) delete $4;
delete $3; delete $8;
if ($7 != NULL)
delete $7;
ast_stack.pop_back(); ast_stack.pop_back();
} | } |
attr TOK_FOR '(' { attr TOK_FOR '(' {
@ -2326,7 +2323,6 @@ behavioral_stmt:
ast_stack.pop_back(); ast_stack.pop_back();
}; };
begin: TOK_BEGIN { enterTypeScope(); }
; ;
unique_case_attr: unique_case_attr:
@ -2544,17 +2540,17 @@ gen_stmt:
case_type_stack.pop_back(); case_type_stack.pop_back();
ast_stack.pop_back(); ast_stack.pop_back();
} | } |
begin opt_label { TOK_BEGIN {
enterTypeScope();
} opt_label {
AstNode *node = new AstNode(AST_GENBLOCK); AstNode *node = new AstNode(AST_GENBLOCK);
node->str = $2 ? *$2 : std::string(); node->str = $3 ? *$3 : std::string();
ast_stack.back()->children.push_back(node); ast_stack.back()->children.push_back(node);
ast_stack.push_back(node); ast_stack.push_back(node);
} module_gen_body TOK_END opt_label { } module_gen_body TOK_END opt_label {
exitTypeScope(); exitTypeScope();
if ($2 != NULL) delete $3;
delete $2; delete $7;
if ($6 != NULL)
delete $6;
ast_stack.pop_back(); ast_stack.pop_back();
} | } |
TOK_MSG_TASKS { TOK_MSG_TASKS {