diff options
| author | Clifford Wolf <clifford@clifford.at> | 2013-12-27 13:50:08 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2013-12-27 13:50:08 +0100 |
| commit | ecc30255ba70910777a4586f5bd6abc818073293 (patch) | |
| tree | 35eb7e1b849d1da91c5ab5e2ffd4251aeb8a213d /frontends/verilog | |
| parent | 11ffa7867794ee5bda2742830bda64976ad4f549 (diff) | |
Added proper === and !== support in constant expressions
Diffstat (limited to 'frontends/verilog')
| -rw-r--r-- | frontends/verilog/lexer.l | 4 | ||||
| -rw-r--r-- | frontends/verilog/parser.y | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/frontends/verilog/lexer.l b/frontends/verilog/lexer.l index a0deb755..9e606d90 100644 --- a/frontends/verilog/lexer.l +++ b/frontends/verilog/lexer.l @@ -232,8 +232,8 @@ supply1 { return TOK_SUPPLY1; } "<=" { return OP_LE; } ">=" { return OP_GE; } -"===" { return OP_EQ; } -"!==" { return OP_NE; } +"===" { return OP_EQX; } +"!==" { return OP_NEX; } "~&" { return OP_NAND; } "~|" { return OP_NOR; } diff --git a/frontends/verilog/parser.y b/frontends/verilog/parser.y index f47d1785..874482d6 100644 --- a/frontends/verilog/parser.y +++ b/frontends/verilog/parser.y @@ -117,7 +117,7 @@ static void free_attr(std::map<std::string, AstNode*> *al) %left '|' OP_NOR %left '^' OP_XNOR %left '&' OP_NAND -%left OP_EQ OP_NE +%left OP_EQ OP_NE OP_EQX OP_NEX %left '<' OP_LE OP_GE '>' %left OP_SHL OP_SHR OP_SSHL OP_SSHR %left '+' '-' @@ -1161,6 +1161,14 @@ basic_expr: $$ = new AstNode(AST_NE, $1, $4); append_attr($$, $3); } | + basic_expr OP_EQX attr basic_expr { + $$ = new AstNode(AST_EQX, $1, $4); + append_attr($$, $3); + } | + basic_expr OP_NEX attr basic_expr { + $$ = new AstNode(AST_NEX, $1, $4); + append_attr($$, $3); + } | basic_expr OP_GE attr basic_expr { $$ = new AstNode(AST_GE, $1, $4); append_attr($$, $3); |