fix!: remove adjusted_current_node_present_and_not_in_html_namespace

Conceptually the tokenizer emits tokens, which are then handled in the
tree construction stage (which this crate doesn't yet implement).
While the tokenizer can operate almost entirely based on its state
(which may be changed via Tokenizer::set_state) and its internal state,
there is the exception of the 'Markup declaration open state'[1], the third
condition of which depends on the "adjusted current node", which in turn
depends on the "stack of open elements" only known to the tree constructor.

In 82898967320f90116bbc686ab7ffc2f61ff456c4 I tried to address this
by adding the adjusted_current_node_present_and_not_in_html_namespace
method to the Emitter trait. What I missed was that adding this method
to the Emitter trait effectively crippled the composability of the API.
You should be able to do the following:

    struct TreeConstructor<R, O> {
        tokenizer: Tokenizer<R, O, SomeEmitter<O>>,
        stack_of_open_elements: Vec<NodeId>,
        // ...
    }

However this doesn't work if the implementation of SomeEmitter
depends on the stack_of_open_elements field.

This commits remedies this oversight by removing this method and
instead making the Tokenizer yield values of a new Event enum:

    enum Event<T> { Token(T), CdataOpen }

Event::CdataOpen signals that the new Tokenizer::handle_cdata_open
method has to be called, which accepts a CdataAction:

   enum CdataAction { Cdata, BogusComment }

the variants of which correspond exactly to the possible outcomes
of the third condition of the 'Markup declaration open state'.

Removing this method also has the added benefit that the DefaultEmitter
is now again spec-compliant, which lets us expose it again in the next
commit in good conscience (previously it just hard-coded the method
implementation to return false, which is why I had removed the
DefaultEmitter from the public API in the last release).

[1]: https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state

1 files changed, 17 insertions, 4 deletions

diff --git a/src/naive_parser.rs b/src/naive_parser.rs
index 2626209..f126dfd 100644
--- a/src/naive_parser.rs
+++ b/src/naive_parser.rs
@@ -1,7 +1,8 @@
 use crate::emitter::DefaultEmitter;
 use crate::offset::{Offset, Position};
 use crate::reader::{IntoReader, Reader};
-use crate::{Emitter, State, Tokenizer};
+use crate::tokenizer::CdataAction;
+use crate::{Emitter, Event, State, Tokenizer};
 
 /// A naive HTML parser (**not** spec-compliant since it doesn't do tree construction).
 ///
@@ -53,9 +54,21 @@ impl<R: Reader + Position<O>, O: Offset, E: Emitter<O>> Iterator for NaiveParser
     type Item = Result<E::Token, R::Error>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        // A proper parser would follow the steps described under section '13.2.6 Tree construction'
-        // of the spec. Since this parser is naive, we directly return the token instead.
-        self.tokenizer.next()
+        loop {
+            let event = self.tokenizer.next()?;
+            match event {
+                Err(e) => return Some(Err(e)),
+                Ok(Event::Token(t)) => {
+                    // A proper parser would follow the steps described under section '13.2.6 Tree construction'
+                    // of the spec. Since this parser is naive, we directly return the token instead.
+                    return Some(Ok(t));
+                }
+                Ok(Event::CdataOpen) => {
+                    // Naively parse any CDATA sections as bogus comments.
+                    self.tokenizer.handle_cdata_open(CdataAction::BogusComment)
+                }
+            }
+        }
     }
 }