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

Remove parameterized function syntax #672

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Remove parameterized function syntax #672

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
20 changes: 3 additions & 17 deletions crates/analyzer/src/handlers/create_symbol_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,17 +558,8 @@ impl<'a> VerylGrammarTrait for CreateSymbolTable<'a> {
fn function_declaration(&mut self, arg: &FunctionDeclaration) -> Result<(), ParolError> {
match self.point {
HandlerPoint::Before => {
let mut parameters = Vec::new();
if let Some(ref x) = arg.function_declaration_opt {
if let Some(ref x) = x.with_parameter.with_parameter_opt {
let items: Vec<WithParameterItem> = x.with_parameter_list.as_ref().into();
for item in items {
parameters.push((&item).into());
}
}
}
let mut ports = Vec::new();
if let Some(ref x) = arg.function_declaration_opt0 {
if let Some(ref x) = arg.function_declaration_opt {
if let Some(ref x) = x.port_declaration.port_declaration_opt {
let items: Vec<PortDeclarationItem> =
x.port_declaration_list.as_ref().into();
Expand All @@ -578,17 +569,12 @@ impl<'a> VerylGrammarTrait for CreateSymbolTable<'a> {
}
}
let ret = arg
.function_declaration_opt1
.function_declaration_opt0
.as_ref()
.map(|x| (&*x.scalar_type).into());
let range =
TokenRange::new(&arg.function.function_token, &arg.r_brace.r_brace_token);
let property = FunctionProperty {
range,
parameters,
ports,
ret,
};
let property = FunctionProperty { range, ports, ret };
self.insert_symbol(
&arg.identifier.identifier_token.token,
SymbolKind::Function(property),
Expand Down
7 changes: 1 addition & 6 deletions crates/analyzer/src/symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,7 @@ impl fmt::Display for SymbolKind {
format!("interface ({} params)", x.parameters.len())
}
SymbolKind::Function(x) => {
format!(
"function ({} params, {} args)",
x.parameters.len(),
x.ports.len()
)
format!("function ({} args)", x.ports.len())
}
SymbolKind::Parameter(x) => {
let mut stringifier = Stringifier::new();
Expand Down Expand Up @@ -628,7 +624,6 @@ pub struct InterfaceProperty {
#[derive(Debug, Clone)]
pub struct FunctionProperty {
pub range: TokenRange,
pub parameters: Vec<Parameter>,
pub ports: Vec<Port>,
pub ret: Option<Type>,
}
Expand Down
5 changes: 1 addition & 4 deletions crates/emitter/src/aligner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,12 +814,9 @@ impl VerylWalker for Aligner {
self.function(&arg.function);
self.identifier(&arg.identifier);
if let Some(ref x) = arg.function_declaration_opt {
self.with_parameter(&x.with_parameter);
}
if let Some(ref x) = arg.function_declaration_opt0 {
self.port_declaration(&x.port_declaration);
}
if let Some(ref x) = arg.function_declaration_opt1 {
if let Some(ref x) = arg.function_declaration_opt0 {
self.minus_g_t(&x.minus_g_t);
self.scalar_type(&x.scalar_type);
self.reset_align();
Expand Down
23 changes: 4 additions & 19 deletions crates/emitter/src/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,31 +2327,22 @@ impl VerylWalker for Emitter {

/// Semantic action for non-terminal 'FunctionDeclaration'
fn function_declaration(&mut self, arg: &FunctionDeclaration) {
if let Some(ref x) = arg.function_declaration_opt {
self.str("module");
self.space(1);
self.identifier(&arg.identifier);
self.space(1);
self.with_parameter(&x.with_parameter);
self.str(";");
self.newline_push();
}
self.function(&arg.function);
self.space(1);
self.str("automatic");
self.space(1);
if let Some(ref x) = &arg.function_declaration_opt1 {
if let Some(ref x) = &arg.function_declaration_opt0 {
self.scalar_type(&x.scalar_type);
} else {
self.str("void");
}
self.space(1);
self.identifier(&arg.identifier);
if let Some(ref x) = arg.function_declaration_opt0 {
if let Some(ref x) = arg.function_declaration_opt {
self.port_declaration(&x.port_declaration);
self.space(1);
}
if let Some(ref x) = arg.function_declaration_opt1 {
if let Some(ref x) = arg.function_declaration_opt0 {
self.token(&x.minus_g_t.minus_g_t_token.replace(""));
}
self.str(";");
Expand All @@ -2371,13 +2362,7 @@ impl VerylWalker for Emitter {
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() {
self.str("endfunction");
self.newline_pop();
self.token(&arg.r_brace.r_brace_token.replace("endmodule"));
} else {
self.token(&arg.r_brace.r_brace_token.replace("endfunction"));
}
self.token(&arg.r_brace.r_brace_token.replace("endfunction"));
}

/// Semantic action for non-terminal 'ImportDeclaration'
Expand Down
5 changes: 1 addition & 4 deletions crates/formatter/src/aligner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,12 +770,9 @@ impl VerylWalker for Aligner {
self.function(&arg.function);
self.identifier(&arg.identifier);
if let Some(ref x) = arg.function_declaration_opt {
self.with_parameter(&x.with_parameter);
}
if let Some(ref x) = arg.function_declaration_opt0 {
self.port_declaration(&x.port_declaration);
}
if let Some(ref x) = arg.function_declaration_opt1 {
if let Some(ref x) = arg.function_declaration_opt0 {
self.minus_g_t(&x.minus_g_t);
self.scalar_type(&x.scalar_type);
self.reset_align();
Expand Down
6 changes: 1 addition & 5 deletions crates/formatter/src/formatter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,14 +1434,10 @@ impl VerylWalker for Formatter {
self.identifier(&arg.identifier);
self.space(1);
if let Some(ref x) = arg.function_declaration_opt {
self.with_parameter(&x.with_parameter);
self.space(1);
}
if let Some(ref x) = arg.function_declaration_opt0 {
self.port_declaration(&x.port_declaration);
self.space(1);
}
if let Some(ref x) = arg.function_declaration_opt1 {
if let Some(ref x) = arg.function_declaration_opt0 {
self.minus_g_t(&x.minus_g_t);
self.space(1);
self.scalar_type(&x.scalar_type);
Expand Down
Loading
Loading