From a03cea75d9d120a7519be91ec872b143b5d74276 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Tue, 12 Sep 2023 09:26:06 +0200 Subject: refactor: make TracingEmitter only work with usizes --- src/tracing_emitter.rs | 102 ++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'src') diff --git a/src/tracing_emitter.rs b/src/tracing_emitter.rs index 408d9b0..76b20bf 100644 --- a/src/tracing_emitter.rs +++ b/src/tracing_emitter.rs @@ -4,24 +4,24 @@ use std::collections::VecDeque; use std::ops::Range; use crate::let_else::assume; -use crate::offset::NoopOffset; -use crate::offset::Offset; -use crate::token::{AttrValueSyntax, Comment, Doctype, EndTag, StartTag, Token}; +use crate::token::{AttrValueSyntax, Comment, Doctype, EndTag, StartTag}; use crate::Emitter; use crate::Error; +type Token = crate::token::Token; + /// The default implementation of [`Emitter`], used to produce tokens. -pub struct TracingEmitter { - current_token: Option>, +pub struct TracingEmitter { + current_token: Option, current_attribute_name: String, - current_attr_internal: crate::token::AttrInternal, + current_attr_internal: crate::token::AttrInternal, seen_attributes: BTreeSet, - emitted_tokens: VecDeque>, - errors: VecDeque<(Error, Range)>, - attr_in_end_tag_span: Option>, + emitted_tokens: VecDeque, + errors: VecDeque<(Error, Range)>, + attr_in_end_tag_span: Option>, } -impl Default for TracingEmitter { +impl Default for TracingEmitter { fn default() -> Self { TracingEmitter { current_token: None, @@ -35,23 +35,23 @@ impl Default for TracingEmitter { } } -impl TracingEmitter { +impl TracingEmitter { /// Removes all encountered tokenizer errors and returns them as an iterator. - pub fn drain_errors(&mut self) -> impl Iterator)> + '_ { + pub fn drain_errors(&mut self) -> impl Iterator)> + '_ { self.errors.drain(0..) } } -impl Iterator for TracingEmitter { - type Item = Token; +impl Iterator for TracingEmitter { + type Item = Token; fn next(&mut self) -> Option { self.emitted_tokens.pop_back() } } -impl Emitter for TracingEmitter { - fn report_error(&mut self, error: Error, span: Range) { +impl Emitter for TracingEmitter { + fn report_error(&mut self, error: Error, span: Range) { self.errors.push_back((error, span)); } @@ -63,21 +63,21 @@ impl Emitter for TracingEmitter { self.emit_token(Token::EndOfFile); } - fn init_start_tag(&mut self, tag_offset: O, name_offset: O) { + fn init_start_tag(&mut self, tag_offset: usize, name_offset: usize) { self.current_token = Some(Token::StartTag(StartTag { - span: tag_offset..O::default(), + span: tag_offset..0, self_closing: false, name: String::new(), attributes: Default::default(), - name_span: name_offset..O::default(), + name_span: name_offset..0, })); } - fn init_end_tag(&mut self, tag_offset: O, name_offset: O) { + fn init_end_tag(&mut self, tag_offset: usize, name_offset: usize) { self.current_token = Some(Token::EndTag(EndTag { - span: tag_offset..O::default(), + span: tag_offset..0, name: String::new(), - name_span: name_offset..O::default(), + name_span: name_offset..0, })); self.seen_attributes.clear(); } @@ -90,7 +90,7 @@ impl Emitter for TracingEmitter { name.push_str(s); } - fn terminate_tag_name(&mut self, offset: O) { + fn terminate_tag_name(&mut self, offset: usize) { assume!( Some( Token::StartTag(StartTag { name_span, .. }) @@ -101,7 +101,7 @@ impl Emitter for TracingEmitter { name_span.end = offset; } - fn init_attribute_name(&mut self, offset: O) { + fn init_attribute_name(&mut self, offset: usize) { self.flush_current_attribute(); self.current_attr_internal.name_span.start = offset; } @@ -110,11 +110,11 @@ impl Emitter for TracingEmitter { self.current_attribute_name.push_str(s); } - fn terminate_attribute_name(&mut self, offset: O) { + fn terminate_attribute_name(&mut self, offset: usize) { self.current_attr_internal.name_span.end = offset; } - fn init_attribute_value(&mut self, syntax: AttrValueSyntax, offset: O) { + fn init_attribute_value(&mut self, syntax: AttrValueSyntax, offset: usize) { self.current_attr_internal.value_span.start = offset; self.current_attr_internal.value_syntax = Some(syntax); } @@ -123,11 +123,11 @@ impl Emitter for TracingEmitter { self.current_attr_internal.value.push_str(s); } - fn terminate_attribute_value(&mut self, offset: O) { + fn terminate_attribute_value(&mut self, offset: usize) { self.current_attr_internal.value_span.end = offset; } - fn set_self_closing(&mut self, slash_span: Range) { + fn set_self_closing(&mut self, slash_span: Range) { let token = self.current_token.as_mut().unwrap(); match token { @@ -141,7 +141,7 @@ impl Emitter for TracingEmitter { } } - fn emit_current_tag(&mut self, offset: O) { + fn emit_current_tag(&mut self, offset: usize) { self.flush_current_attribute(); let mut token = self.current_token.take().unwrap(); match &mut token { @@ -164,10 +164,10 @@ impl Emitter for TracingEmitter { self.emit_token(token); } - fn init_comment(&mut self, data_start_offset: O) { + fn init_comment(&mut self, data_start_offset: usize) { self.current_token = Some(Token::Comment(Comment { data: String::new(), - data_span: data_start_offset..O::default(), + data_span: data_start_offset..0, })); } @@ -176,27 +176,27 @@ impl Emitter for TracingEmitter { comment.data.push_str(s); } - fn emit_current_comment(&mut self, data_end_offset: O) { + fn emit_current_comment(&mut self, data_end_offset: usize) { let mut token = self.current_token.take().unwrap(); assume!(Token::Comment(comment), &mut token); comment.data_span.end = data_end_offset; self.emit_token(token); } - fn init_doctype(&mut self, offset: O) { + fn init_doctype(&mut self, offset: usize) { self.current_token = Some(Token::Doctype(Doctype { name: None, force_quirks: false, public_id: None, system_id: None, - span: offset..O::default(), - name_span: O::default()..O::default(), - public_id_span: O::default()..O::default(), - system_id_span: O::default()..O::default(), + span: offset..0, + name_span: 0..0, + public_id_span: 0..0, + system_id_span: 0..0, })); } - fn init_doctype_name(&mut self, offset: O) { + fn init_doctype_name(&mut self, offset: usize) { assume!(Some(Token::Doctype(doctype)), &mut self.current_token); doctype.name = Some("".into()); doctype.name_span.start = offset; @@ -213,12 +213,12 @@ impl Emitter for TracingEmitter { name.push_str(s); } - fn terminate_doctype_name(&mut self, offset: O) { + fn terminate_doctype_name(&mut self, offset: usize) { assume!(Some(Token::Doctype(doctype)), &mut self.current_token); doctype.name_span.end = offset; } - fn init_doctype_public_id(&mut self, offset: O) { + fn init_doctype_public_id(&mut self, offset: usize) { assume!(Some(Token::Doctype(doctype)), &mut self.current_token); doctype.public_id = Some("".to_owned()); doctype.public_id_span.start = offset; @@ -235,12 +235,12 @@ impl Emitter for TracingEmitter { public_id.push_str(s); } - fn terminate_doctype_public_id(&mut self, offset: O) { + fn terminate_doctype_public_id(&mut self, offset: usize) { assume!(Some(Token::Doctype(doctype)), &mut self.current_token); doctype.public_id_span.end = offset; } - fn init_doctype_system_id(&mut self, offset: O) { + fn init_doctype_system_id(&mut self, offset: usize) { assume!(Some(Token::Doctype(doctype)), &mut self.current_token); doctype.system_id = Some("".to_owned()); doctype.system_id_span.start = offset; @@ -257,7 +257,7 @@ impl Emitter for TracingEmitter { id.push_str(s); } - fn terminate_doctype_system_id(&mut self, offset: O) { + fn terminate_doctype_system_id(&mut self, offset: usize) { assume!(Some(Token::Doctype(doctype)), &mut self.current_token); doctype.system_id_span.end = offset; } @@ -267,22 +267,19 @@ impl Emitter for TracingEmitter { doctype.force_quirks = true; } - fn emit_current_doctype(&mut self, offset: O) { + fn emit_current_doctype(&mut self, offset: usize) { assume!(Some(Token::Doctype(mut doctype)), self.current_token.take()); doctype.span.end = offset; self.emit_token(Token::Doctype(doctype)); } } -impl TracingEmitter { - fn emit_token(&mut self, token: Token) { +impl TracingEmitter { + fn emit_token(&mut self, token: Token) { self.emitted_tokens.push_front(token); } - fn flush_current_attribute(&mut self) - where - O: Offset, - { + fn flush_current_attribute(&mut self) { if self.current_attribute_name.is_empty() { return; } @@ -315,13 +312,16 @@ impl TracingEmitter { #[cfg(test)] mod tests { use super::TracingEmitter; + use crate::offset::PosTrackingReader; use crate::token::{AttrValueSyntax, Token}; use crate::{Event, Tokenizer}; #[test] fn test_attribute_value_syntax() { let mut tokenizer = Tokenizer::new( - "
", + PosTrackingReader::new( + "
", + ), TracingEmitter::default(), ) .flatten(); -- cgit v1.2.3