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 handling of paths and trait names

Browse Source
This commit is contained in:
Dirkjan Ochtman 2017-08-08 12:28:49 +02:00
parent a993920ae6
commit 20efa67bc1
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
askama_derive/src/generator.rs
View File

@ -380,9 +380,8 @@ impl<'a> Generator<'a> {
} }
// Implement `TraitFromPathName` for the given context struct. // Implement `TraitFromPathName` for the given context struct.
fn impl_trait(&mut self, ast: &syn::DeriveInput, base: &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]>) {
let trait_name = format!("TraitFrom{}", path_as_identifier(base));
self.write_header(ast, &trait_name); self.write_header(ast, &trait_name);
self.handle(blocks); self.handle(blocks);
@ -417,8 +416,7 @@ impl<'a> Generator<'a> {
} }
// Defines the `TraitFromPathName` trait. // Defines the `TraitFromPathName` trait.
fn define_trait(&mut self, path: &str, block_names: &[&str]) { fn define_trait(&mut self, trait_name: &str, block_names: &[&str]) {
let trait_name = format!("TraitFrom{}", path_as_identifier(path));
self.writeln(&format!("trait {} {{", &trait_name)); self.writeln(&format!("trait {} {{", &trait_name));
for bname in block_names { for bname in block_names {
@ -439,9 +437,21 @@ impl<'a> Generator<'a> {
} }
fn path_as_identifier(s: &str) -> String { fn trait_name_for_path(base: &Option<Expr>, path: &str) -> String {
let rooted_path = match *base {
Some(Expr::StrLit(user_path)) => {
path::find_template_from_path(user_path, Some(path))
},
_ => {
let mut path_buf = PathBuf::new();
path_buf.push(&path);
path_buf
},
};
let mut res = String::new(); let mut res = String::new();
for c in s.chars() { res.push_str("TraitFrom");
for c in rooted_path.to_string_lossy().chars() {
if c.is_alphanumeric() { if c.is_alphanumeric() {
res.push(c); res.push(c);
} else { } else {
@ -476,21 +486,13 @@ pub fn generate(ast: &syn::DeriveInput, path: &str, mut nodes: Vec<Node>) -> Str
let mut locals = HashSet::new(); let mut locals = HashSet::new();
let mut gen = Generator::default(&mut locals); let mut gen = Generator::default(&mut locals);
if !blocks.is_empty() { if !blocks.is_empty() {
let trait_name = trait_name_for_path(&base, path);
if base.is_none() { if base.is_none() {
gen.define_trait(path, &block_names); gen.define_trait(&trait_name, &block_names);
} }
let base_path = match base {
Some(Expr::StrLit(user_path)) => {
path::find_template_from_path(user_path, Some(path))
},
_ => {
let mut path_buf = PathBuf::new();
path_buf.push(&path);
path_buf
},
};
let trait_nodes = if base.is_none() { Some(&content[..]) } else { None }; let trait_nodes = if base.is_none() { Some(&content[..]) } else { None };
gen.impl_trait(ast, base_path.to_str().unwrap(), &blocks, trait_nodes); gen.impl_trait(ast, &trait_name, &blocks, trait_nodes);
gen.impl_template_for_trait(ast, base.is_some()); gen.impl_template_for_trait(ast, base.is_some());
} else { } else {
gen.impl_template(ast, &content); gen.impl_template(ast, &content);