matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Move helper functions outside of walk_header(), so we can use them

Browse source
This commit is contained in:
Matthias Beyer 2016-02-05 15:12:34 +01:00
parent 42aade5cef
commit 3b09e0c214
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libimagstore/src/store.rs
View file

@ -462,6 +462,20 @@ impl EntryHeader {
fn walk_header(v: &mut Value, tokens: Vec<Token>) -> Result<&mut Value> { fn walk_header(v: &mut Value, tokens: Vec<Token>) -> Result<&mut Value> {
use std::vec::IntoIter; use std::vec::IntoIter;
fn walk_iter<'a>(v: Result<&'a mut Value>, i: &mut IntoIter<Token>) -> Result<&'a mut Value> {
let next = i.next();
v.and_then(move |value| {
if let Some(token) = next {
walk_iter(EntryHeader::extract(value, &token), i)
} else {
Ok(value)
}
})
}
walk_iter(Ok(v), &mut tokens.into_iter())
}
fn extract_from_table<'a>(v: &'a mut Value, s: &String) -> Result<&'a mut Value> { fn extract_from_table<'a>(v: &'a mut Value, s: &String) -> Result<&'a mut Value> {
match v { match v {
&mut Value::Table(ref mut t) => { &mut Value::Table(ref mut t) => {
@ -474,32 +488,24 @@ impl EntryHeader {
fn extract_from_array(v: &mut Value, i: usize) -> Result<&mut Value> { fn extract_from_array(v: &mut Value, i: usize) -> Result<&mut Value> {
match v { match v {
&mut Value::Array(ref mut a) => Ok(&mut a[i]), &mut Value::Array(ref mut a) => {
if a.len() < i {
Err(StoreError::new(StoreErrorKind::HeaderKeyNotFound, None))
} else {
Ok(&mut a[i])
}
},
_ => Err(StoreError::new(StoreErrorKind::HeaderPathTypeFailure, None)), _ => Err(StoreError::new(StoreErrorKind::HeaderPathTypeFailure, None)),
} }
} }
fn extract<'a>(v: &'a mut Value, token: &Token) -> Result<&'a mut Value> { fn extract<'a>(v: &'a mut Value, token: &Token) -> Result<&'a mut Value> {
match token { match token {
&Token::Key(ref s) => extract_from_table(v, s), &Token::Key(ref s) => EntryHeader::extract_from_table(v, s),
&Token::Index(i) => extract_from_array(v, i), &Token::Index(i) => EntryHeader::extract_from_array(v, i),
} }
} }
fn walk_iter<'a>(v: Result<&'a mut Value>, i: &mut IntoIter<Token>) -> Result<&'a mut Value> {
let next = i.next();
v.and_then(move |value| {
if let Some(token) = next {
walk_iter(extract(value, &token), i)
} else {
Ok(value)
}
})
}
walk_iter(Ok(v), &mut tokens.into_iter())
}
} }
fn build_default_header() -> BTreeMap<String, Value> { fn build_default_header() -> BTreeMap<String, Value> {