Skip to content

Fix: reject implicit data types in data_declaration #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0ncorhynchus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: reject implicit data types in data_declaration #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion sv-parser-parser/src/declarations/type_declarations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ pub(crate) fn data_declaration_variable(s: Span) -> IResult<Span, DataDeclaratio
let (s, a) = opt(r#const)(s)?;
let (s, b) = opt(var)(s)?;
let (s, c) = opt(lifetime)(s)?;
let (s, d) = data_type_or_implicit_data_declaration_variable(s)?;
let (s, d) = (verify(
data_type_or_implicit_data_declaration_variable,
|d| match d {
DataTypeOrImplicit::DataType(_) => true,
DataTypeOrImplicit::ImplicitDataType(_) => b.is_some(),
},
))(s)?;
let (s, e) = list_of_variable_decl_assignments(s)?;
let (s, f) = symbol(";")(s)?;
Ok((
Expand Down
93 changes: 51 additions & 42 deletions sv-parser-parser/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ mod unit {
test!(method_call, "variable.method1().member", Ok((_, _)));
}

#[test]
fn test_data_declaration() {
// Implicit data_type is not allowed unless the `var` keyword is used.
test!(data_declaration, "logic x = 0;", Ok((_, _)));
test!(data_declaration, " x = 0;", Err(_));
test!(data_declaration, "var logic x = 0;", Ok((_, _)));
test!(data_declaration, "var x = 0;", Ok((_, _)));
test!(data_declaration, "const logic x = 0;", Ok((_, _)));
test!(data_declaration, "const x = 0;", Err(_));
}

#[test]
fn test_pulldown_strength() {
test!(pulldown_strength, "(supply0, strong1)", Ok((_, _)));
Expand Down Expand Up @@ -711,7 +722,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"typedef struct {int a; shortreal b;} ab;
ab c;
c = '{0, 0.0}; // structure literal type determined from
Expand All @@ -724,7 +735,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
many1(statement),
r##"c = '{a:0, b:0.0}; // member name and value for that member
c = '{default:0}; // all elements of structure c are set to 0
d = ab'{int:1, shortreal:1.0}; // data type and default value for all
Expand All @@ -737,7 +748,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"struct {int X,Y,Z;} XYZ = '{3{1}};
typedef struct {int a,b[4];} ab_t;
int a,b,c;
Expand Down Expand Up @@ -788,18 +799,18 @@ mod spec {
Ok((_, _))
);
test!(
module_item,
statement,
r##"a = b + (* mode = "cla" *) c; // sets the value for the attribute mode
// to be the string cla."##,
Ok((_, _))
);
test!(
module_item,
statement,
r##"a = add (* mode = "cla" *) (b, c);"##,
Ok((_, _))
);
test!(
module_item,
statement,
r##"a = b ? (* no_glitch *) c : d;"##,
Ok((_, _))
);
Expand Down Expand Up @@ -1180,7 +1191,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"typedef logic [15:0] r_t;
r_t r;
integer i = 1;
Expand All @@ -1204,7 +1215,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(statement, data_declaration),
r##"str = "123";
int i = str.atoi(); // assigns 123 to i."##,
Ok((_, _))
Expand Down Expand Up @@ -1328,7 +1339,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"typedef enum { red, green, blue, yellow, white, black } Colors;

Colors col;
Expand All @@ -1340,7 +1351,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"typedef enum {Red, Green, Blue} Colors;
typedef enum {Mo,Tu,We,Th,Fr,Sa,Su} Week;
Colors C;
Expand Down Expand Up @@ -1707,7 +1718,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(data_declaration, statement),
r##"var type(a+b) c, d;
c = type(i+3)'(v[15:0]);"##,
Ok((_, _))
Expand All @@ -1732,12 +1743,12 @@ mod spec {
// Ok((_, _))
//);
test!(
many1(module_item),
many1(statement),
r##"A = cast_t1'(expr_1) + cast_t2'(expr_2);"##,
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"cast_t1 temp1;
cast_t2 temp2;

Expand All @@ -1747,7 +1758,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"logic [7:0] regA;
logic signed [7:0] regS;

Expand All @@ -1756,7 +1767,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"typedef struct {
bit isfloat;
union { int i; shortreal f; } n; // anonymous type
Expand Down Expand Up @@ -1787,8 +1798,8 @@ mod spec {
end"##,
Ok((_, _))
);
test!(many1(module_item), r##"col = Colors'(2 + 3);"##, Ok((_, _)));
test!(many1(module_item), r##"B = dest_t'(A);"##, Ok((_, _)));
test!(statement, r##"col = Colors'(2 + 3);"##, Ok((_, _)));
test!(statement, r##"B = dest_t'(A);"##, Ok((_, _)));
test!(
many1(module_item),
r##"struct {bit[7:0] a; shortint b;} a;
Expand Down Expand Up @@ -1855,7 +1866,7 @@ mod spec {
// Ok((_, _))
//);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"typedef byte channel_type[$];
channel_type channel;
channel = {channel, channel_type'(genPkt())};"##,
Expand Down Expand Up @@ -1983,7 +1994,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"typedef union packed { // default unsigned
s_atmcell acell;
bit [423:0] bit_slice;
Expand Down Expand Up @@ -2040,7 +2051,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(data_declaration, many1(statement)),
r##"logic [7:0] mema [0:255]; // declares a memory array of 256 8-bit
// elements. The array indices are 0 to 255

Expand All @@ -2056,7 +2067,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
many1(statement),
r##"joe[9] = joe[8] + 1; // 4 byte add
joe[7][3:2] = joe[6][1:0]; // 2 byte copy"##,
Ok((_, _))
Expand Down Expand Up @@ -2086,7 +2097,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"int A[2][3][4], B[2][3][4], C[5][4];
A[0][2] = B[1][1]; // assign a subarray composed of four ints
A[1] = B[0]; // assign a subarray composed of three arrays of
Expand All @@ -2101,28 +2112,28 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"logic [63:0] data;
logic [7:0] byte2;
byte2 = data[23:16]; // an 8-bit part-select from data"##,
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"bit [3:0] [7:0] j; // j is a packed array
byte k;
k = j[2]; // select a single 8-bit element from j"##,
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"bit signed [31:0] busA [7:0] ; // unpacked array of 8 32-bit vectors
int busB [1:0]; // unpacked array of 2 integers
busB = busA[7:6]; // select a 2-vector slice from busA"##,
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"int i = bitvec[j +: k]; // k must be constant.
int a[x:y], b[y:z], e;
a = {b[c -: d], e}; // d must be constant"##,
Expand Down Expand Up @@ -2209,7 +2220,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"int A[10:1]; // fixed-size array of 10 elements
int B[0:9]; // fixed-size array of 10 elements
int C[24:1]; // fixed-size array of 24 elements
Expand Down Expand Up @@ -2262,7 +2273,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), statement),
r##"string d[1:5] = '{ "a", "b", "c", "d", "e" };
string p[];
p = { d[1:3], "hello", d[4:5] };"##,
Expand Down Expand Up @@ -2624,7 +2635,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(data_declaration, statement),
r##"Packet p; // declare a variable of class Packet
p = new; // initialize variable to a new allocated object
// of the class Packet"##,
Expand Down Expand Up @@ -2669,13 +2680,13 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(data_declaration, statement),
r##"Packet p = new;
status = p.current_status();"##,
Ok((_, _))
);
test!(
many1(module_item),
statement,
r##"status = current_status(p);"##,
Ok((_, _))
);
Expand Down Expand Up @@ -2766,7 +2777,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(data_declaration, statement),
r##"Packet p;
c = $fgetc( p.fileID );"##,
Ok((_, _))
Expand Down Expand Up @@ -2804,15 +2815,15 @@ mod spec {
Ok((_, _))
);
test!(many1(module_item), r##"Packet p1;"##, Ok((_, _)));
test!(many1(module_item), r##"p1 = new;"##, Ok((_, _)));
test!(statement, r##"p1 = new;"##, Ok((_, _)));
test!(
many1(module_item),
pair(data_declaration, statement),
r##"Packet p2;
p2 = p1;"##,
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"Packet p1;
Packet p2;
p1 = new;
Expand Down Expand Up @@ -3062,7 +3073,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
pair(many1(data_declaration), many1(statement)),
r##"EtherPacket ep = new; // extends BasePacket
TokenPacket tp = new; // extends BasePacket
GPSPacket gp = new; // extends EtherPacket
Expand Down Expand Up @@ -3502,7 +3513,7 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
statement,
r##"put_ref = new(); // illegal"##,
Ok((_, _))
);
Expand Down Expand Up @@ -4599,11 +4610,9 @@ mod spec {
Ok((_, _))
);
test!(
many1(module_item),
r##"initial begin
unpackedbits = '{2 {y}} ; // same as '{y, y}
int n[1:2][1:3] = '{2{'{3{y}}}}; // same as '{'{y,y,y},'{y,y,y}}
end"##,
pair(statement, data_declaration),
r##"unpackedbits = '{2 {y}} ; // same as '{y, y}
int n[1:2][1:3] = '{2{'{3{y}}}}; // same as '{'{y,y,y},'{y,y,y}}"##,
Ok((_, _))
);
test!(
Expand Down