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.

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

Jump to bottom

Enable let declaration to be placed anywhere in block #547

Merged
merged 1 commit into from
Mar 11, 2024
Merged

Enable let declaration to be placed anywhere in block #547

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
225 changes: 202 additions & 23 deletions crates/emitter/src/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,54 @@ impl Emitter {
}
}
}

fn statement_variable_declatation_only(&mut self, arg: &Statement) -> usize {
self.adjust_line = false;
match arg {
Statement::LetStatement(x) => {
let x = &x.let_statement;
self.scalar_type(&x.array_type.scalar_type);
self.space(1);
self.identifier(&x.identifier);
if let Some(ref x) = x.array_type.array_type_opt {
self.space(1);
self.array(&x.array);
}
self.str(";");
1
}
_ => 0,
}
}

fn function_item_variable_declatation_only(&mut self, arg: &FunctionItem) -> usize {
self.adjust_line = false;
match arg {
FunctionItem::VarDeclaration(x) => {
self.var_declaration(&x.var_declaration);
1
}
FunctionItem::Statement(x) => self.statement_variable_declatation_only(&x.statement),
}
}

fn function_item_statement_only(&mut self, arg: &FunctionItem) {
match arg {
FunctionItem::VarDeclaration(_) => (),
FunctionItem::Statement(x) => self.statement(&x.statement),
};
}
}

fn is_let_statement(arg: &Statement) -> bool {
matches!(arg, Statement::LetStatement(_))
}

fn is_func_let_statement(arg: &FunctionItem) -> bool {
match arg {
FunctionItem::VarDeclaration(_) => true,
FunctionItem::Statement(x) => is_let_statement(&x.statement),
}
}

