diff options
| author | Larry Doolittle <ldoolitt@recycle.lbl.gov> | 2017-11-22 11:09:21 -0800 |
|---|---|---|
| committer | Larry Doolittle <ldoolitt@recycle.lbl.gov> | 2017-11-22 11:09:21 -0800 |
| commit | ab3cee7e5eb15445bb98dec362efb2f7ccaf6d27 (patch) | |
| tree | a7d63c47fdeb7b72184acb87fa62445c2ff33e6e /src/vhd2vl.y | |
| parent | 43665d04301c179b5f1269e76e8f45f20d9cd34b (diff) | |
| download | vhdl2vl-ab3cee7e5eb15445bb98dec362efb2f7ccaf6d27.tar.gz vhdl2vl-ab3cee7e5eb15445bb98dec362efb2f7ccaf6d27.zip | |
Allow second argument to CONVFUNC_2 to be expr
Adds one more shift/reduce conflict.
Include test case.
Diffstat (limited to 'src/vhd2vl.y')
| -rw-r--r-- | src/vhd2vl.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vhd2vl.y b/src/vhd2vl.y index f0efb24..b71c704 100644 --- a/src/vhd2vl.y +++ b/src/vhd2vl.y @@ -790,7 +790,7 @@ slist *emit_io_list(slist *sl) /* rule for "...ELSE IF edge THEN..." causes 1 shift/reduce conflict */ /* rule for opt_begin causes 1 shift/reduce conflict */ -%expect 2 +%expect 3 /* glr-parser is needed because processes can start with if statements, but * not have edges in them - more than one level of look-ahead is needed in that case @@ -2233,7 +2233,7 @@ expr : signal { /* single argument type conversion function e.g. std_logic_vector(x) */ $$ = addnest($3); } - | CONVFUNC_2 '(' expr ',' NATURAL ')' { + | CONVFUNC_2 '(' expr ',' expr ')' { /* two argument type conversion e.g. to_unsigned(x, 3) */ $$ = addnest($3); } |
