Remove declaration assignments

Author: b-chmiel

source/MemberRemover.cpp

@@ -10,7 +10,7 @@ class MemberRemover : public OneTimeRewriter<MemberRemover> {
 
     ShouldVisitChildren handle(const NetDeclarationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
-        return DONT_VISIT_CHILDREN;
+        return VISIT_CHILDREN;
     }
 
     ShouldVisitChildren handle(const StructUnionMemberSyntax& node, bool isNodeRemovable) {
@@ -21,6 +21,11 @@ class MemberRemover : public OneTimeRewriter<MemberRemover> {
     ShouldVisitChildren handle(const DeclaratorSyntax& node,
                                bool isNodeRemovable) {  // a.o. enum fields
         removeNode(node, isNodeRemovable);
+        return VISIT_CHILDREN;
+    }
+
+    ShouldVisitChildren handle(const EqualsValueClauseSyntax& node, bool isNodeRemovable) {
+        removeNode(node, isNodeRemovable);
         return DONT_VISIT_CHILDREN;
     }
 

tests/golden/short_exit1/sv-bugpoint-minimized.sv

@@ -49,14 +49,14 @@ module serial_adder #(WIDTH=32) (
     wire [WIDTH:0] k;
     wire [WIDTH:0] l;
     wire [WIDTH:0] c;
-    wire [WIDTH:0] m;
+    wire [32:0] m = k + l + c + a + b;
     wire [WIDTH:0] n = 4;
 
     generate for (genvar i = 0; i < WIDTH; i++)
         full_adder fa(a[i], b[i], c[i], s[i], c[i+1]);
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.a = 25;
     assign foo.c = 0;
 

tests/golden/short_multifile_flag_f_verilator_errmsg/sv-bugpoint-minimized.sv

@@ -16,11 +16,12 @@ typedef struct {
 } struct_foo;
 
 module serial_adder #() ();
+    wire [32:0] m;
 
     generate
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.c = 0;
 
 endmodule

tests/golden/short_multifile_flag_y_verilator_errmsg/sv-bugpoint-minimized.sv

@@ -16,11 +16,12 @@ typedef struct {
 } struct_foo;
 
 module serial_adder #() ();
+    wire [32:0] m;
 
     generate
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.c = 0;
 
 endmodule

tests/golden/short_multifile_verilator_errmsg/sv-bugpoint-minimized.sv

@@ -16,11 +16,12 @@ typedef struct {
 } struct_foo;
 
 module serial_adder #() ();
+    wire [32:0] m;
 
     generate
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.c = 0;
 
 endmodule

tests/golden/short_verilator_errmsg/sv-bugpoint-minimized.sv

@@ -6,11 +6,12 @@ typedef struct {
 
 `begin_keywords "1800-2012"
 module serial_adder #() ();
+    wire [32:0] m;
 
     generate
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.c = 0;
 
 endmodule

tests/input_files/short_in.sv

@@ -49,14 +49,14 @@ module serial_adder #(WIDTH=32) (
     wire [WIDTH:0] k;
     wire [WIDTH:0] l;
     wire [WIDTH:0] c;
-    wire [WIDTH:0] m;
+    wire [32:0] m = k + l + c + a + b;
     wire [WIDTH:0] n = 4;
 
     generate for (genvar i = 0; i < WIDTH; i++)
         full_adder fa(a[i], b[i], c[i], s[i], c[i+1]);
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.a = 25;
     assign foo.c = 0;
 

tests/input_files/short_in/4.sv

@@ -16,14 +16,14 @@ module serial_adder #(WIDTH=32) (
     wire [WIDTH:0] k;
     wire [WIDTH:0] l;
     wire [WIDTH:0] c;
-    wire [WIDTH:0] m;
+    wire [32:0] m = k + l + c + a + b;
     wire [WIDTH:0] n = 4;
 
     generate for (genvar i = 0; i < WIDTH; i++)
         full_adder fa(a[i], b[i], c[i], s[i], c[i+1]);
     endgenerate
 
-    struct_foo foo = '{5,6};
+    struct_foo foo = '{5,m};
     assign foo.a = 25;
     assign foo.c = 0;