processing instructions are a little less common

mojolicious · Jul 16, 2014 · 34c1438 · 34c1438
1 parent 08e35af
commit 34c1438
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-5.15  2014-07-15
+5.15  2014-07-16
   - Improved Mojo::DOM::HTML performance slightly.
 
 5.14  2014-07-14

diff --git a/lib/Mojo/DOM/HTML.pm b/lib/Mojo/DOM/HTML.pm
@@ -25,8 +25,6 @@ my $TOKEN_RE = qr/
   ([^<]+)?                                            # Text
   (?:
     <(?:
-      \?(.*?)\?                                       # Processing Instruction
-    |
       !(?:
         --(.*?)--\s*                                  # Comment
       |
@@ -38,6 +36,8 @@ my $TOKEN_RE = qr/
         (?:\s+\[.+?\])?                               # Int Subset
         \s*)
       )
+    |
+      \?(.*?)\?                                       # Processing Instruction
     |
       (\s*[^<>\s]+                                    # Tag
       \s*(?:(?:$ATTR_RE){0,32766})*+)                 # Attributes
@@ -106,7 +106,7 @@ sub parse {
   my $xml = $self->xml;
   my $current = my $tree = ['root'];
   while ($html =~ m/\G$TOKEN_RE/gcso) {
-    my ($text, $pi, $comment, $cdata, $doctype, $tag, $runaway)
+    my ($text, $comment, $cdata, $doctype, $pi, $tag, $runaway)
       = ($1, $2, $3, $4, $5, $6, $11);
 
     # Text (and runaway "<")