cessen/psychopath
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Mixed matrix parsing, and strip quotes from file path in parsing.

Browse Source
This commit is contained in:
Nathan Vegdahl 2016-05-28 01:24:58 -07:00
parent e3db7cd6ca
commit 1e93e53822
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/parse/psy.rs
View File

@ -107,9 +107,23 @@ fn parse_output_info(tree: &DataTree) -> Result<String, PsyParseError> {
for child in children { for child in children {
match child { match child {
&DataTree::Leaf { type_name, contents } if type_name == "Path" => { &DataTree::Leaf { type_name, contents } if type_name == "Path" => {
// TODO: proper string escaping and quotes stripping // Trim and validate
let tc = contents.trim();
if tc.chars().count() < 2 {
// TODO: proper error
panic!();
}
if tc.chars().nth(0).unwrap() != '"' || tc.chars().last().unwrap() != '"' {
// TODO: proper error
panic!();
}
let len = tc.len();
let tc = &tc[1..len - 1];
// Parse
// TODO: proper string escaping
found_path = true; found_path = true;
path = contents.to_string(); path = tc.to_string();
} }
_ => {} _ => {}
@ -325,20 +339,20 @@ pub fn parse_matrix(contents: &str) -> Result<Matrix4x4, PsyParseError> {
ws_f32), ws_f32),
nom::eof))(contents.as_bytes()) { nom::eof))(contents.as_bytes()) {
return Ok(Matrix4x4::new_from_values(ns.0, return Ok(Matrix4x4::new_from_values(ns.0,
ns.1,
ns.2,
ns.3,
ns.4, ns.4,
ns.5,
ns.6,
ns.7,
ns.8, ns.8,
ns.9,
ns.10,
ns.11,
ns.12, ns.12,
ns.1,
ns.5,
ns.9,
ns.13, ns.13,
ns.2,
ns.6,
ns.10,
ns.14, ns.14,
ns.3,
ns.7,
ns.11,
ns.15)); ns.15));
} else { } else {
return Err(PsyParseError::UnknownError); return Err(PsyParseError::UnknownError);