itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-10-02 15:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move visit_match_params into its own method

Browse Source
This commit is contained in:
René Kijewski 2021-06-29 14:57:20 +02:00 committed by Dirkjan Ochtman
parent c1fa2d6146
commit c3e8b2cc72
1 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
askama_shared/src/generator.rs
View File

@ -564,44 +564,7 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
None => buf.write("_"), None => buf.write("_"),
}; };
match params { self.visit_match_params(buf, params);
MatchParameters::Simple(params) => {
if !params.is_empty() {
buf.write("(");
for (i, param) in params.iter().enumerate() {
if let MatchParameter::Name(p) = *param {
self.locals.insert_with_default(p);
}
if i > 0 {
buf.write(", ");
}
self.visit_match_param(buf, param);
}
buf.write(")");
}
}
MatchParameters::Named(params) => {
buf.write("{");
for (i, param) in params.iter().enumerate() {
if let Some(MatchParameter::Name(p)) = param.1 {
let p = normalize_identifier(p);
self.locals.insert_with_default(p);
} else {
self.locals.insert_with_default(param.0);
}
if i > 0 {
buf.write(", ");
}
buf.write(param.0);
if let Some(param) = &param.1 {
buf.write(":");
self.visit_match_param(buf, param);
}
}
buf.write("}");
}
}
buf.writeln(" => {")?; buf.writeln(" => {")?;
arm_size = self.handle(ctx, body, buf, AstLevel::Nested)?; arm_size = self.handle(ctx, body, buf, AstLevel::Nested)?;
@ -1155,6 +1118,47 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
wrapped wrapped
} }
fn visit_match_params(&mut self, buf: &mut Buffer, params: &MatchParameters<'a>) {
match params {
MatchParameters::Simple(params) => {
if !params.is_empty() {
buf.write("(");
for (i, param) in params.iter().enumerate() {
if let MatchParameter::Name(p) = *param {
self.locals.insert_with_default(p);
}
if i > 0 {
buf.write(", ");
}
self.visit_match_param(buf, param);
}
buf.write(")");
}
}
MatchParameters::Named(params) => {
buf.write("{");
for (i, param) in params.iter().enumerate() {
if let Some(MatchParameter::Name(p)) = param.1 {
let p = normalize_identifier(p);
self.locals.insert_with_default(p);
} else {
self.locals.insert_with_default(param.0);
}
if i > 0 {
buf.write(", ");
}
buf.write(param.0);
if let Some(param) = &param.1 {
buf.write(":");
self.visit_match_param(buf, param);
}
}
buf.write("}");
}
}
}
fn visit_filter( fn visit_filter(
&mut self, &mut self,
buf: &mut Buffer, buf: &mut Buffer,