Split SyntaxError::UnclosedPIOrXmlDecl into separate enum Variants

Author: SuchAFuriousDeath

src/errors.rs

@@ -17,9 +17,12 @@ pub enum SyntaxError {
     /// The parser started to parse `<!`, but the input ended before it can recognize
     /// anything.
     InvalidBangMarkup,
-    /// The parser started to parse processing instruction or XML declaration (`<?`),
+    /// The parser started to parse processing instruction (`<?`),
     /// but the input ended before the `?>` sequence was found.
-    UnclosedPIOrXmlDecl,
+    UnclosedPI,
+    /// The parser started to parse XML declaration (`<?xml`),
+    /// but the input ended before the `?>` sequence was found.
+    UnclosedXmlDecl,
     /// The parser started to parse comment (`<!--`) content, but the input ended
     /// before the `-->` sequence was found.
     UnclosedComment,
@@ -38,8 +41,11 @@ impl fmt::Display for SyntaxError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::InvalidBangMarkup => f.write_str("unknown or missed symbol in markup"),
-            Self::UnclosedPIOrXmlDecl => {
-                f.write_str("processing instruction or xml declaration not closed: `?>` not found before end of input")
+            Self::UnclosedPI => {
+                f.write_str("processing instruction not closed: `?>` not found before end of input")
+            }
+            Self::UnclosedXmlDecl => {
+                f.write_str("XML declaration not closed: `?>` not found before end of input")
             }
             Self::UnclosedComment => {
                 f.write_str("comment not closed: `-->` not found before end of input")

src/parser/element.rs

@@ -73,7 +73,7 @@ impl Parser for ElementParser {
     }
 
     #[inline]
-    fn eof_error() -> SyntaxError {
+    fn eof_error(&self, _content: &[u8]) -> SyntaxError {
         SyntaxError::UnclosedTag
     }
 }

src/parser/mod.rs

@@ -25,5 +25,9 @@ pub trait Parser {
 
     /// Returns parse error produced by this parser in case of reaching end of
     /// input without finding the end of a parsed thing.
-    fn eof_error() -> SyntaxError;
+    ///
+    /// # Parameters
+    /// - `content`: the content that was read before EOF. Some parsers may use
+    ///   this to provide more specific error messages.
+    fn eof_error(&self, content: &[u8]) -> SyntaxError;
 }

src/parser/pi.rs

@@ -2,6 +2,7 @@
 
 use crate::errors::SyntaxError;
 use crate::parser::Parser;
+use crate::utils::is_whitespace;
 
 /// A parser that search a `?>` sequence in the slice.
 ///
@@ -72,8 +73,18 @@ impl Parser for PiParser {
     }
 
     #[inline]
-    fn eof_error() -> SyntaxError {
-        SyntaxError::UnclosedPIOrXmlDecl
+    fn eof_error(&self, content: &[u8]) -> SyntaxError {
+        // Check if content starts with "?xml" followed by whitespace, '?' or end.
+        // This determines whether to report an unclosed XML declaration or PI.
+        let is_xml_decl = content.starts_with(b"?xml")
+            && content
+                .get(4)
+                .map_or(true, |&b| is_whitespace(b) || b == b'?');
+        if is_xml_decl {
+            SyntaxError::UnclosedXmlDecl
+        } else {
+            SyntaxError::UnclosedPI
+        }
     }
 }
 

src/reader/buffered_reader.rs

@@ -234,7 +234,7 @@ macro_rules! impl_buffered_source {
             }
 
             *position += read;
-            Err(Error::Syntax(P::eof_error()))
+            Err(Error::Syntax(parser.eof_error(&buf[start..])))
         }
 
         #[inline]

src/reader/slice_reader.rs

@@ -350,7 +350,7 @@ impl<'a> XmlSource<'a, ()> for &'a [u8] {
         }
 
         *position += self.len() as u64;
-        Err(Error::Syntax(P::eof_error()))
+        Err(Error::Syntax(parser.eof_error(self)))
     }
 
     #[inline]

