noah/ngen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactored config

Browse source
This commit is contained in:
Noah Swerhun 2024-03-05 10:37:16 -06:00
parent be088d3f14
commit d76e080841
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/config.rs
View file

@ -15,14 +15,12 @@ impl Config {
compile_commands: false, compile_commands: false,
} }
} }
pub fn new(table: &Table) -> Self { pub fn set(&mut self, table: &Table) {
let mut ret = Self::get_default();
for k in table.keys() { for k in table.keys() {
match &*k.to_owned() { match &*k.to_owned() {
"build_dir" => { "build_dir" => {
if let Value::String(s) = table.get(k).unwrap() { if let Value::String(s) = table.get(k).unwrap() {
ret.build_dir = s.to_owned(); self.build_dir = s.to_owned();
} else { } else {
panic!("fatal: {k} invalid type, must be a string."); panic!("fatal: {k} invalid type, must be a string.");
} }
@ -30,7 +28,7 @@ impl Config {
"compile_commands" => { "compile_commands" => {
if let Value::Boolean(b) = table.get(k).unwrap() { if let Value::Boolean(b) = table.get(k).unwrap() {
eprintln!("warn: config.compile_commands has no functionality (yet)"); eprintln!("warn: config.compile_commands has no functionality (yet)");
ret.compile_commands = *b; self.compile_commands = *b;
} else { } else {
panic!("fatal: {k} invalid type, must be a boolean."); panic!("fatal: {k} invalid type, must be a boolean.");
} }
@ -38,6 +36,5 @@ impl Config {
_ => panic!("fatal: unrecognized key {k}."), _ => panic!("fatal: unrecognized key {k}."),
} }
} }
ret
} }
} }

2
src/main.rs
View file

@ -91,7 +91,7 @@ fn main() {
for k in parsed_config.keys() { for k in parsed_config.keys() {
if let Value::Table(t) = parsed_config.get(k).unwrap() { if let Value::Table(t) = parsed_config.get(k).unwrap() {
if k == "config" { if k == "config" {
config = Config::new(&t); config.set(&t);
} else { } else {
targets.push(Target::new(&t, k, Some(&targets[0]))); targets.push(Target::new(&t, k, Some(&targets[0])));
} }