From 77dd1011e397d66ff321e756cf39df5064547c27 Mon Sep 17 00:00:00 2001
From: Zachary Snow <zach@zachjs.com>
Date: Thu, 3 Oct 2019 19:37:42 -0400
Subject: [PATCH] support multiple assignments in one `assign`

---
 src/Language/SystemVerilog/Parser/Parse.y | 12 ++++++------
 test/basic/part_select.sv                 |  3 +--
 test/basic/part_select.v                  |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Language/SystemVerilog/Parser/Parse.y b/src/Language/SystemVerilog/Parser/Parse.y
index cb8306e..191d8fc 100644
--- a/src/Language/SystemVerilog/Parser/Parse.y
+++ b/src/Language/SystemVerilog/Parser/Parse.y
@@ -637,8 +637,8 @@ NonGenerateModuleItem :: { [ModuleItem] }
   -- This item covers module instantiations and all declarations
   : DeclTokens(";")                      { parseDTsAsModuleItems $1 }
   | ParameterDecl(";")                   { map (MIPackageItem . Decl) $1 }
-  | "defparam" DefparamAsgns ";"         { map (uncurry Defparam) $2 }
-  | "assign" opt(DelayControl) LHS "=" Expr ";" { [Assign $2 $3 $5] }
+  | "defparam" LHSAsgns ";"              { map (uncurry Defparam) $2 }
+  | "assign" opt(DelayControl) LHSAsgns ";" { map (uncurry $ Assign $2) $3 }
   | AlwaysKW Stmt                        { [AlwaysC $1 $2] }
   | "initial" Stmt                       { [Initial $2] }
   | "genvar" Identifiers ";"             { map Genvar $2 }
@@ -750,10 +750,10 @@ NOutputGateKW :: { NOutputGateKW }
   : "buf"  { GateBuf  }
   | "not"  { GateNot  }
 
-DefparamAsgns :: { [(LHS, Expr)] }
-  : DefparamAsgn                   { [$1] }
-  | DefparamAsgns "," DefparamAsgn { $1 ++ [$3] }
-DefparamAsgn :: { (LHS, Expr) }
+LHSAsgns :: { [(LHS, Expr)] }
+  : LHSAsgn                   { [$1] }
+  | LHSAsgns "," LHSAsgn { $1 ++ [$3] }
+LHSAsgn :: { (LHS, Expr) }
   : LHS "=" Expr { ($1, $3) }
 
 PackageItems :: { [PackageItem] }
diff --git a/test/basic/part_select.sv b/test/basic/part_select.sv
index 2e0ca5b..9aa37e9 100644
--- a/test/basic/part_select.sv
+++ b/test/basic/part_select.sv
@@ -1,8 +1,7 @@
 module top;
     wire [31:0] a;
     wire [0:31] b;
-    assign a = 'h64ded943;
-    assign b = 'hb7151d17;
+    assign a = 'h64ded943, b = 'hb7151d17;
     initial begin
         $display(a[0+:8]);
         $display(a[15-:8]);
diff --git a/test/basic/part_select.v b/test/basic/part_select.v
index 1ae32a5..39d0194 100644
--- a/test/basic/part_select.v
+++ b/test/basic/part_select.v
@@ -1,8 +1,7 @@
 module top;
     wire [31:0] a;
     wire [0:31] b;
-    assign a = 'h64ded943;
-    assign b = 'hb7151d17;
+    assign a = 'h64ded943, b = 'hb7151d17;
     initial begin
         $display(a[7:0]);
         $display(a[15:8]);