impl VerylWalker for Emitter {
Expand Down Expand Up @@ -948,15 +996,16 @@ impl VerylWalker for Emitter {

/// Semantic action for non-terminal 'LetStatement'
fn let_statement(&mut self, arg: &LetStatement) {
self.scalar_type(&arg.array_type.scalar_type);
self.space(1);
self.identifier(&arg.identifier);
if let Some(ref x) = arg.array_type.array_type_opt {
self.space(1);
self.array(&x.array);
}
self.str(";");
self.newline();
// Variable declaration is moved to statement_variable_declatation_only
//self.scalar_type(&arg.array_type.scalar_type);
//self.space(1);
//self.identifier(&arg.identifier);
//if let Some(ref x) = arg.array_type.array_type_opt {
// self.space(1);
// self.array(&x.array);
//}
//self.str(";");
//self.newline();
self.str(&arg.identifier.identifier_token.text());
self.space(1);
self.equ(&arg.equ);
Expand Down Expand Up @@ -1031,8 +1080,18 @@ impl VerylWalker for Emitter {
self.str(")");
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.if_statement_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.if_statement_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.if_statement_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.if_statement_list.is_empty());
Expand All @@ -1048,8 +1107,18 @@ impl VerylWalker for Emitter {
self.str(")");
self.space(1);
self.token_will_push(&x.l_brace.l_brace_token.replace("begin"));
for (i, x) in x.if_statement_list0_list.iter().enumerate() {
let mut base = 0;
for (i, x) in x
.if_statement_list0_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in x.if_statement_list0_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(x.if_statement_list0_list.is_empty());
Expand All @@ -1060,8 +1129,18 @@ impl VerylWalker for Emitter {
self.r#else(&x.r#else);
self.space(1);
self.token_will_push(&x.l_brace.l_brace_token.replace("begin"));
for (i, x) in x.if_statement_opt_list.iter().enumerate() {
let mut base = 0;
for (i, x) in x
.if_statement_opt_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in x.if_statement_opt_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(x.if_statement_opt_list.is_empty());
Expand All @@ -1079,8 +1158,18 @@ impl VerylWalker for Emitter {
self.str(")");
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.if_reset_statement_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.if_reset_statement_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.if_reset_statement_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.if_reset_statement_list.is_empty());
Expand All @@ -1096,8 +1185,18 @@ impl VerylWalker for Emitter {
self.str(")");
self.space(1);
self.token_will_push(&x.l_brace.l_brace_token.replace("begin"));
for (i, x) in x.if_reset_statement_list0_list.iter().enumerate() {
let mut base = 0;
for (i, x) in x
.if_reset_statement_list0_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in x.if_reset_statement_list0_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(x.if_reset_statement_list0_list.is_empty());
Expand All @@ -1108,8 +1207,18 @@ impl VerylWalker for Emitter {
self.r#else(&x.r#else);
self.space(1);
self.token_will_push(&x.l_brace.l_brace_token.replace("begin"));
for (i, x) in x.if_reset_statement_opt_list.iter().enumerate() {
let mut base = 0;
for (i, x) in x
.if_reset_statement_opt_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in x.if_reset_statement_opt_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(x.if_reset_statement_opt_list.is_empty());
Expand Down Expand Up @@ -1170,8 +1279,18 @@ impl VerylWalker for Emitter {
self.str(")");
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.for_statement_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.for_statement_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.for_statement_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.for_statement_list.is_empty());
Expand Down Expand Up @@ -1205,8 +1324,18 @@ impl VerylWalker for Emitter {
CaseItemGroup0::Statement(x) => self.statement(&x.statement),
CaseItemGroup0::LBraceCaseItemGroup0ListRBrace(x) => {
self.token_will_push(&x.l_brace.l_brace_token.replace("begin"));
for (i, x) in x.case_item_group0_list.iter().enumerate() {
let mut base = 0;
for (i, x) in x
.case_item_group0_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in x.case_item_group0_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(x.case_item_group0_list.is_empty());
Expand Down Expand Up @@ -1369,8 +1498,18 @@ impl VerylWalker for Emitter {
self.r_paren(&arg.r_paren);
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.always_ff_declaration_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.always_ff_declaration_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.always_ff_declaration_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.always_ff_declaration_list.is_empty());
Expand Down Expand Up @@ -1445,8 +1584,18 @@ impl VerylWalker for Emitter {
self.always_comb(&arg.always_comb);
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.always_comb_declaration_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.always_comb_declaration_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.always_comb_declaration_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.always_comb_declaration_list.is_empty());
Expand Down Expand Up @@ -1643,8 +1792,18 @@ impl VerylWalker for Emitter {
self.initial(&arg.initial);
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.initial_declaration_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.initial_declaration_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.initial_declaration_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.initial_declaration_list.is_empty());
Expand All @@ -1656,8 +1815,18 @@ impl VerylWalker for Emitter {
self.r#final(&arg.r#final);
self.space(1);
self.token_will_push(&arg.l_brace.l_brace_token.replace("begin"));
for (i, x) in arg.final_declaration_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.final_declaration_list
.iter()
.filter(|x| is_let_statement(&x.statement))
.enumerate()
{
self.newline_list(i);
base += self.statement_variable_declatation_only(&x.statement);
}
for (i, x) in arg.final_declaration_list.iter().enumerate() {
self.newline_list(base + i);
self.statement(&x.statement);
}
self.newline_list_post(arg.final_declaration_list.is_empty());
Expand Down Expand Up @@ -2015,9 +2184,19 @@ impl VerylWalker for Emitter {
}
self.str(";");
self.token_will_push(&arg.l_brace.l_brace_token.replace(""));
for (i, x) in arg.function_declaration_list.iter().enumerate() {
let mut base = 0;
for (i, x) in arg
.function_declaration_list
.iter()
.filter(|x| is_func_let_statement(&x.function_item))
.enumerate()
{
self.newline_list(i);
self.function_item(&x.function_item);
base += self.function_item_variable_declatation_only(&x.function_item);
}
for (i, x) in arg.function_declaration_list.iter().enumerate() {
self.newline_list(base + i);
self.function_item_statement_only(&x.function_item);
}
self.newline_list_post(arg.function_declaration_list.is_empty());
if arg.function_declaration_opt.is_some() {
Expand Down
33 changes: 33 additions & 0 deletions testcases/sv/46_let_anywhere.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module veryl_testcase_Module46;
logic a;
logic [10-1:0] b;
logic [10-1:0] c;
logic [10-1:0] d;
logic [10-1:0] e;

always_ff @ (posedge a) begin
logic [10-1:0] x;
d <= 1;
x = 1;
b <= x * 1;
end

always_comb begin
logic [10-1:0] y;
e = 1;
y = 1;
c = y * 1;
end

function automatic logic [10-1:0] FuncA(
input logic [10-1:0] a,
output logic [10-1:0] b,
ref logic [10-1:0] c
) ;
int unsigned d;
c = a / 1;
d = 1;
b = a + 1 + d;
return a + 2;
endfunction
endmodule
Loading
Loading