Support missing sub-assign and and-assign operators

Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 8c9f403a3542abc0a89d0b18390d81928b0b6040..0281063812ef94c4f71295cf3cb4ea78d6fc987c 100644 (file)
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -527,7 +527,9 @@ import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
 ".*" { return TOK_WILDCARD_CONNECT; }
 
 "|=" { SV_KEYWORD(TOK_OR_ASSIGN); }
+"&=" { SV_KEYWORD(TOK_AND_ASSIGN); }
 "+=" { SV_KEYWORD(TOK_PLUS_ASSIGN); }
+"-=" { SV_KEYWORD(TOK_SUB_ASSIGN); }
 "^=" { SV_KEYWORD(TOK_XOR_ASSIGN); }
 
 [-+]?[=*]> {

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 4c2a788096012df75f12126f932e5a9df0d4a43d..18b470bcaf27a2da64147fbed8b1e8ea8c30f7c3 100644 (file)
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -259,7 +259,7 @@ static void rewriteAsMemoryNode(AstNode *node, AstNode *rangeNode)
 %token TOK_INTEGER TOK_SIGNED TOK_ASSIGN TOK_PLUS_ASSIGN TOK_ALWAYS TOK_INITIAL
 %token TOK_ALWAYS_FF TOK_ALWAYS_COMB TOK_ALWAYS_LATCH
 %token TOK_BEGIN TOK_END TOK_IF TOK_ELSE TOK_FOR TOK_WHILE TOK_REPEAT
-%token TOK_DPI_FUNCTION TOK_POSEDGE TOK_NEGEDGE TOK_OR TOK_OR_ASSIGN TOK_XOR_ASSIGN TOK_AUTOMATIC
+%token TOK_DPI_FUNCTION TOK_POSEDGE TOK_NEGEDGE TOK_OR TOK_AUTOMATIC
 %token TOK_CASE TOK_CASEX TOK_CASEZ TOK_ENDCASE TOK_DEFAULT
 %token TOK_FUNCTION TOK_ENDFUNCTION TOK_TASK TOK_ENDTASK TOK_SPECIFY
 %token TOK_IGNORED_SPECIFY TOK_ENDSPECIFY TOK_SPECPARAM TOK_SPECIFY_AND TOK_IGNORED_SPECIFY_AND
@@ -269,7 +269,8 @@ static void rewriteAsMemoryNode(AstNode *node, AstNode *rangeNode)
 %token TOK_POS_INDEXED TOK_NEG_INDEXED TOK_PROPERTY TOK_ENUM TOK_TYPEDEF
 %token TOK_RAND TOK_CONST TOK_CHECKER TOK_ENDCHECKER TOK_EVENTUALLY
 %token TOK_INCREMENT TOK_DECREMENT TOK_UNIQUE TOK_PRIORITY
-%token TOK_STRUCT TOK_PACKED TOK_UNSIGNED TOK_INT TOK_BYTE TOK_SHORTINT TOK_UNION 
+%token TOK_STRUCT TOK_PACKED TOK_UNSIGNED TOK_INT TOK_BYTE TOK_SHORTINT TOK_UNION
+%token TOK_OR_ASSIGN TOK_XOR_ASSIGN TOK_AND_ASSIGN TOK_SUB_ASSIGN
 
 %type <ast> range range_or_multirange  non_opt_range non_opt_multirange range_or_signed_int
 %type <ast> wire_type expr basic_expr concat_list rvalue lvalue lvalue_concat_list
@@ -2358,6 +2359,22 @@ simple_behavioral_stmt:
                SET_AST_NODE_LOC(add_node, @2, @5);
                ast_stack.back()->children.push_back(node);
                append_attr(node, $1);
+       } |
+       attr lvalue TOK_SUB_ASSIGN delay expr {
+               AstNode *sub_node = new AstNode(AST_SUB, $2->clone(), $5);
+               AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, sub_node);
+               SET_AST_NODE_LOC(node, @2, @5);
+               SET_AST_NODE_LOC(sub_node, @2, @5);
+               ast_stack.back()->children.push_back(node);
+               append_attr(node, $1);
+       } |
+       attr lvalue TOK_AND_ASSIGN delay expr {
+               AstNode *and_node = new AstNode(AST_BIT_AND, $2->clone(), $5);
+               AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, and_node);
+               SET_AST_NODE_LOC(node, @2, @5);
+               SET_AST_NODE_LOC(and_node, @2, @5);
+               ast_stack.back()->children.push_back(node);
+               append_attr(node, $1);
        };
 
 // this production creates the obligatory if-else shift/reduce conflict