Merge branch 'parsing-config-file' into 'master'

Parsing config file prototype

See merge request mhart/DancingDroids!32
This commit is contained in:
Martin HART 2020-10-29 09:15:51 +01:00
commit 15b68ae764
2 changed files with 33 additions and 3 deletions

View File

@ -18,6 +18,35 @@ use std::fs;
use std::io; use std::io;
mod robot; mod robot;
mod world;
/// Parse the config file, generate the world and robot pool.
fn parse_config(conf: String, pool: &mut Vec<robot::Robot>) -> Result<world::World, &'static str> {
let mut lines = conf.lines();
// The first line of the config file should be the World.
let raw_line: &str = match lines.next() {
Some(raw) => raw,
None => return Err("Could not read the first line of the config file !"),
};
let mut tokens = raw_line.split_whitespace();
let token1 = match tokens.next() {
Some(raw) => raw,
None => return Err("Could not read the first token of the first line !"),
};
let token2 = match tokens.next() {
Some(raw) => raw,
None => return Err("Could not read the second token of the first line !"),
};
let x: i32 = match token1.parse::<i32>() {
Ok(x) => x,
Err(err) => return Err("Could not convert token one from the first string to i32"),
};
let y: i32 = match token2.parse::<i32>() {
Ok(x) => x,
Err(err) => return Err("Could not convert token two from the first string to i32"),
};
Ok(world::World { x, y })
}
/// Retrieve the content of a file and return it as a string. /// Retrieve the content of a file and return it as a string.
fn open_file(filename: &str) -> io::Result<String> { fn open_file(filename: &str) -> io::Result<String> {
@ -41,7 +70,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let raw_conf = open_file(matches.value_of("file").unwrap_or("two_robots.txt"))?; let raw_conf = open_file(matches.value_of("file").unwrap_or("two_robots.txt"))?;
let robot_pool: Vec<robot::Robot> = Vec::new(); let mut robot_pool: Vec<robot::Robot> = Vec::new();
let world: world::World = parse_config(raw_conf, &mut robot_pool)?;
Ok(()) Ok(())
} }

View File

@ -1,5 +1,5 @@
/// The World is represented here. /// The World is represented here.
pub struct World { pub struct World {
x: i32, pub x: i32,
y: i32, pub y: i32,
} }