zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-26 19:00:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Allow the inpsect command to process full expressions.

Browse Source 
Related to #22
This commit is contained in:
Jeremy Wall 2019-01-07 19:50:15 -06:00
parent 8dc5b43a93
commit 03d69ede42
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@ -38,7 +38,7 @@ fn do_flags<'a, 'b>() -> clap::App<'a, 'b> {
(@arg nostrict: --("no-strict") "Turn off strict checking.") (@arg nostrict: --("no-strict") "Turn off strict checking.")
(@subcommand inspect => (@subcommand inspect =>
(about: "Inspect a specific symbol in a ucg file.") (about: "Inspect a specific symbol in a ucg file.")
(@arg sym: --sym +takes_value +required "Specify a specific binding in the ucg file to output.") (@arg expr: --expr +takes_value +required "Specify a specific binding in the ucg file to output.")
(@arg target: --format +required +takes_value "Inspect output type. (flags, json, env, exec)") (@arg target: --format +required +takes_value "Inspect output type. (flags, json, env, exec)")
(@arg INPUT: +required "Input ucg file to inspect symbol from.") (@arg INPUT: +required "Input ucg file to inspect symbol from.")
) )
@ -244,7 +244,7 @@ fn inspect_command(
strict: bool, strict: bool,
) { ) {
let file = matches.value_of("INPUT").unwrap(); let file = matches.value_of("INPUT").unwrap();
let sym = matches.value_of("sym"); let sym = matches.value_of("expr");
let target = matches.value_of("target").unwrap(); let target = matches.value_of("target").unwrap();
let mut builder = build::FileBuilder::new(file, import_paths, cache); let mut builder = build::FileBuilder::new(file, import_paths, cache);
builder.set_strict(strict); builder.set_strict(strict);
@ -257,7 +257,22 @@ fn inspect_command(
process::exit(1); process::exit(1);
} }
let val = match sym { let val = match sym {
Some(sym_name) => builder.get_out_by_name(sym_name), Some(sym_name) => {
let normalized = if !sym_name.ends_with(";") {
let mut temp = sym_name.to_owned();
temp.push_str(";");
temp
} else {
sym_name.to_owned()
};
match builder.eval_string(&normalized) {
Ok(v) => Some(v.clone()),
Err(e) => {
eprintln!("Err: {}", e);
process::exit(1);
}
}
}
None => builder.last, None => builder.last,
}; };
match val { match val {