zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-25 18:49:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

DEV: The cargo test command works now.

Browse Source
This commit is contained in:
Jeremy Wall 2019-09-01 19:32:45 -05:00
parent ac4dc2addd
commit 2b64c2b4e0
2 changed files with 37 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/build/mod.rs
View File

@ -250,6 +250,14 @@ where
} }
return None; return None;
} }
pub fn assert_results(&self) -> bool {
self.environment.borrow().assert_results.success
}
pub fn assert_summary(&self) -> String {
self.environment.borrow().assert_results.summary.clone()
}
} }
#[cfg(test)] #[cfg(test)]

143
src/main.rs
View File

@ -22,8 +22,8 @@ use std::collections::BTreeMap;
use std::error::Error; use std::error::Error;
use std::fs::File; use std::fs::File;
use std::io; use std::io;
use std::io::{Stdout, Stderr};
use std::io::Read; use std::io::Read;
use std::io::{Stderr, Stdout};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process; use std::process;
use std::rc::Rc; use std::rc::Rc;
@ -109,34 +109,28 @@ fn build_file<'a>(
} }
let out = std::io::stdout(); let out = std::io::stdout();
let err = std::io::stderr(); let err = std::io::stderr();
let mut builder = let mut builder = build::FileBuilder::new(std::env::current_dir()?, import_paths, out, err);
build::FileBuilder::new(std::env::current_dir()?, import_paths, out, err);
// FIXME(jwall): builder.set_strict(strict); // FIXME(jwall): builder.set_strict(strict);
if validate { if validate {
builder.enable_validate_mode(); builder.enable_validate_mode();
} }
builder.build(file_path_buf)?; builder.build(file_path_buf)?;
if validate { if validate {
// FIXME(jwall): println!("{}", builder.assert_collector.summary); println!("{}", builder.assert_summary());
} }
Ok(builder) Ok(builder)
} }
fn do_validate( fn do_validate(file: &str, strict: bool, import_paths: &Vec<PathBuf>) -> bool {
file: &str,
strict: bool,
import_paths: &Vec<PathBuf>,
) -> bool {
println!("Validating {}", file); println!("Validating {}", file);
match build_file(file, true, strict, import_paths) { match build_file(file, true, strict, import_paths) {
Ok(b) => { Ok(b) => {
// FIXM(jwall): assert collector access. if b.assert_results() {
//if b.assert_collector.success { println!("File {} Pass\n", file);
// println!("File {} Pass\n", file); } else {
//} else { println!("File {} Fail\n", file);
// println!("File {} Fail\n", file);
return false; return false;
//} }
} }
Err(msg) => { Err(msg) => {
eprintln!("Err: {}", msg); eprintln!("Err: {}", msg);
@ -146,35 +140,7 @@ fn do_validate(
return true; return true;
} }
fn process_output( fn do_compile(file: &str, strict: bool, import_paths: &Vec<PathBuf>) -> bool {
output: &Option<(String, Rc<Val>)>,
file: Option<&str>,
) -> bool {
let (typ, val) = match output {
Some((ref typ, ref val)) => (typ, val.clone()),
None => {
return false;
}
};
// FIXME(jwall): Is this function even still necessary?
//match registry.get_converter(typ) {
// Some(converter) => {
// run_converter(converter, val, file).unwrap();
// eprintln!("\nConversion successful");
// return true;
// }
// None => {
// eprintln!("No such converter {}", typ);
return false;
// }
//}
}
fn do_compile(
file: &str,
strict: bool,
import_paths: &Vec<PathBuf>,
) -> bool {
println!("Building {}", file); println!("Building {}", file);
let builder = match build_file(file, false, strict, import_paths) { let builder = match build_file(file, false, strict, import_paths) {
Ok(builder) => builder, Ok(builder) => builder,
@ -186,7 +152,6 @@ fn do_compile(
if builder.out.is_none() { if builder.out.is_none() {
eprintln!("Build results in no artifacts."); eprintln!("Build results in no artifacts.");
} }
// FIXME(jwall): tuple? process_output(&builder.out, Some(file))
return false; return false;
} }
@ -213,34 +178,21 @@ fn visit_ucg_files(
let next_path = next_item.path(); let next_path = next_item.path();
let path_as_string = String::from(next_path.to_string_lossy()); let path_as_string = String::from(next_path.to_string_lossy());
if next_path.is_dir() && recurse { if next_path.is_dir() && recurse {
if let Err(e) = visit_ucg_files( if let Err(e) = visit_ucg_files(&next_path, recurse, validate, strict, import_paths)
&next_path, {
recurse,
validate,
strict,
import_paths,
) {
eprintln!("{}", e); eprintln!("{}", e);
result = false; result = false;
} }
} else { } else {
if validate && path_as_string.ends_with("_test.ucg") { if validate && path_as_string.ends_with("_test.ucg") {
if !do_validate( if !do_validate(&path_as_string, strict, import_paths) {
&path_as_string,
strict,
import_paths,
) {
result = false; result = false;
summary.push_str(format!("{} - FAIL\n", path_as_string).as_str()) summary.push_str(format!("{} - FAIL\n", path_as_string).as_str())
} else { } else {
summary.push_str(format!("{} - PASS\n", path_as_string).as_str()) summary.push_str(format!("{} - PASS\n", path_as_string).as_str())
} }
} else if !validate && path_as_string.ends_with(".ucg") { } else if !validate && path_as_string.ends_with(".ucg") {
if !do_compile( if !do_compile(&path_as_string, strict, import_paths) {
&path_as_string,
strict,
import_paths,
) {
result = false; result = false;
} }
} }
@ -265,11 +217,7 @@ fn visit_ucg_files(
Ok(result) Ok(result)
} }
fn inspect_command( fn inspect_command(matches: &clap::ArgMatches, import_paths: &Vec<PathBuf>, strict: bool) {
matches: &clap::ArgMatches,
import_paths: &Vec<PathBuf>,
strict: bool,
) {
let file = matches.value_of("INPUT"); let file = matches.value_of("INPUT");
let sym = matches.value_of("expr"); let sym = matches.value_of("expr");
let target = matches.value_of("target").unwrap_or("json"); let target = matches.value_of("target").unwrap_or("json");
@ -332,23 +280,13 @@ fn inspect_command(
//} //}
} }
fn build_command( fn build_command(matches: &clap::ArgMatches, import_paths: &Vec<PathBuf>, strict: bool) {
matches: &clap::ArgMatches,
import_paths: &Vec<PathBuf>,
strict: bool,
) {
let files = matches.values_of("INPUT"); let files = matches.values_of("INPUT");
let recurse = matches.is_present("recurse"); let recurse = matches.is_present("recurse");
let mut ok = true; let mut ok = true;
if files.is_none() { if files.is_none() {
let curr_dir = std::env::current_dir().unwrap(); let curr_dir = std::env::current_dir().unwrap();
let ok = visit_ucg_files( let ok = visit_ucg_files(curr_dir.as_path(), recurse, false, strict, import_paths);
curr_dir.as_path(),
recurse,
false,
strict,
import_paths,
);
if let Ok(false) = ok { if let Ok(false) = ok {
process::exit(1) process::exit(1)
} }
@ -356,13 +294,7 @@ fn build_command(
} }
for file in files.unwrap() { for file in files.unwrap() {
let pb = PathBuf::from(file); let pb = PathBuf::from(file);
if let Ok(false) = visit_ucg_files( if let Ok(false) = visit_ucg_files(&pb, recurse, false, strict, import_paths) {
&pb,
recurse,
false,
strict,
import_paths,
) {
ok = false; ok = false;
} }
} }
@ -434,22 +366,12 @@ fn fmt_command(matches: &clap::ArgMatches) -> std::result::Result<(), Box<dyn Er
Ok(()) Ok(())
} }
fn test_command( fn test_command(matches: &clap::ArgMatches, import_paths: &Vec<PathBuf>, strict: bool) {
matches: &clap::ArgMatches,
import_paths: &Vec<PathBuf>,
strict: bool,
) {
let files = matches.values_of("INPUT"); let files = matches.values_of("INPUT");
let recurse = matches.is_present("recurse"); let recurse = matches.is_present("recurse");
if files.is_none() { if files.is_none() {
let curr_dir = std::env::current_dir().unwrap(); let curr_dir = std::env::current_dir().unwrap();
let ok = visit_ucg_files( let ok = visit_ucg_files(curr_dir.as_path(), recurse, true, strict, import_paths);
curr_dir.as_path(),
recurse,
true,
strict,
import_paths,
);
if let Ok(false) = ok { if let Ok(false) = ok {
process::exit(1) process::exit(1)
} }
@ -458,13 +380,7 @@ fn test_command(
for file in files.unwrap() { for file in files.unwrap() {
let pb = PathBuf::from(file); let pb = PathBuf::from(file);
//if pb.is_dir() { //if pb.is_dir() {
if let Ok(false) = visit_ucg_files( if let Ok(false) = visit_ucg_files(pb.as_path(), recurse, true, strict, import_paths) {
pb.as_path(),
recurse,
true,
strict,
import_paths,
) {
ok = false; ok = false;
} }
} }
@ -523,9 +439,7 @@ fn print_repl_help() {
println!(include_str!("help/repl.txt")); println!(include_str!("help/repl.txt"));
} }
fn do_repl( fn do_repl(import_paths: &Vec<PathBuf>) -> std::result::Result<(), Box<dyn Error>> {
import_paths: &Vec<PathBuf>,
) -> std::result::Result<(), Box<dyn Error>> {
let config = rustyline::Config::builder(); let config = rustyline::Config::builder();
let mut editor = rustyline::Editor::<()>::with_config( let mut editor = rustyline::Editor::<()>::with_config(
config config
@ -557,8 +471,12 @@ fn do_repl(
} }
} }
} }
let mut builder = let mut builder = build::FileBuilder::new(
build::FileBuilder::new(std::env::current_dir()?, import_paths, io::stdout(), io::stderr()); std::env::current_dir()?,
import_paths,
io::stdout(),
io::stderr(),
);
// loop // loop
let mut lines = ucglib::io::StatementAccumulator::new(); let mut lines = ucglib::io::StatementAccumulator::new();
println!("Welcome to the UCG repl. Ctrl-D to exit"); println!("Welcome to the UCG repl. Ctrl-D to exit");
@ -608,7 +526,6 @@ fn do_repl(
Err(e) => eprintln!("{}", e), Err(e) => eprintln!("{}", e),
Ok(v) => { Ok(v) => {
if builder.out.is_some() { if builder.out.is_some() {
// FIXME(jwall): process_output(&builder.out, None);
builder.out = None; builder.out = None;
} else { } else {
println!("{}", v); println!("{}", v);
@ -626,9 +543,7 @@ fn do_repl(
} }
} }
fn repl( fn repl(import_paths: &Vec<PathBuf>) {
import_paths: &Vec<PathBuf>,
) {
if let Err(e) = do_repl(import_paths) { if let Err(e) = do_repl(import_paths) {
eprintln!("{}", e); eprintln!("{}", e);
process::exit(1); process::exit(1);