src/reader/state.rs

@@ -270,11 +270,19 @@ impl ReaderState {
                 )))
             }
         } else {
-            // <?....EOF
-            //  ^^^^^ - `buf` does not contains `<`, but we want to report error at `<`,
+            // <?....>
+            //  ^^^^^ - `buf` does not contain `<`, but we want to report error at `<`,
             //          so we move offset to it (-2 for `<` and `>`)
             self.last_error_offset = self.offset - len as u64 - 2;
-            Err(Error::Syntax(SyntaxError::UnclosedPIOrXmlDecl))
+
+            // Check if this is an XML declaration (starts with "?xml" followed by whitespace or "?")
+            let is_xml_decl = buf.starts_with(b"?xml")
+                && buf.get(4).map_or(true, |&b| is_whitespace(b) || b == b'?');
+            if is_xml_decl {
+                Err(Error::Syntax(SyntaxError::UnclosedXmlDecl))
+            } else {
+                Err(Error::Syntax(SyntaxError::UnclosedPI))
+            }
         }
     }
 

tests/reader-errors.rs

@@ -430,16 +430,16 @@ mod syntax {
     mod pi {
         use super::*;
 
-        err!(unclosed01(".<?")   => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed02(".<??")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed03(".<?>")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed04(".<?<")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed05(".<?&")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed06(".<?p")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed07(".<? ")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed08(".<?\t") => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed09(".<?\r") => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed10(".<?\n") => SyntaxError::UnclosedPIOrXmlDecl);
+        err!(unclosed01(".<?")   => SyntaxError::UnclosedPI);
+        err!(unclosed02(".<??")  => SyntaxError::UnclosedPI);
+        err!(unclosed03(".<?>")  => SyntaxError::UnclosedPI);
+        err!(unclosed04(".<?<")  => SyntaxError::UnclosedPI);
+        err!(unclosed05(".<?&")  => SyntaxError::UnclosedPI);
+        err!(unclosed06(".<?p")  => SyntaxError::UnclosedPI);
+        err!(unclosed07(".<? ")  => SyntaxError::UnclosedPI);
+        err!(unclosed08(".<?\t") => SyntaxError::UnclosedPI);
+        err!(unclosed09(".<?\r") => SyntaxError::UnclosedPI);
+        err!(unclosed10(".<?\n") => SyntaxError::UnclosedPI);
 
         // According to the grammar, processing instruction MUST contain a non-empty
         // target name, but we do not consider this as a _syntax_ error.
@@ -453,10 +453,14 @@ mod syntax {
     mod decl {
         use super::*;
 
-        err!(unclosed1(".<?x")    => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed2(".<?xm")   => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed3(".<?xml")  => SyntaxError::UnclosedPIOrXmlDecl);
-        err!(unclosed4(".<?xml?") => SyntaxError::UnclosedPIOrXmlDecl);
+        err!(unclosed1(".<?x")     => SyntaxError::UnclosedPI);
+        err!(unclosed2(".<?xm")    => SyntaxError::UnclosedPI);
+        err!(unclosed3(".<?xml")   => SyntaxError::UnclosedXmlDecl);
+        err!(unclosed4(".<?xml?")  => SyntaxError::UnclosedXmlDecl);
+        err!(unclosed5(".<?xml ")  => SyntaxError::UnclosedXmlDecl);
+        err!(unclosed6(".<?xml\t") => SyntaxError::UnclosedXmlDecl);
+        err!(unclosed7(".<?xml\r") => SyntaxError::UnclosedXmlDecl);
+        err!(unclosed8(".<?xml\n") => SyntaxError::UnclosedXmlDecl);
 
         // According to the grammar, XML declaration MUST contain at least one space
         // and `version` attribute, but we do not consider this as a _syntax_ error.