matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add debug output in match_header_spec()

Browse source
This commit is contained in:
Matthias Beyer 2015-11-27 19:31:46 +01:00
parent beee7b20b4
commit 55d6de627a
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/storage/file.rs
View file

@ -113,6 +113,7 @@ impl<'a> Display for MatchError<'a> {
pub fn match_header_spec<'a>(spec: &'a FileHeaderSpec, data: &'a FileHeaderData) pub fn match_header_spec<'a>(spec: &'a FileHeaderSpec, data: &'a FileHeaderData)
-> Option<MatchError<'a>> -> Option<MatchError<'a>>
{ {
debug!("Start matching:\n'{:?}'\non\n{:?}", spec, data);
match (spec, data) { match (spec, data) {
(&FileHeaderSpec::Null, &FileHeaderData::Null) => { } (&FileHeaderSpec::Null, &FileHeaderData::Null) => { }
(&FileHeaderSpec::Bool, &FileHeaderData::Bool(_)) => { } (&FileHeaderSpec::Bool, &FileHeaderData::Bool(_)) => { }
@ -125,7 +126,11 @@ pub fn match_header_spec<'a>(spec: &'a FileHeaderSpec, data: &'a FileHeaderData)
&FileHeaderSpec::Key{name: ref kname, value_type: ref vtype}, &FileHeaderSpec::Key{name: ref kname, value_type: ref vtype},
&FileHeaderData::Key{name: ref n, value: ref val} &FileHeaderData::Key{name: ref n, value: ref val}
) => { ) => {
debug!("Matching Key: '{:?}' == '{:?}', Value: '{:?}' == '{:?}'",
kname, n,
vtype, val);
if kname != n { if kname != n {
debug!("Keys not matching");
unimplemented!(); unimplemented!();
} }
return match_header_spec(&*vtype, &*val); return match_header_spec(&*vtype, &*val);
@ -135,6 +140,8 @@ pub fn match_header_spec<'a>(spec: &'a FileHeaderSpec, data: &'a FileHeaderData)
&FileHeaderSpec::Map{keys: ref sks}, &FileHeaderSpec::Map{keys: ref sks},
&FileHeaderData::Map{keys: ref dks} &FileHeaderData::Map{keys: ref dks}
) => { ) => {
debug!("Matching Map: '{:?}' == '{:?}'", sks, dks);
for (s, d) in sks.iter().zip(dks.iter()) { for (s, d) in sks.iter().zip(dks.iter()) {
let res = match_header_spec(s, d); let res = match_header_spec(s, d);
if res.is_some() { if res.is_some() {
@ -147,6 +154,7 @@ pub fn match_header_spec<'a>(spec: &'a FileHeaderSpec, data: &'a FileHeaderData)
&FileHeaderSpec::Array{allowed_types: ref vtypes}, &FileHeaderSpec::Array{allowed_types: ref vtypes},
&FileHeaderData::Array{values: ref vs} &FileHeaderData::Array{values: ref vs}
) => { ) => {
debug!("Matching Array: '{:?}' == '{:?}'", vtypes, vs);
for (t, v) in vtypes.iter().zip(vs.iter()) { for (t, v) in vtypes.iter().zip(vs.iter()) {
let res = match_header_spec(t, v); let res = match_header_spec(t, v);
if res.is_some() { if res.is_some() {