Revert typedef tests to standard grammar.

diff --git a/tests/svtypes/enum_simple.sv b/tests/svtypes/enum_simple.sv
index ccaf50da03226b207a8a1441194e2e68e8c8a46f..4e4d5871c5c26e1eef24f33a573e440ad93d1637 100644 (file)
--- a/tests/svtypes/enum_simple.sv
+++ b/tests/svtypes/enum_simple.sv
@@ -5,8 +5,9 @@ module enum_simple(input clk, input rst);
        typedef enum logic [1:0] {
                ts0, ts1, ts2, ts3
        } states_t;
-       (states_t) state;
-       (states_t) enum_const = ts1;
+       states_t state;
+       (states_t) state1;
+       states_t enum_const = ts1;
 
        always @(posedge clk) begin
                if (rst) begin

diff --git a/tests/svtypes/typedef_memory.sv b/tests/svtypes/typedef_memory.sv
index 577e484adaf1875953ad7192ca2484731aae8a4e..37e63c1d00140f576a47afeffaea0aa3f29f2e9b 100644 (file)
--- a/tests/svtypes/typedef_memory.sv
+++ b/tests/svtypes/typedef_memory.sv
@@ -1,7 +1,7 @@
 module top(input [3:0] addr, wdata, input clk, wen, output reg [3:0] rdata);
        typedef logic [3:0] ram16x4_t[0:15];
 
-       (ram16x4_t) mem;
+       ram16x4_t mem;
 
        always @(posedge clk) begin
                if (wen) mem[addr] <= wdata;

diff --git a/tests/svtypes/typedef_memory_2.sv b/tests/svtypes/typedef_memory_2.sv
index f3089bf55ba027a54bea7f15946e1d915d8173ab..6d65131db21b01372076e053c3df0805705b73f5 100644 (file)
--- a/tests/svtypes/typedef_memory_2.sv
+++ b/tests/svtypes/typedef_memory_2.sv
@@ -1,7 +1,7 @@
 module top(input [3:0] addr, wdata, input clk, wen, output reg [3:0] rdata);
        typedef logic [3:0] nibble;
 
-       (nibble) mem[0:15];
+       nibble mem[0:15];
 
        always @(posedge clk) begin
                if (wen) mem[addr] <= wdata;

diff --git a/tests/svtypes/typedef_package.sv b/tests/svtypes/typedef_package.sv
index b766f10cfa3559fac6785bc4a64ed7e056615732..57a78c53a5b4c4291c9c4441e85770c33b2125e0 100644 (file)
--- a/tests/svtypes/typedef_package.sv
+++ b/tests/svtypes/typedef_package.sv
@@ -5,8 +5,8 @@ endpackage
 
 module top;
 
-       (* keep *) (pkg::uint8_t) a = 8'hAA;
-       (* keep *) (pkg::enum8_t) b_enum = pkg::bb;
+       (* keep *) pkg::uint8_t a = 8'hAA;
+       (* keep *) pkg::enum8_t b_enum = pkg::bb;
 
        always @* assert(a == 8'hAA);
        always @* assert(b_enum == 8'hBB);

diff --git a/tests/svtypes/typedef_param.sv b/tests/svtypes/typedef_param.sv
index ddbd471e0c9c91c9b15b63deee0187020bf84d4f..d838dd828e35f6fd8f8954a8c39128cb714c4ca6 100644 (file)
--- a/tests/svtypes/typedef_param.sv
+++ b/tests/svtypes/typedef_param.sv
@@ -6,12 +6,12 @@ module top;
        typedef logic [1:0] uint2_t;
        typedef logic signed [3:0] int4_t;
        typedef logic signed [7:0] int8_t;
-       typedef (int8_t) char_t;
+       typedef int8_t char_t;
 
-       parameter (uint2_t) int2 = 2'b10;
-       localparam (int4_t) int4 = -1;
-       localparam (int8_t) int8 = int4;
-       localparam (char_t) ch = int8;
+       parameter uint2_t int2 = 2'b10;
+       localparam int4_t int4 = -1;
+       localparam int8_t int8 = int4;
+       localparam char_t ch = int8;
 
 
        `STATIC_ASSERT(int2 == 2'b10);

diff --git a/tests/svtypes/typedef_scopes.sv b/tests/svtypes/typedef_scopes.sv
index 1c45c7057b2484d39b2c29f713c26ed0efd16561..d41a58147afbf5bf1f98a1bfabbed81238bf18c0 100644 (file)
--- a/tests/svtypes/typedef_scopes.sv
+++ b/tests/svtypes/typedef_scopes.sv
@@ -4,30 +4,30 @@ typedef enum logic {s0, s1} outer_enum_t;
 
 module top;
 
-       (outer_uint4_t) u4_i = 8'hA5;
-       (outer_enum_t) enum4_i = s0;
+       outer_uint4_t u4_i = 8'hA5;
+       outer_enum_t enum4_i = s0;
        always @(*) assert(u4_i == 4'h5);
        always @(*) assert(enum4_i == 1'b0);
 
        typedef logic [3:0] inner_type;
        typedef enum logic [2:0] {s2=2, s3, s4} inner_enum_t;
-       (inner_type) inner_i1 = 8'h5A;
-       (inner_enum_t) inner_enum1 = s3;
+       inner_type inner_i1 = 8'h5A;
+       inner_enum_t inner_enum1 = s3;
        always @(*) assert(inner_i1 == 4'hA);
        always @(*) assert(inner_enum1 == 3'h3);
 
        if (1) begin: genblock
                typedef logic [7:0] inner_type;
-               parameter (inner_type) inner_const = 8'hA5;
+               parameter inner_type inner_const = 8'hA5;
                typedef enum logic [2:0] {s5=5, s6, s7} inner_enum_t;
-               (inner_type) inner_gb_i = inner_const; //8'hA5;
-               (inner_enum_t) inner_gb_enum1 = s7;
+               inner_type inner_gb_i = inner_const; //8'hA5;
+               inner_enum_t inner_gb_enum1 = s7;
                always @(*) assert(inner_gb_i == 8'hA5);
                always @(*) assert(inner_gb_enum1 == 3'h7);
        end
 
-       (inner_type) inner_i2 = 8'h42;
-       (inner_enum_t) inner_enum2 = s4;
+       inner_type inner_i2 = 8'h42;
+       inner_enum_t inner_enum2 = s4;
        always @(*) assert(inner_i2 == 4'h2);
        always @(*) assert(inner_enum2 == 3'h4);
 

diff --git a/tests/svtypes/typedef_simple.sv b/tests/svtypes/typedef_simple.sv
index 7e760dee4799128a079e2647b4dfa12dfb81ffd3..8f89910e5c97c520d3db5e5897f79caa7485e6ea 100644 (file)
--- a/tests/svtypes/typedef_simple.sv
+++ b/tests/svtypes/typedef_simple.sv
@@ -3,12 +3,12 @@ module top;
        typedef logic [1:0] uint2_t;
        typedef logic signed [3:0] int4_t;
        typedef logic signed [7:0] int8_t;
-       typedef (int8_t) char_t;
+       typedef int8_t char_t;
 
-       (* keep *) (uint2_t) int2 = 2'b10;
-       (* keep *) (int4_t) int4 = -1;
-       (* keep *) (int8_t) int8 = int4;
-       (* keep *) (char_t) ch = int8;
+       (* keep *) uint2_t int2 = 2'b10;
+       (* keep *) int4_t int4 = -1;
+       (* keep *) int8_t int8 = int4;
+       (* keep *) char_t ch = int8;
 
 
        always @* assert(int2 == 2'b10);