From 114e9a2d74f1fa43c3418f8cd978fd4186fcb78b Mon Sep 17 00:00:00 2001 From: Muhammad Mominul Huque Date: Sun, 14 Oct 2018 20:32:57 +0600 Subject: create cli.rs and make the tests passing --- crates/tools/src/lib.rs | 67 +++++++++++++++++++++++++++++++++++++++++++++++ crates/tools/src/main.rs | 62 +++---------------------------------------- crates/tools/tests/cli.rs | 16 +++++++++++ 3 files changed, 86 insertions(+), 59 deletions(-) create mode 100644 crates/tools/tests/cli.rs diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index 97a56a31f..352f4d135 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs @@ -1,6 +1,19 @@ extern crate itertools; +#[macro_use] +extern crate failure; +extern crate ron; +extern crate tera; +extern crate heck; +use std::{ + collections::HashMap, + fs, + path::Path, +}; use itertools::Itertools; +use heck::{CamelCase, ShoutySnakeCase, SnakeCase}; + +type Result = ::std::result::Result; #[derive(Debug)] pub struct Test { @@ -41,3 +54,57 @@ pub fn collect_tests(s: &str) -> Vec<(usize, Test)> { } res } + + +pub fn update(path: &Path, contents: &str, verify: bool) -> Result<()> { + match fs::read_to_string(path) { + Ok(ref old_contents) if old_contents == contents => { + return Ok(()); + } + _ => (), + } + if verify { + bail!("`{}` is not up-to-date", path.display()); + } + eprintln!("updating {}", path.display()); + fs::write(path, contents)?; + Ok(()) +} + +pub fn render_template(template: &str, grammarfile: &str) -> Result { + let grammar: ron::value::Value = { + let text = fs::read_to_string(grammarfile)?; + ron::de::from_str(&text)? + }; + let template = fs::read_to_string(template)?; + let mut tera = tera::Tera::default(); + tera.add_raw_template("grammar", &template) + .map_err(|e| format_err!("template error: {:?}", e))?; + tera.register_function("concat", Box::new(concat)); + tera.register_filter("camel", |arg, _| { + Ok(arg.as_str().unwrap().to_camel_case().into()) + }); + tera.register_filter("snake", |arg, _| { + Ok(arg.as_str().unwrap().to_snake_case().into()) + }); + tera.register_filter("SCREAM", |arg, _| { + Ok(arg.as_str().unwrap().to_shouty_snake_case().into()) + }); + let ret = tera + .render("grammar", &grammar) + .map_err(|e| format_err!("template error: {:?}", e))?; + return Ok(ret); + + fn concat(args: HashMap) -> tera::Result { + let mut elements = Vec::new(); + for &key in ["a", "b", "c"].iter() { + let val = match args.get(key) { + Some(val) => val, + None => continue, + }; + let val = val.as_array().unwrap(); + elements.extend(val.iter().cloned()); + } + Ok(tera::Value::Array(elements)) + } +} diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs index ee900553c..cf5e662b0 100644 --- a/crates/tools/src/main.rs +++ b/crates/tools/src/main.rs @@ -1,21 +1,17 @@ extern crate clap; #[macro_use] extern crate failure; -extern crate ron; -extern crate tera; extern crate tools; extern crate walkdir; -extern crate heck; use clap::{App, Arg, SubCommand}; -use heck::{CamelCase, ShoutySnakeCase, SnakeCase}; use std::{ collections::HashMap, fs, path::{Path, PathBuf}, process::Command, }; -use tools::{collect_tests, Test}; +use tools::{Test, collect_tests, render_template, update}; type Result = ::std::result::Result; @@ -51,8 +47,8 @@ fn main() -> Result<()> { fn run_gen_command(name: &str, verify: bool) -> Result<()> { match name { "gen-kinds" => { - update(Path::new(SYNTAX_KINDS), &render_template(SYNTAX_KINDS_TEMPLATE)?, verify)?; - update(Path::new(AST), &render_template(AST_TEMPLATE)?, verify)?; + update(Path::new(SYNTAX_KINDS), &render_template(SYNTAX_KINDS_TEMPLATE, GRAMMAR)?, verify)?; + update(Path::new(AST), &render_template(AST_TEMPLATE, GRAMMAR)?, verify)?; }, "gen-tests" => { gen_tests(verify)? @@ -62,58 +58,6 @@ fn run_gen_command(name: &str, verify: bool) -> Result<()> { Ok(()) } -fn update(path: &Path, contents: &str, verify: bool) -> Result<()> { - match fs::read_to_string(path) { - Ok(ref old_contents) if old_contents == contents => { - return Ok(()); - } - _ => (), - } - if verify { - bail!("`{}` is not up-to-date", path.display()); - } - eprintln!("updating {}", path.display()); - fs::write(path, contents)?; - Ok(()) -} - -fn render_template(template: &str) -> Result { - let grammar: ron::value::Value = { - let text = fs::read_to_string(GRAMMAR)?; - ron::de::from_str(&text)? - }; - let template = fs::read_to_string(template)?; - let mut tera = tera::Tera::default(); - tera.add_raw_template("grammar", &template) - .map_err(|e| format_err!("template error: {:?}", e))?; - tera.register_function("concat", Box::new(concat)); - tera.register_filter("camel", |arg, _| { - Ok(arg.as_str().unwrap().to_camel_case().into()) - }); - tera.register_filter("snake", |arg, _| { - Ok(arg.as_str().unwrap().to_snake_case().into()) - }); - tera.register_filter("SCREAM", |arg, _| { - Ok(arg.as_str().unwrap().to_shouty_snake_case().into()) - }); - let ret = tera - .render("grammar", &grammar) - .map_err(|e| format_err!("template error: {:?}", e))?; - return Ok(ret); - - fn concat(args: HashMap) -> tera::Result { - let mut elements = Vec::new(); - for &key in ["a", "b", "c"].iter() { - let val = match args.get(key) { - Some(val) => val, - None => continue, - }; - let val = val.as_array().unwrap(); - elements.extend(val.iter().cloned()); - } - Ok(tera::Value::Array(elements)) - } -} fn gen_tests(verify: bool) -> Result<()> { let tests = tests_from_dir(Path::new(GRAMMAR_DIR))?; diff --git a/crates/tools/tests/cli.rs b/crates/tools/tests/cli.rs new file mode 100644 index 000000000..26d9a991c --- /dev/null +++ b/crates/tools/tests/cli.rs @@ -0,0 +1,16 @@ +extern crate tools; + +use std::path::Path; +use tools::{render_template, update}; + +const GRAMMAR: &str = "../ra_syntax/src/grammar.ron"; +const SYNTAX_KINDS: &str = "../ra_syntax/src/syntax_kinds/generated.rs"; +const SYNTAX_KINDS_TEMPLATE: &str = "../ra_syntax/src/syntax_kinds/generated.rs.tera"; +const AST: &str = "../ra_syntax/src/ast/generated.rs"; +const AST_TEMPLATE: &str = "../ra_syntax/src/ast/generated.rs.tera"; + +#[test] +fn verify_template_generation() { + update(Path::new(SYNTAX_KINDS), &render_template(SYNTAX_KINDS_TEMPLATE, GRAMMAR).unwrap(), true).unwrap(); + update(Path::new(AST), &render_template(AST_TEMPLATE, GRAMMAR).unwrap(), true).unwrap(); +} \ No newline at end of file -- cgit v1.2.3