Skip to content
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.

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

Fix miss fomratted SV #1237

Merged
merged 1 commit into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions crates/emitter/src/emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,8 @@ impl Emitter {
.iter()
.any(|y| x.name() == y.identifier.identifier_token.token.text)
});

let src_line = self.src_line;
for (i, port) in unconnected_ports.enumerate() {
if i >= 1 || !connected_ports.is_empty() {
self.str(",");
Expand All @@ -928,6 +930,7 @@ impl Emitter {

let property = port.property();
self.str(".");
self.clear_adjust_line();
self.align_start(align_kind::IDENTIFIER);
self.token(&port.token);
self.align_finish(align_kind::IDENTIFIER);
Expand All @@ -939,6 +942,7 @@ impl Emitter {
self.str(")");
}

self.src_line = src_line;
self.generic_map.pop();
}

Expand Down
2 changes: 1 addition & 1 deletion testcases/map/testcases/sv/73_port_default_value.sv.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 18 additions & 12 deletions testcases/sv/73_port_default_value.sv
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,46 @@ module veryl_testcase___Module73A__0 (
input logic i_a,
input logic i_b,
input logic i_c,
output logic o_d
output logic o_d,
output logic o_e
);
always_comb o_d = 0;
always_comb o_e = 0;
endmodule
module veryl_testcase___Module73A__1 (
input logic i_a,
input logic i_b,
input logic i_c,
output logic o_d
output logic o_d,
output logic o_e
);
always_comb o_d = 0;
always_comb o_e = 0;
endmodule

module veryl_testcase_Module73B;
logic _d;

veryl_testcase___Module73A__0 u0 (
.i_a (veryl_testcase_Package73::A),
.i_b (0 ),
.i_c (0),
.o_d ( )
)
;
.o_d ( ),
.o_e ()
);
veryl_testcase___Module73A__1 u1 (
.i_a (veryl_testcase_Package73::A),
.i_b (1 ),
.i_c (0),
.o_d ( )
)
;
.o_d ( ),
.o_e ()
);
veryl_testcase___Module73A__1 u2 (
.i_a (0),
.i_b (0),
.i_a (0 ),
.i_b (0 ),
.o_d (_d),
.i_c (0),
.o_d ( )

.o_e ()
);
endmodule
//# sourceMappingURL=../map/testcases/sv/73_port_default_value.sv.map
9 changes: 7 additions & 2 deletions testcases/veryl/73_port_default_value.veryl
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,20 @@ module Module73A::<B: const> (
i_b: input logic = B ,
i_c: input logic = 0 ,
o_d: output logic = _ ,
o_e: output logic = _ ,
) {
assign o_d = 0;
assign o_e = 0;
}

module Module73B {
var _d: logic;

inst u0: Module73A::<0>;
inst u1: Module73A::<1>;
inst u2: Module73A::<1> (
i_a: 0,
i_b: 0,
i_a: 0 ,
i_b: 0 ,
o_d: _d,
);
}