diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-10-30 14:01:02 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-10-30 14:01:02 +0100 |
| commit | a21481b338933f9498fd0fb11492aa2e5b7a00cd (patch) | |
| tree | 859740e786f44f0d5ffe6b3fef3c35b17a4211fd /frontends | |
| parent | ac8f4d298b3cc351fa0658857e11069a67adb7ba (diff) | |
| download | yosys-a21481b338933f9498fd0fb11492aa2e5b7a00cd.tar.gz yosys-a21481b338933f9498fd0fb11492aa2e5b7a00cd.tar.bz2 yosys-a21481b338933f9498fd0fb11492aa2e5b7a00cd.zip | |
Fixed parsing of "module mymod #( parameter foo = 1, bar = 2 ..."
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/verilog/verilog_parser.y | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y index e1304bff2..0902e58a2 100644 --- a/frontends/verilog/verilog_parser.y +++ b/frontends/verilog/verilog_parser.y @@ -240,7 +240,7 @@ module: }; module_para_opt: - '#' '(' module_para_list ')' | /* empty */; + '#' '(' { astbuf1 = nullptr; } module_para_list { if (astbuf1) delete astbuf1; } ')' | /* empty */; module_para_list: single_module_para | @@ -249,11 +249,10 @@ module_para_list: single_module_para: TOK_PARAMETER { + if (astbuf1) delete astbuf1; astbuf1 = new AstNode(AST_PARAMETER); astbuf1->children.push_back(AstNode::mkconst_int(0, true)); - } param_signed param_integer param_range single_param_decl { - delete astbuf1; - }; + } param_signed param_integer param_range single_param_decl | single_param_decl; module_args_opt: '(' ')' | /* empty */ | '(' module_args optional_comma ')'; @@ -607,6 +606,8 @@ param_decl_list: single_param_decl: TOK_ID '=' expr { + if (astbuf1 == nullptr) + frontend_verilog_yyerror("syntax error"); AstNode *node = astbuf1->clone(); node->str = *$1; delete node->children[0]; |