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

Share HashSet for locals among nested Generators

Browse Source
This commit is contained in:
Dirkjan Ochtman 2017-08-06 20:55:41 +02:00
parent 47df34c0f0
commit ed2fd2b105
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
askama_derive/src/generator.rs
View File

@ -22,14 +22,14 @@ struct Generator<'a> {
buf: String, buf: String,
indent: u8, indent: u8,
start: bool, start: bool,
locals: HashSet<String>, locals: &'a mut HashSet<String>,
next_ws: Option<&'a str>, next_ws: Option<&'a str>,
skip_ws: bool, skip_ws: bool,
} }
impl<'a> Generator<'a> { impl<'a> Generator<'a> {
fn new(locals: HashSet<String>, indent: u8) -> Generator<'a> { fn new<'n>(locals: &'n mut HashSet<String>, indent: u8) -> Generator<'n> {
Generator { Generator {
buf: String::new(), buf: String::new(),
indent: indent, indent: indent,
@ -40,12 +40,12 @@ impl<'a> Generator<'a> {
} }
} }
fn default() -> Generator<'a> { fn default<'n>(locals: &'n mut HashSet<String>) -> Generator<'n> {
Self::new(HashSet::new(), 0) Self::new(locals, 0)
} }
fn child(&self) -> Generator<'a> { fn child<'n>(&'n mut self) -> Generator<'n> {
Self::new(self.locals.clone(), self.indent) Self::new(self.locals, self.indent)
} }
fn indent(&mut self) { fn indent(&mut self) {
@ -297,9 +297,12 @@ impl<'a> Generator<'a> {
let path = path::find_template_from_path(&path, None); let path = path::find_template_from_path(&path, None);
let src = path::get_template_source(&path); let src = path::get_template_source(&path);
let nodes = parser::parse(&src); let nodes = parser::parse(&src);
let mut gen = self.child(); let nested = {
gen.handle(&nodes); let mut gen = self.child();
self.buf.push_str(&gen.result()); gen.handle(&nodes);
gen.result()
};
self.buf.push_str(&nested);
self.flush_ws(ws); self.flush_ws(ws);
} }
@ -470,7 +473,8 @@ pub fn generate(ast: &syn::DeriveInput, path: &str, mut nodes: Vec<Node>) -> Str
} }
} }
let mut gen = Generator::default(); let mut locals = HashSet::new();
let mut gen = Generator::default(&mut locals);
if !blocks.is_empty() { if !blocks.is_empty() {
if base.is_none() { if base.is_none() {
gen.define_trait(path, &block_names); gen.define_trait(path, &block_names);