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

Refactor code generation for block definitions

Browse Source
This commit is contained in:
Dirkjan Ochtman 2017-09-05 19:54:15 +02:00
parent b65d6c07bd
commit 3c9c4fe026
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
askama_shared/src/generator.rs
View File

@ -471,8 +471,9 @@ impl<'a> Generator<'a> {
self.prepare_ws(ws2); self.prepare_ws(ws2);
} }
fn write_block_def(&mut self, ws1: &WS, name: &str, nodes: &'a [Node], fn write_block_defs(&mut self, blocks: &'a [Node]) {
ws2: &WS) { for b in blocks {
if let &Node::BlockDef(ref ws1, ref name, ref nodes, ref ws2) = b {
self.writeln("#[allow(unused_variables)]"); self.writeln("#[allow(unused_variables)]");
self.writeln(&format!( self.writeln(&format!(
"fn render_block_{}_into(&self, writer: &mut ::std::fmt::Write) \ "fn render_block_{}_into(&self, writer: &mut ::std::fmt::Write) \
@ -487,6 +488,10 @@ impl<'a> Generator<'a> {
self.flush_ws(ws2); self.flush_ws(ws2);
self.writeln("Ok(())"); self.writeln("Ok(())");
self.writeln("}"); self.writeln("}");
} else {
panic!("only block definitions allowed here");
}
}
} }
fn handle_include(&mut self, ws: &WS, path: &str) { fn handle_include(&mut self, ws: &WS, path: &str) {
@ -520,13 +525,11 @@ impl<'a> Generator<'a> {
Node::Block(ref ws1, name, ref ws2) => { Node::Block(ref ws1, name, ref ws2) => {
self.write_block(ws1, name, ws2); self.write_block(ws1, name, ws2);
}, },
Node::BlockDef(ref ws1, name, ref block_nodes, ref ws2) => {
self.write_block_def(ws1, name, block_nodes, ws2);
}
Node::Include(ref ws, ref path) => { Node::Include(ref ws, ref path) => {
self.handle_include(ws, path); self.handle_include(ws, path);
}, },
Node::Call(ref ws, name, ref args) => self.write_call(ws, name, args), Node::Call(ref ws, name, ref args) => self.write_call(ws, name, args),
Node::BlockDef(_, _, _, _) |
Node::Macro(_, _) | Node::Macro(_, _) |
Node::Extends(_) => { Node::Extends(_) => {
panic!("no extends or macros allowed in content"); panic!("no extends or macros allowed in content");
@ -634,7 +637,7 @@ impl<'a> Generator<'a> {
fn impl_trait(&mut self, ast: &syn::DeriveInput, trait_name: &str, fn impl_trait(&mut self, ast: &syn::DeriveInput, trait_name: &str,
blocks: &'a [Node], nodes: Option<&'a [Node]>) { blocks: &'a [Node], nodes: Option<&'a [Node]>) {
self.write_header(ast, &trait_name, &vec![]); self.write_header(ast, &trait_name, &vec![]);
self.handle(blocks); self.write_block_defs(blocks);
self.writeln("#[allow(unused_variables)]"); self.writeln("#[allow(unused_variables)]");
self.writeln(&format!( self.writeln(&format!(
@ -673,7 +676,7 @@ impl<'a> Generator<'a> {
// Defines the `TraitFromPathName` trait. // Defines the `TraitFromPathName` trait.
fn define_trait(&mut self, trait_name: &str, blocks: &'a [Node]) { fn define_trait(&mut self, trait_name: &str, blocks: &'a [Node]) {
self.writeln(&format!("trait {} {{", &trait_name)); self.writeln(&format!("trait {} {{", &trait_name));
self.handle(blocks); self.write_block_defs(blocks);
self.writeln(&format!( self.writeln(&format!(
"fn render_trait_into(&self, timpl: &{}, writer: &mut ::std::fmt::Write) \ "fn render_trait_into(&self, timpl: &{}, writer: &mut ::std::fmt::Write) \
-> ::askama::Result<()>;", -> ::askama::Result<()>;",