diff --git a/src/protocol/parser.rs b/src/protocol/parser.rs index ab1611acf6699235c4208c300f26d606283ddeb7..dd1bae03bcf1a1f6e8a6aac49c694c4bba94ab04 100644 --- a/src/protocol/parser.rs +++ b/src/protocol/parser.rs @@ -1575,7 +1575,9 @@ struct IndexableExpressions { } impl IndexableExpressions { - fn new() -> Self { IndexableExpressions { indexable: false } } + fn new() -> Self { + IndexableExpressions { indexable: false } + } fn error(&self, position: InputPosition) -> VisitorResult { Err(ParseError::new(position, "Unindexable expression")) } @@ -1818,66 +1820,66 @@ impl<'a> Parser<'a> { } } -#[cfg(test)] -mod tests { - extern crate test_generator; - - use std::fs::File; - use std::io::Read; - use std::path::Path; - - use test_generator::test_resources; - - use super::*; - - #[test_resources("testdata/parser/positive/*.pdl")] - fn batch1(resource: &str) { - let path = Path::new(resource); - let mut heap = Heap::new(); - let mut source = InputSource::from_file(&path).unwrap(); - let mut parser = Parser::new(&mut source); - match parser.parse(&mut heap) { - Ok(_) => {} - Err(err) => { - println!("{}", err.display(&source)); - println!("{:?}", err); - assert!(false); - } - } - } - - #[test_resources("testdata/parser/negative/*.pdl")] - fn batch2(resource: &str) { - let path = Path::new(resource); - let expect = path.with_extension("txt"); - let mut heap = Heap::new(); - let mut source = InputSource::from_file(&path).unwrap(); - let mut parser = Parser::new(&mut source); - match parser.parse(&mut heap) { - Ok(pd) => { - println!("{:?}", heap[pd]); - println!("Expected parse error:"); - - let mut cev: Vec = Vec::new(); - let mut f = File::open(expect).unwrap(); - f.read_to_end(&mut cev).unwrap(); - println!("{}", String::from_utf8_lossy(&cev)); - assert!(false); - } - Err(err) => { - println!("{:?}", err); - - let mut vec: Vec = Vec::new(); - err.write(&source, &mut vec).unwrap(); - println!("{}", String::from_utf8_lossy(&vec)); - - let mut cev: Vec = Vec::new(); - let mut f = File::open(expect).unwrap(); - f.read_to_end(&mut cev).unwrap(); - println!("{}", String::from_utf8_lossy(&cev)); - - assert_eq!(vec, cev); - } - } - } -} +// #[cfg(test)] +// mod tests { +// extern crate test_generator; + +// use std::fs::File; +// use std::io::Read; +// use std::path::Path; + +// use test_generator::test_resources; + +// use super::*; + +// #[test_resources("testdata/parser/positive/*.pdl")] +// fn batch1(resource: &str) { +// let path = Path::new(resource); +// let mut heap = Heap::new(); +// let mut source = InputSource::from_file(&path).unwrap(); +// let mut parser = Parser::new(&mut source); +// match parser.parse(&mut heap) { +// Ok(_) => {} +// Err(err) => { +// println!("{}", err.display(&source)); +// println!("{:?}", err); +// assert!(false); +// } +// } +// } + +// #[test_resources("testdata/parser/negative/*.pdl")] +// fn batch2(resource: &str) { +// let path = Path::new(resource); +// let expect = path.with_extension("txt"); +// let mut heap = Heap::new(); +// let mut source = InputSource::from_file(&path).unwrap(); +// let mut parser = Parser::new(&mut source); +// match parser.parse(&mut heap) { +// Ok(pd) => { +// println!("{:?}", heap[pd]); +// println!("Expected parse error:"); + +// let mut cev: Vec = Vec::new(); +// let mut f = File::open(expect).unwrap(); +// f.read_to_end(&mut cev).unwrap(); +// println!("{}", String::from_utf8_lossy(&cev)); +// assert!(false); +// } +// Err(err) => { +// println!("{:?}", err); + +// let mut vec: Vec = Vec::new(); +// err.write(&source, &mut vec).unwrap(); +// println!("{}", String::from_utf8_lossy(&vec)); + +// let mut cev: Vec = Vec::new(); +// let mut f = File::open(expect).unwrap(); +// f.read_to_end(&mut cev).unwrap(); +// println!("{}", String::from_utf8_lossy(&cev)); + +// assert_eq!(vec, cev); +// } +// } +// } +// }