Test ParserError

examples/fz-parser.rs

@@ -30,10 +30,13 @@ fn run() -> Result<()> {
     let opt = Opt::parse();
     let buf = std::fs::read_to_string(opt.file)?;
     for mut line in buf.lines() {
-        match flatzinc::statement::<ContextError<&str>>(&mut line) {
+        match flatzinc::statement::<ContextError<&str>, &str>(&mut line) {
             Ok(result) => println!("{:#?}", result),
             Err(e) => {
-                error!("Failed to parse flatzinc!\n{}", e)
+                let a = e.to_owned().into_inner();
+                let b = a.cause();
+                let c = e.to_owned().offset();
+                error!("Failed to parse flatzinc!\n{} {:?} {:?}", c, a, b)
             }
         }
     }

src/statements/mod.rs

@@ -1,6 +1,6 @@
 use winnow::{
     combinator::{alt, eof},
-    error::{FromExternalError, ParserError},
+    error::{FromExternalError, ParseError, ParserError},
     PResult, Parser,
 };
 
@@ -26,22 +26,22 @@ pub enum Stmt {
     SolveItem(SolveItem),
 }
 
-pub fn statement<'a, E: ParserError<&'a str>>(input: &mut &'a str) -> PResult<Stmt, E>
+pub fn statement<'a, E: ParserError<&'a str>, I>(
+    input: &'a str,
+) -> Result<Stmt, ParseError<&'a str, E>>
 where
     E: FromExternalError<&'a str, std::num::ParseIntError>
         + FromExternalError<&'a str, std::num::ParseFloatError>,
 {
-    let res = alt((
+    alt((
         stmt_predicate,
         stmt_parameter,
         stmt_variable,
         stmt_constraint,
         stmt_solve_item,
         space_or_comment,
     ))
-    .parse_next(input)?;
-    eof.parse_next(input)?;
-    Ok(res)
+    .parse(input)
 }
 
 fn stmt_predicate<'a, E: ParserError<&'a str>>(input: &mut &'a str) -> PResult<Stmt, E>