...
* 01234
- * - tag name starts at 1
+ * - token starts at 0
+ *
+ * @since 6.5.0
*
- * @since 6.2.0
* @var int|null
*/
- private $tag_name_starts_at;
+ private $token_starts_at;
/**
- * Byte length of current tag name.
+ * Byte length of current token.
+ *
+ * Example:
+ *
+ *
...
+ * 012345678901234
+ * - token length is 14 - 0 = 14
+ *
+ * a is a token.
+ * 0123456789 123456789 123456789
+ * - token length is 17 - 2 = 15
+ *
+ * @since 6.5.0
+ *
+ * @var int|null
+ */
+ private $token_length;
+
+ /**
+ * Byte offset in input document where current tag name starts.
*
* Example:
*
*
...
* 01234
- * --- tag name length is 3
+ * - tag name starts at 1
*
* @since 6.2.0
+ *
* @var int|null
*/
- private $tag_name_length;
+ private $tag_name_starts_at;
/**
- * Byte offset in input document where current tag token ends.
+ * Byte length of current tag name.
*
* Example:
*
*
...
- * 0 1 |
- * 01234567890123456
- * --- tag name ends at 14
+ * 01234
+ * --- tag name length is 3
*
* @since 6.2.0
+ *
* @var int|null
*/
- private $tag_ends_at;
+ private $tag_name_length;
/**
* Whether the current tag is an opening tag, e.g.
, or a closing tag, e.g.
.
@@ -388,14 +409,14 @@ class WP_HTML_Tag_Processor {
* //
* // ^ parsing will continue from this point.
* $this->attributes = array(
- * 'id' => new WP_HTML_Attribute_Match( 'id', null, 6, 17 )
+ * 'id' => new WP_HTML_Attribute_Token( 'id', 9, 6, 5, 11, false )
* );
*
* // When picking up parsing again, or when asking to find the
* // `class` attribute we will continue and add to this array.
* $this->attributes = array(
- * 'id' => new WP_HTML_Attribute_Match( 'id', null, 6, 17 ),
- * 'class' => new WP_HTML_Attribute_Match( 'class', 'outline', 18, 32 )
+ * 'id' => new WP_HTML_Attribute_Token( 'id', 9, 6, 5, 11, false ),
+ * 'class' => new WP_HTML_Attribute_Token( 'class', 23, 7, 17, 13, false )
* );
*
* // Note that only the `class` attribute value is stored in the index.
@@ -484,9 +505,9 @@ class WP_HTML_Tag_Processor {
*
* // Replace an attribute stored with a new value, indices
* // sourced from the lazily-parsed HTML recognizer.
- * $start = $attributes['src']->start;
- * $end = $attributes['src']->end;
- * $modifications[] = new WP_HTML_Text_Replacement( $start, $end, $new_value );
+ * $start = $attributes['src']->start;
+ * $length = $attributes['src']->length;
+ * $modifications[] = new WP_HTML_Text_Replacement( $start, $length, $new_value );
*
* // Correspondingly, something like this will appear in this array.
* $lexical_updates = array(
@@ -566,7 +587,7 @@ public function next_tag( $query = null ) {
if ( false === $tag_ends_at ) {
return false;
}
- $this->tag_ends_at = $tag_ends_at;
+ $this->token_length = $tag_ends_at - $this->token_starts_at;
$this->bytes_already_parsed = $tag_ends_at;
// Finally, check if the parsed tag and its attributes match the search query.
@@ -808,10 +829,7 @@ public function set_bookmark( $name ) {
return false;
}
- $this->bookmarks[ $name ] = new WP_HTML_Span(
- $this->tag_name_starts_at - ( $this->is_closing_tag ? 2 : 1 ),
- $this->tag_ends_at
- );
+ $this->bookmarks[ $name ] = new WP_HTML_Span( $this->token_starts_at, $this->token_length );
return true;
}
@@ -875,7 +893,7 @@ private function skip_rcdata( $tag_name ) {
while ( false !== $at && $at < $doc_length ) {
$at = strpos( $this->html, '= $doc_length ) {
$this->bytes_already_parsed = $doc_length;
return false;
@@ -1093,6 +1111,8 @@ private function parse_next_tag() {
return false;
}
+ $this->token_starts_at = $at;
+
if ( '/' === $this->html[ $at + 1 ] ) {
$this->is_closing_tag = true;
++$at;
@@ -1381,7 +1401,7 @@ private function parse_next_attribute() {
$value_start,
$value_length,
$attribute_start,
- $attribute_end,
+ $attribute_end - $attribute_start,
! $has_value
);
@@ -1396,7 +1416,7 @@ private function parse_next_attribute() {
* an array when encountering duplicates avoids needless allocations in the
* normative case of parsing tags with no duplicate attributes.
*/
- $duplicate_span = new WP_HTML_Span( $attribute_start, $attribute_end );
+ $duplicate_span = new WP_HTML_Span( $attribute_start, $attribute_end - $attribute_start );
if ( null === $this->duplicate_attributes ) {
$this->duplicate_attributes = array( $comparable_name => array( $duplicate_span ) );
} elseif ( ! array_key_exists( $comparable_name, $this->duplicate_attributes ) ) {
@@ -1424,9 +1444,10 @@ private function skip_whitespace() {
*/
private function after_tag() {
$this->get_updated_html();
+ $this->token_starts_at = null;
+ $this->token_length = null;
$this->tag_name_starts_at = null;
$this->tag_name_length = null;
- $this->tag_ends_at = null;
$this->is_closing_tag = null;
$this->attributes = array();
$this->duplicate_attributes = null;
@@ -1606,7 +1627,7 @@ private function apply_attributes_updates( $shift_this_point = 0 ) {
$bytes_already_copied = 0;
$output_buffer = '';
foreach ( $this->lexical_updates as $diff ) {
- $shift = strlen( $diff->text ) - ( $diff->end - $diff->start );
+ $shift = strlen( $diff->text ) - $diff->length;
// Adjust the cursor position by however much an update affects it.
if ( $diff->start <= $this->bytes_already_parsed ) {
@@ -1620,7 +1641,7 @@ private function apply_attributes_updates( $shift_this_point = 0 ) {
$output_buffer .= substr( $this->html, $bytes_already_copied, $diff->start - $bytes_already_copied );
$output_buffer .= $diff->text;
- $bytes_already_copied = $diff->end;
+ $bytes_already_copied = $diff->start + $diff->length;
}
$this->html = $output_buffer . substr( $this->html, $bytes_already_copied );
@@ -1630,6 +1651,8 @@ private function apply_attributes_updates( $shift_this_point = 0 ) {
* replacements adjust offsets in the input document.
*/
foreach ( $this->bookmarks as $bookmark_name => $bookmark ) {
+ $bookmark_end = $bookmark->start + $bookmark->length;
+
/*
* Each lexical update which appears before the bookmark's endpoints
* might shift the offsets for those endpoints. Loop through each change
@@ -1640,28 +1663,30 @@ private function apply_attributes_updates( $shift_this_point = 0 ) {
$tail_delta = 0;
foreach ( $this->lexical_updates as $diff ) {
- if ( $bookmark->start < $diff->start && $bookmark->end < $diff->start ) {
+ $diff_end = $diff->start + $diff->length;
+
+ if ( $bookmark->start < $diff->start && $bookmark_end < $diff->start ) {
break;
}
- if ( $bookmark->start >= $diff->start && $bookmark->end < $diff->end ) {
+ if ( $bookmark->start >= $diff->start && $bookmark_end < $diff_end ) {
$this->release_bookmark( $bookmark_name );
continue 2;
}
- $delta = strlen( $diff->text ) - ( $diff->end - $diff->start );
+ $delta = strlen( $diff->text ) - $diff->length;
if ( $bookmark->start >= $diff->start ) {
$head_delta += $delta;
}
- if ( $bookmark->end >= $diff->end ) {
+ if ( $bookmark_end >= $diff_end ) {
$tail_delta += $delta;
}
}
- $bookmark->start += $head_delta;
- $bookmark->end += $tail_delta;
+ $bookmark->start += $head_delta;
+ $bookmark->length += $tail_delta - $head_delta;
}
$this->lexical_updates = array();
@@ -1743,7 +1768,7 @@ private static function sort_start_ascending( $a, $b ) {
* This code should be unreachable, because it implies the two replacements
* start at the same location and contain the same text.
*/
- return $a->end - $b->end;
+ return $a->length - $b->length;
}
/**
@@ -1971,7 +1996,15 @@ public function has_self_closing_flag() {
return false;
}
- return '/' === $this->html[ $this->tag_ends_at - 1 ];
+ /*
+ * The self-closing flag is the solidus at the _end_ of the tag, not the beginning.
+ *
+ * Example:
+ *
+ *