rearrange block types to optimize performance

Parsedown.php

@@ -217,56 +217,14 @@ class Parsedown
 			
 			# Quick Paragraph 
 			
-			if ($line[0] >= 'A' and $line['0'] !== '_')
+			if ($line[0] >= 'A' and $line[0] !== '_')
 			{
 				goto paragraph; # trust me 
 			}
 			
-			# Setext Header (---) 
-			
-			if ($element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[-]+[ ]*$/', $line))
-			{
-				$element['type'] = 'h.';
-				$element['level'] = 2;
-				
-				continue;
-			}
-			
-			# Horizontal Rule  
-			
-			if (preg_match('/^[ ]{0,3}([-*_])([ ]{0,2}\1){2,}[ ]*$/', $line))
-			{
-				$elements []= $element;
-				
-				$element = array(
-					'type' => 'hr',
-				);
-				
-				continue;
-			}
-			
-			# List Item 
-			
-			if (preg_match('/^([ ]{0,3})(\d+[.]|[*+-])[ ](.*)/', $line, $matches))
-			{
-				$elements []= $element;
-				
-				$element = array(
-					'type' => 'li',
-					'ordered' => isset($matches[2][1]),
-					'indentation' => $matches[1],
-					'last' => true,
-					'lines' => array(
-						preg_replace('/^[ ]{0,4}/', '', $matches[3]),
-					),
-				);
-				
-				continue;
-			}
-			
 			# Code 
 			
-			if (preg_match('/^[ ]{4}(.*)/', $line, $matches))
+			if ($line[0] === ' ' and preg_match('/^[ ]{4}(.*)/', $line, $matches))
 			{
 				if ($element['type'] === 'code')
 				{
@@ -287,6 +245,16 @@ class Parsedown
 				continue;
 			}
 			
+			# Setext Header (---)  
+			
+			if ($line[0] === '-' and $element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[-]+[ ]*$/', $line))
+			{
+				$element['type'] = 'h.';
+				$element['level'] = 2;
+				
+				continue;
+			}
+			
 			# Atx Header (#)
 			
 			if ($line[0] === '#' and preg_match('/^(#{1,6})[ ]*(.+?)[ ]*#*$/', $line, $matches))
@@ -304,9 +272,23 @@ class Parsedown
 				continue;
 			}
 			
+			# Setext Header (===) 
+			
+			if ($line[0] === '=' and $element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[=]+[ ]*$/', $line))
+			{
+				$element['type'] = 'h.';
+				$element['level'] = 1;
+				
+				continue;
+			}
+			
+			# ~  
+			
+			$pure_line = ltrim($line);
+			
 			# Blockquote 
 			
-			if (preg_match('/^[ ]*>[ ]?(.*)/', $line, $matches))
+			if ($pure_line[0] === '>' and preg_match('/^>[ ]?(.*)/', $pure_line, $matches))
 			{
 				if ($element['type'] === 'blockquote')
 				{
@@ -334,25 +316,19 @@ class Parsedown
 				continue;
 			}
 			
-			# Setext Header (===) 
+			# HTML  
 			
-			if ($element['type'] === 'p' and ! isset($element['interrupted']) and preg_match('/^[=]+[ ]*$/', $line))
+			if ($pure_line[0] === '<')
 			{
-				$element['type'] = 'h.';
-				$element['level'] = 1;
-				
-				continue;
-			}
-
 				# Block-Level HTML <self-closing/>
 
-			if (preg_match('{^<.+?/>$}', $line))
+				if (preg_match('{^<.+?/>$}', $pure_line))
 				{
 					$elements []= $element;
 
 					$element = array(
 						'type' => '',
-					'text' => $line,
+						'text' => $pure_line,
 					);
 
 					continue;
@@ -360,18 +336,51 @@ class Parsedown
 				
 				# Block-Level HTML <open>
 
-			if (preg_match('{^<(\w+)(?:[ ].*?)?>}', $line, $matches))
+				if (preg_match('{^<(\w+)(?:[ ].*?)?>}', $pure_line, $matches))
 				{
 					$elements []= $element;
 
 					$element = array(
 						'type' => 'block',
 						'subtype' => strtolower($matches[1]),
-					'text' => $line,
+						'text' => $pure_line,
 						'depth' => 0,
 					);
 					
-				preg_match('{</'.$matches[1].'>\s*$}', $line) and $element['closed'] = true; 
+					preg_match('{</'.$matches[1].'>\s*$}', $pure_line) and $element['closed'] = true;
+
+					continue;
+				}
+			}
+			
+			# Horizontal Rule   
+			
+			if (preg_match('/^([-*_])([ ]{0,2}\1){2,}[ ]*$/', $pure_line))
+			{
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'hr',
+				);
+				
+				continue;
+			}
+			
+			# List Item 
+			
+			if (preg_match('/^([ ]*)(\d+[.]|[*+-])[ ](.*)/', $line, $matches))
+			{
+				$elements []= $element;
+				
+				$element = array(
+					'type' => 'li',
+					'ordered' => isset($matches[2][1]),
+					'indentation' => $matches[1],
+					'last' => true,
+					'lines' => array(
+						preg_replace('/^[ ]{0,4}/', '', $matches[3]),
+					),
+				);
 				
 				continue;
 			}

tests/data/sparse_list.html

@@ -1,14 +1,16 @@
-<p>Here's a list where items are separated by empty lines:</p>
+<p>Here's a sparse list:</p>
 <ul>
 <li>
 <p>list item</p>
 </li>
 <li>another list item</li>
 </ul>
-<p>Here's an ordered one:</p>
-<ol>
+<p>Here's one with an indented list item:</p>
+<ul>
 <li>
-<p>item one</p>
+<p>li</p>
+<ul>
+<li>li</li>
+</ul>
 </li>
-<li>item two</li>
-</ol>
+</ul>

tests/data/sparse_list.md

@@ -1,11 +1,11 @@
-Here's a list where items are separated by empty lines:
+Here's a sparse list:
 
 - list item
 
 - another list item
 
-Here's an ordered one:
+Here's one with an indented list item:
 
-1. item one
+- li
 
-2. item two
+    - li