From f5407711cbabbc4815fddc72d8f81176f5d973a7 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 19 Jul 2018 15:52:44 +1000
Subject: [PATCH 1/3] First pass at improving parser performance

---
 bin/create-php-parser.js |   1 +
 blocks/api/post.pegjs    |  11 +-
 lib/parser.php           | 960 ++++++++++++++++++++++++++++++++-------
 3 files changed, 810 insertions(+), 162 deletions(-)

diff --git a/bin/create-php-parser.js b/bin/create-php-parser.js
index f5cd5327fd000..3eac1cddb0cb5 100755
--- a/bin/create-php-parser.js
+++ b/bin/create-php-parser.js
@@ -10,6 +10,7 @@ const peg = fs.readFileSync( 'blocks/api/post.pegjs', 'utf8' );
 const parser = pegjs.generate(
 	peg,
 	{
+		cache: true,
 		plugins: [ phpegjs ],
 		phpegjs: {
 			parserNamespace: null,
diff --git a/blocks/api/post.pegjs b/blocks/api/post.pegjs
index aa1dc1b70a29e..4b155563f7afe 100644
--- a/blocks/api/post.pegjs
+++ b/blocks/api/post.pegjs
@@ -161,7 +161,7 @@ function partition( predicate, list ) {
 //////////////////////////////////////////////////////
 
 Block_List
-  = pre:$(!Block .)*
+  = pre:$((!"<!--" .)+ / (!Block .))*
     bs:(b:Block html:$((!Block .)*) { /** <?php return array( $b, $html ); ?> **/ return [ b, html ] })*
     post:$(.*)
   { /** <?php return peg_join_blocks( $pre, $bs, $post ); ?> **/
@@ -196,7 +196,7 @@ Block_Void
   }
 
 Block_Balanced
-  = s:Block_Start children:(Block / $(!Block_End .))* e:Block_End
+  = s:Block_Start children:( $(!"<!--" .)+ / $(!Block_End .) / Block )* e:Block_End
   {
     /** <?php
     list( $innerHTML, $innerBlocks ) = peg_array_partition( $children, 'is_string' );
@@ -269,7 +269,12 @@ Core_Block_Name
   }
 
 Block_Name_Part
-  = $( [a-z][a-z0-9_-]* )
+  = "paragraph"
+  / "list"
+  / "heading"
+  / "image"
+  / "table"
+  / $( [a-z][a-z0-9_-]* )
 
 Block_Attributes
   "JSON-encoded attributes embedded in a block's opening comment"
diff --git a/lib/parser.php b/lib/parser.php
index 25d37f3c37b8b..0117749255a36 100644
--- a/lib/parser.php
+++ b/lib/parser.php
@@ -74,6 +74,7 @@ class Gutenberg_PEG_Parser {
     private $peg_silentFails      = 0;
     private $input                = array();
     private $input_length         = 0;
+    public $peg_cache = array();
 
     private function cleanup_state() {
       $this->peg_currPos          = 0;
@@ -85,7 +86,7 @@ private function cleanup_state() {
       $this->peg_silentFails      = 0;
       $this->input                = array();
       $this->input_length         = 0;
-
+      $this->peg_cache = array();
     }
 
     private function input_substr($start, $length) {
@@ -253,6 +254,18 @@ private function peg_buildException($message, $expected, $pos) {
     private $peg_c22;
     private $peg_c23;
     private $peg_c24;
+    private $peg_c25;
+    private $peg_c26;
+    private $peg_c27;
+    private $peg_c28;
+    private $peg_c29;
+    private $peg_c30;
+    private $peg_c31;
+    private $peg_c32;
+    private $peg_c33;
+    private $peg_c34;
+    private $peg_c35;
+    private $peg_c36;
 
     private function peg_f0($pre, $b, $html) { return array( $b, $html ); }
     private function peg_f1($pre, $bs, $post) { return peg_join_blocks( $pre, $bs, $post ); }
@@ -291,43 +304,106 @@ private function peg_f8($attrs) { return json_decode( $attrs, true ); }
 
     private function peg_parseBlock_List() {
 
+      $key    = $this->peg_currPos * 12 + 0;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
       $s1 = $this->peg_currPos;
       $s2 = array();
-      $s3 = $this->peg_currPos;
+      $s3 = array();
       $s4 = $this->peg_currPos;
+      $s5 = $this->peg_currPos;
       $this->peg_silentFails++;
-      $s5 = $this->peg_parseBlock();
+      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+        $s6 = $this->peg_c0;
+        $this->peg_currPos += 4;
+      } else {
+        $s6 = $this->peg_FAILED;
+        if ($this->peg_silentFails === 0) {
+            $this->peg_fail($this->peg_c1);
+        }
+      }
       $this->peg_silentFails--;
-      if ($s5 === $this->peg_FAILED) {
-        $s4 = null;
+      if ($s6 === $this->peg_FAILED) {
+        $s5 = null;
       } else {
-        $this->peg_currPos = $s4;
-        $s4 = $this->peg_FAILED;
+        $this->peg_currPos = $s5;
+        $s5 = $this->peg_FAILED;
       }
-      if ($s4 !== $this->peg_FAILED) {
+      if ($s5 !== $this->peg_FAILED) {
         if ($this->input_length > $this->peg_currPos) {
-          $s5 = $this->input_substr($this->peg_currPos, 1);
+          $s6 = $this->input_substr($this->peg_currPos, 1);
           $this->peg_currPos++;
         } else {
-          $s5 = $this->peg_FAILED;
+          $s6 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c0);
+              $this->peg_fail($this->peg_c2);
           }
         }
-        if ($s5 !== $this->peg_FAILED) {
-          $s4 = array($s4, $s5);
-          $s3 = $s4;
+        if ($s6 !== $this->peg_FAILED) {
+          $s5 = array($s5, $s6);
+          $s4 = $s5;
         } else {
-          $this->peg_currPos = $s3;
-          $s3 = $this->peg_FAILED;
+          $this->peg_currPos = $s4;
+          $s4 = $this->peg_FAILED;
+        }
+      } else {
+        $this->peg_currPos = $s4;
+        $s4 = $this->peg_FAILED;
+      }
+      if ($s4 !== $this->peg_FAILED) {
+        while ($s4 !== $this->peg_FAILED) {
+          $s3[] = $s4;
+          $s4 = $this->peg_currPos;
+          $s5 = $this->peg_currPos;
+          $this->peg_silentFails++;
+          if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+            $s6 = $this->peg_c0;
+            $this->peg_currPos += 4;
+          } else {
+            $s6 = $this->peg_FAILED;
+            if ($this->peg_silentFails === 0) {
+                $this->peg_fail($this->peg_c1);
+            }
+          }
+          $this->peg_silentFails--;
+          if ($s6 === $this->peg_FAILED) {
+            $s5 = null;
+          } else {
+            $this->peg_currPos = $s5;
+            $s5 = $this->peg_FAILED;
+          }
+          if ($s5 !== $this->peg_FAILED) {
+            if ($this->input_length > $this->peg_currPos) {
+              $s6 = $this->input_substr($this->peg_currPos, 1);
+              $this->peg_currPos++;
+            } else {
+              $s6 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c2);
+              }
+            }
+            if ($s6 !== $this->peg_FAILED) {
+              $s5 = array($s5, $s6);
+              $s4 = $s5;
+            } else {
+              $this->peg_currPos = $s4;
+              $s4 = $this->peg_FAILED;
+            }
+          } else {
+            $this->peg_currPos = $s4;
+            $s4 = $this->peg_FAILED;
+          }
         }
       } else {
-        $this->peg_currPos = $s3;
         $s3 = $this->peg_FAILED;
       }
-      while ($s3 !== $this->peg_FAILED) {
-        $s2[] = $s3;
+      if ($s3 === $this->peg_FAILED) {
         $s3 = $this->peg_currPos;
         $s4 = $this->peg_currPos;
         $this->peg_silentFails++;
@@ -346,7 +422,7 @@ private function peg_parseBlock_List() {
           } else {
             $s5 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c0);
+                $this->peg_fail($this->peg_c2);
             }
           }
           if ($s5 !== $this->peg_FAILED) {
@@ -361,6 +437,131 @@ private function peg_parseBlock_List() {
           $s3 = $this->peg_FAILED;
         }
       }
+      while ($s3 !== $this->peg_FAILED) {
+        $s2[] = $s3;
+        $s3 = array();
+        $s4 = $this->peg_currPos;
+        $s5 = $this->peg_currPos;
+        $this->peg_silentFails++;
+        if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+          $s6 = $this->peg_c0;
+          $this->peg_currPos += 4;
+        } else {
+          $s6 = $this->peg_FAILED;
+          if ($this->peg_silentFails === 0) {
+              $this->peg_fail($this->peg_c1);
+          }
+        }
+        $this->peg_silentFails--;
+        if ($s6 === $this->peg_FAILED) {
+          $s5 = null;
+        } else {
+          $this->peg_currPos = $s5;
+          $s5 = $this->peg_FAILED;
+        }
+        if ($s5 !== $this->peg_FAILED) {
+          if ($this->input_length > $this->peg_currPos) {
+            $s6 = $this->input_substr($this->peg_currPos, 1);
+            $this->peg_currPos++;
+          } else {
+            $s6 = $this->peg_FAILED;
+            if ($this->peg_silentFails === 0) {
+                $this->peg_fail($this->peg_c2);
+            }
+          }
+          if ($s6 !== $this->peg_FAILED) {
+            $s5 = array($s5, $s6);
+            $s4 = $s5;
+          } else {
+            $this->peg_currPos = $s4;
+            $s4 = $this->peg_FAILED;
+          }
+        } else {
+          $this->peg_currPos = $s4;
+          $s4 = $this->peg_FAILED;
+        }
+        if ($s4 !== $this->peg_FAILED) {
+          while ($s4 !== $this->peg_FAILED) {
+            $s3[] = $s4;
+            $s4 = $this->peg_currPos;
+            $s5 = $this->peg_currPos;
+            $this->peg_silentFails++;
+            if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+              $s6 = $this->peg_c0;
+              $this->peg_currPos += 4;
+            } else {
+              $s6 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c1);
+              }
+            }
+            $this->peg_silentFails--;
+            if ($s6 === $this->peg_FAILED) {
+              $s5 = null;
+            } else {
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
+            }
+            if ($s5 !== $this->peg_FAILED) {
+              if ($this->input_length > $this->peg_currPos) {
+                $s6 = $this->input_substr($this->peg_currPos, 1);
+                $this->peg_currPos++;
+              } else {
+                $s6 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c2);
+                }
+              }
+              if ($s6 !== $this->peg_FAILED) {
+                $s5 = array($s5, $s6);
+                $s4 = $s5;
+              } else {
+                $this->peg_currPos = $s4;
+                $s4 = $this->peg_FAILED;
+              }
+            } else {
+              $this->peg_currPos = $s4;
+              $s4 = $this->peg_FAILED;
+            }
+          }
+        } else {
+          $s3 = $this->peg_FAILED;
+        }
+        if ($s3 === $this->peg_FAILED) {
+          $s3 = $this->peg_currPos;
+          $s4 = $this->peg_currPos;
+          $this->peg_silentFails++;
+          $s5 = $this->peg_parseBlock();
+          $this->peg_silentFails--;
+          if ($s5 === $this->peg_FAILED) {
+            $s4 = null;
+          } else {
+            $this->peg_currPos = $s4;
+            $s4 = $this->peg_FAILED;
+          }
+          if ($s4 !== $this->peg_FAILED) {
+            if ($this->input_length > $this->peg_currPos) {
+              $s5 = $this->input_substr($this->peg_currPos, 1);
+              $this->peg_currPos++;
+            } else {
+              $s5 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c2);
+              }
+            }
+            if ($s5 !== $this->peg_FAILED) {
+              $s4 = array($s4, $s5);
+              $s3 = $s4;
+            } else {
+              $this->peg_currPos = $s3;
+              $s3 = $this->peg_FAILED;
+            }
+          } else {
+            $this->peg_currPos = $s3;
+            $s3 = $this->peg_FAILED;
+          }
+        }
+      }
       if ($s2 !== $this->peg_FAILED) {
         $s1 = $this->input_substr($s1, $this->peg_currPos - $s1);
       } else {
@@ -391,7 +592,7 @@ private function peg_parseBlock_List() {
             } else {
               $s9 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c0);
+                  $this->peg_fail($this->peg_c2);
               }
             }
             if ($s9 !== $this->peg_FAILED) {
@@ -425,7 +626,7 @@ private function peg_parseBlock_List() {
               } else {
                 $s9 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c0);
+                    $this->peg_fail($this->peg_c2);
                 }
               }
               if ($s9 !== $this->peg_FAILED) {
@@ -482,7 +683,7 @@ private function peg_parseBlock_List() {
               } else {
                 $s9 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c0);
+                    $this->peg_fail($this->peg_c2);
                 }
               }
               if ($s9 !== $this->peg_FAILED) {
@@ -516,7 +717,7 @@ private function peg_parseBlock_List() {
                 } else {
                   $s9 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c0);
+                      $this->peg_fail($this->peg_c2);
                   }
                 }
                 if ($s9 !== $this->peg_FAILED) {
@@ -558,7 +759,7 @@ private function peg_parseBlock_List() {
           } else {
             $s5 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c0);
+                $this->peg_fail($this->peg_c2);
             }
           }
           while ($s5 !== $this->peg_FAILED) {
@@ -569,7 +770,7 @@ private function peg_parseBlock_List() {
             } else {
               $s5 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c0);
+                  $this->peg_fail($this->peg_c2);
               }
             }
           }
@@ -595,29 +796,49 @@ private function peg_parseBlock_List() {
         $s0 = $this->peg_FAILED;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock() {
 
+      $key    = $this->peg_currPos * 12 + 1;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_parseBlock_Void();
       if ($s0 === $this->peg_FAILED) {
         $s0 = $this->peg_parseBlock_Balanced();
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_Void() {
 
+      $key    = $this->peg_currPos * 12 + 2;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
-      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c1) {
-        $s1 = $this->peg_c1;
+      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+        $s1 = $this->peg_c0;
         $this->peg_currPos += 4;
       } else {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c2);
+            $this->peg_fail($this->peg_c1);
         }
       }
       if ($s1 !== $this->peg_FAILED) {
@@ -699,48 +920,145 @@ private function peg_parseBlock_Void() {
         $s0 = $this->peg_FAILED;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_Balanced() {
 
+      $key    = $this->peg_currPos * 12 + 3;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
       $s1 = $this->peg_parseBlock_Start();
       if ($s1 !== $this->peg_FAILED) {
         $s2 = array();
-        $s3 = $this->peg_parseBlock();
+        $s3 = $this->peg_currPos;
+        $s4 = array();
+        if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
+          $s5 = $this->input_substr($this->peg_currPos, 1);
+          $this->peg_currPos++;
+        } else {
+          $s5 = $this->peg_FAILED;
+          if ($this->peg_silentFails === 0) {
+              $this->peg_fail($this->peg_c8);
+          }
+        }
+        if ($s5 !== $this->peg_FAILED) {
+          while ($s5 !== $this->peg_FAILED) {
+            $s4[] = $s5;
+            if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
+              $s5 = $this->input_substr($this->peg_currPos, 1);
+              $this->peg_currPos++;
+            } else {
+              $s5 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c8);
+              }
+            }
+          }
+        } else {
+          $s4 = $this->peg_FAILED;
+        }
+        if ($s4 !== $this->peg_FAILED) {
+          $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+        } else {
+          $s3 = $s4;
+        }
         if ($s3 === $this->peg_FAILED) {
           $s3 = $this->peg_currPos;
-          $s4 = $this->peg_currPos;
+          $s4 = array();
           $s5 = $this->peg_currPos;
+          $s6 = $this->peg_currPos;
           $this->peg_silentFails++;
-          $s6 = $this->peg_parseBlock_End();
+          if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+            $s7 = $this->peg_c0;
+            $this->peg_currPos += 4;
+          } else {
+            $s7 = $this->peg_FAILED;
+            if ($this->peg_silentFails === 0) {
+                $this->peg_fail($this->peg_c1);
+            }
+          }
           $this->peg_silentFails--;
-          if ($s6 === $this->peg_FAILED) {
-            $s5 = null;
+          if ($s7 === $this->peg_FAILED) {
+            $s6 = null;
           } else {
-            $this->peg_currPos = $s5;
-            $s5 = $this->peg_FAILED;
+            $this->peg_currPos = $s6;
+            $s6 = $this->peg_FAILED;
           }
-          if ($s5 !== $this->peg_FAILED) {
+          if ($s6 !== $this->peg_FAILED) {
             if ($this->input_length > $this->peg_currPos) {
-              $s6 = $this->input_substr($this->peg_currPos, 1);
+              $s7 = $this->input_substr($this->peg_currPos, 1);
               $this->peg_currPos++;
             } else {
-              $s6 = $this->peg_FAILED;
+              $s7 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c0);
+                  $this->peg_fail($this->peg_c2);
               }
             }
-            if ($s6 !== $this->peg_FAILED) {
-              $s5 = array($s5, $s6);
-              $s4 = $s5;
+            if ($s7 !== $this->peg_FAILED) {
+              $s6 = array($s6, $s7);
+              $s5 = $s6;
             } else {
-              $this->peg_currPos = $s4;
-              $s4 = $this->peg_FAILED;
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
+            }
+          } else {
+            $this->peg_currPos = $s5;
+            $s5 = $this->peg_FAILED;
+          }
+          if ($s5 !== $this->peg_FAILED) {
+            while ($s5 !== $this->peg_FAILED) {
+              $s4[] = $s5;
+              $s5 = $this->peg_currPos;
+              $s6 = $this->peg_currPos;
+              $this->peg_silentFails++;
+              if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+                $s7 = $this->peg_c0;
+                $this->peg_currPos += 4;
+              } else {
+                $s7 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c1);
+                }
+              }
+              $this->peg_silentFails--;
+              if ($s7 === $this->peg_FAILED) {
+                $s6 = null;
+              } else {
+                $this->peg_currPos = $s6;
+                $s6 = $this->peg_FAILED;
+              }
+              if ($s6 !== $this->peg_FAILED) {
+                if ($this->input_length > $this->peg_currPos) {
+                  $s7 = $this->input_substr($this->peg_currPos, 1);
+                  $this->peg_currPos++;
+                } else {
+                  $s7 = $this->peg_FAILED;
+                  if ($this->peg_silentFails === 0) {
+                      $this->peg_fail($this->peg_c2);
+                  }
+                }
+                if ($s7 !== $this->peg_FAILED) {
+                  $s6 = array($s6, $s7);
+                  $s5 = $s6;
+                } else {
+                  $this->peg_currPos = $s5;
+                  $s5 = $this->peg_FAILED;
+                }
+              } else {
+                $this->peg_currPos = $s5;
+                $s5 = $this->peg_FAILED;
+              }
             }
           } else {
-            $this->peg_currPos = $s4;
             $s4 = $this->peg_FAILED;
           }
           if ($s4 !== $this->peg_FAILED) {
@@ -748,10 +1066,6 @@ private function peg_parseBlock_Balanced() {
           } else {
             $s3 = $s4;
           }
-        }
-        while ($s3 !== $this->peg_FAILED) {
-          $s2[] = $s3;
-          $s3 = $this->peg_parseBlock();
           if ($s3 === $this->peg_FAILED) {
             $s3 = $this->peg_currPos;
             $s4 = $this->peg_currPos;
@@ -772,7 +1086,7 @@ private function peg_parseBlock_Balanced() {
               } else {
                 $s6 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c0);
+                    $this->peg_fail($this->peg_c2);
                 }
               }
               if ($s6 !== $this->peg_FAILED) {
@@ -791,6 +1105,183 @@ private function peg_parseBlock_Balanced() {
             } else {
               $s3 = $s4;
             }
+            if ($s3 === $this->peg_FAILED) {
+              $s3 = $this->peg_parseBlock();
+            }
+          }
+        }
+        while ($s3 !== $this->peg_FAILED) {
+          $s2[] = $s3;
+          $s3 = $this->peg_currPos;
+          $s4 = array();
+          if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
+            $s5 = $this->input_substr($this->peg_currPos, 1);
+            $this->peg_currPos++;
+          } else {
+            $s5 = $this->peg_FAILED;
+            if ($this->peg_silentFails === 0) {
+                $this->peg_fail($this->peg_c8);
+            }
+          }
+          if ($s5 !== $this->peg_FAILED) {
+            while ($s5 !== $this->peg_FAILED) {
+              $s4[] = $s5;
+              if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
+                $s5 = $this->input_substr($this->peg_currPos, 1);
+                $this->peg_currPos++;
+              } else {
+                $s5 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c8);
+                }
+              }
+            }
+          } else {
+            $s4 = $this->peg_FAILED;
+          }
+          if ($s4 !== $this->peg_FAILED) {
+            $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+          } else {
+            $s3 = $s4;
+          }
+          if ($s3 === $this->peg_FAILED) {
+            $s3 = $this->peg_currPos;
+            $s4 = array();
+            $s5 = $this->peg_currPos;
+            $s6 = $this->peg_currPos;
+            $this->peg_silentFails++;
+            if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+              $s7 = $this->peg_c0;
+              $this->peg_currPos += 4;
+            } else {
+              $s7 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c1);
+              }
+            }
+            $this->peg_silentFails--;
+            if ($s7 === $this->peg_FAILED) {
+              $s6 = null;
+            } else {
+              $this->peg_currPos = $s6;
+              $s6 = $this->peg_FAILED;
+            }
+            if ($s6 !== $this->peg_FAILED) {
+              if ($this->input_length > $this->peg_currPos) {
+                $s7 = $this->input_substr($this->peg_currPos, 1);
+                $this->peg_currPos++;
+              } else {
+                $s7 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c2);
+                }
+              }
+              if ($s7 !== $this->peg_FAILED) {
+                $s6 = array($s6, $s7);
+                $s5 = $s6;
+              } else {
+                $this->peg_currPos = $s5;
+                $s5 = $this->peg_FAILED;
+              }
+            } else {
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
+            }
+            if ($s5 !== $this->peg_FAILED) {
+              while ($s5 !== $this->peg_FAILED) {
+                $s4[] = $s5;
+                $s5 = $this->peg_currPos;
+                $s6 = $this->peg_currPos;
+                $this->peg_silentFails++;
+                if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+                  $s7 = $this->peg_c0;
+                  $this->peg_currPos += 4;
+                } else {
+                  $s7 = $this->peg_FAILED;
+                  if ($this->peg_silentFails === 0) {
+                      $this->peg_fail($this->peg_c1);
+                  }
+                }
+                $this->peg_silentFails--;
+                if ($s7 === $this->peg_FAILED) {
+                  $s6 = null;
+                } else {
+                  $this->peg_currPos = $s6;
+                  $s6 = $this->peg_FAILED;
+                }
+                if ($s6 !== $this->peg_FAILED) {
+                  if ($this->input_length > $this->peg_currPos) {
+                    $s7 = $this->input_substr($this->peg_currPos, 1);
+                    $this->peg_currPos++;
+                  } else {
+                    $s7 = $this->peg_FAILED;
+                    if ($this->peg_silentFails === 0) {
+                        $this->peg_fail($this->peg_c2);
+                    }
+                  }
+                  if ($s7 !== $this->peg_FAILED) {
+                    $s6 = array($s6, $s7);
+                    $s5 = $s6;
+                  } else {
+                    $this->peg_currPos = $s5;
+                    $s5 = $this->peg_FAILED;
+                  }
+                } else {
+                  $this->peg_currPos = $s5;
+                  $s5 = $this->peg_FAILED;
+                }
+              }
+            } else {
+              $s4 = $this->peg_FAILED;
+            }
+            if ($s4 !== $this->peg_FAILED) {
+              $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+            } else {
+              $s3 = $s4;
+            }
+            if ($s3 === $this->peg_FAILED) {
+              $s3 = $this->peg_currPos;
+              $s4 = $this->peg_currPos;
+              $s5 = $this->peg_currPos;
+              $this->peg_silentFails++;
+              $s6 = $this->peg_parseBlock_End();
+              $this->peg_silentFails--;
+              if ($s6 === $this->peg_FAILED) {
+                $s5 = null;
+              } else {
+                $this->peg_currPos = $s5;
+                $s5 = $this->peg_FAILED;
+              }
+              if ($s5 !== $this->peg_FAILED) {
+                if ($this->input_length > $this->peg_currPos) {
+                  $s6 = $this->input_substr($this->peg_currPos, 1);
+                  $this->peg_currPos++;
+                } else {
+                  $s6 = $this->peg_FAILED;
+                  if ($this->peg_silentFails === 0) {
+                      $this->peg_fail($this->peg_c2);
+                  }
+                }
+                if ($s6 !== $this->peg_FAILED) {
+                  $s5 = array($s5, $s6);
+                  $s4 = $s5;
+                } else {
+                  $this->peg_currPos = $s4;
+                  $s4 = $this->peg_FAILED;
+                }
+              } else {
+                $this->peg_currPos = $s4;
+                $s4 = $this->peg_FAILED;
+              }
+              if ($s4 !== $this->peg_FAILED) {
+                $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+              } else {
+                $s3 = $s4;
+              }
+              if ($s3 === $this->peg_FAILED) {
+                $s3 = $this->peg_parseBlock();
+              }
+            }
           }
         }
         if ($s2 !== $this->peg_FAILED) {
@@ -812,19 +1303,29 @@ private function peg_parseBlock_Balanced() {
         $s0 = $this->peg_FAILED;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_Start() {
 
+      $key    = $this->peg_currPos * 12 + 4;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
-      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c1) {
-        $s1 = $this->peg_c1;
+      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+        $s1 = $this->peg_c0;
         $this->peg_currPos += 4;
       } else {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c2);
+            $this->peg_fail($this->peg_c1);
         }
       }
       if ($s1 !== $this->peg_FAILED) {
@@ -864,13 +1365,13 @@ private function peg_parseBlock_Start() {
                   $s6 = null;
                 }
                 if ($s6 !== $this->peg_FAILED) {
-                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
-                    $s7 = $this->peg_c7;
+                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
+                    $s7 = $this->peg_c9;
                     $this->peg_currPos += 3;
                   } else {
                     $s7 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
-                        $this->peg_fail($this->peg_c8);
+                        $this->peg_fail($this->peg_c10);
                     }
                   }
                   if ($s7 !== $this->peg_FAILED) {
@@ -906,31 +1407,41 @@ private function peg_parseBlock_Start() {
         $s0 = $this->peg_FAILED;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_End() {
 
+      $key    = $this->peg_currPos * 12 + 5;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
-      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c1) {
-        $s1 = $this->peg_c1;
+      if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+        $s1 = $this->peg_c0;
         $this->peg_currPos += 4;
       } else {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c2);
+            $this->peg_fail($this->peg_c1);
         }
       }
       if ($s1 !== $this->peg_FAILED) {
         $s2 = $this->peg_parse__();
         if ($s2 !== $this->peg_FAILED) {
-          if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c9) {
-            $s3 = $this->peg_c9;
+          if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c11) {
+            $s3 = $this->peg_c11;
             $this->peg_currPos += 4;
           } else {
             $s3 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c10);
+                $this->peg_fail($this->peg_c12);
             }
           }
           if ($s3 !== $this->peg_FAILED) {
@@ -938,13 +1449,13 @@ private function peg_parseBlock_End() {
             if ($s4 !== $this->peg_FAILED) {
               $s5 = $this->peg_parse__();
               if ($s5 !== $this->peg_FAILED) {
-                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
-                  $s6 = $this->peg_c7;
+                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
+                  $s6 = $this->peg_c9;
                   $this->peg_currPos += 3;
                 } else {
                   $s6 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c8);
+                      $this->peg_fail($this->peg_c10);
                   }
                 }
                 if ($s6 !== $this->peg_FAILED) {
@@ -976,32 +1487,52 @@ private function peg_parseBlock_End() {
         $s0 = $this->peg_FAILED;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_Name() {
 
+      $key    = $this->peg_currPos * 12 + 6;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_parseNamespaced_Block_Name();
       if ($s0 === $this->peg_FAILED) {
         $s0 = $this->peg_parseCore_Block_Name();
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseNamespaced_Block_Name() {
 
+      $key    = $this->peg_currPos * 12 + 7;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
       $s1 = $this->peg_currPos;
       $s2 = $this->peg_parseBlock_Name_Part();
       if ($s2 !== $this->peg_FAILED) {
-        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
-          $s3 = $this->peg_c11;
+        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c13) {
+          $s3 = $this->peg_c13;
           $this->peg_currPos++;
         } else {
           $s3 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c12);
+              $this->peg_fail($this->peg_c14);
           }
         }
         if ($s3 !== $this->peg_FAILED) {
@@ -1027,11 +1558,21 @@ private function peg_parseNamespaced_Block_Name() {
         $s0 = $s1;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseCore_Block_Name() {
 
+      $key    = $this->peg_currPos * 12 + 8;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = $this->peg_currPos;
       $s1 = $this->peg_currPos;
       $s2 = $this->peg_parseBlock_Name_Part();
@@ -1046,78 +1587,153 @@ private function peg_parseCore_Block_Name() {
       }
       $s0 = $s1;
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_Name_Part() {
 
-      $s0 = $this->peg_currPos;
-      $s1 = $this->peg_currPos;
-      if (Gutenberg_PEG_peg_char_class_test($this->peg_c13, $this->input_substr($this->peg_currPos, 1))) {
-        $s2 = $this->input_substr($this->peg_currPos, 1);
-        $this->peg_currPos++;
+      $key    = $this->peg_currPos * 12 + 9;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
+      if ($this->input_substr($this->peg_currPos, 9) === $this->peg_c15) {
+        $s0 = $this->peg_c15;
+        $this->peg_currPos += 9;
       } else {
-        $s2 = $this->peg_FAILED;
+        $s0 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c14);
+            $this->peg_fail($this->peg_c16);
         }
       }
-      if ($s2 !== $this->peg_FAILED) {
-        $s3 = array();
-        if (Gutenberg_PEG_peg_char_class_test($this->peg_c15, $this->input_substr($this->peg_currPos, 1))) {
-          $s4 = $this->input_substr($this->peg_currPos, 1);
-          $this->peg_currPos++;
+      if ($s0 === $this->peg_FAILED) {
+        if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c17) {
+          $s0 = $this->peg_c17;
+          $this->peg_currPos += 4;
         } else {
-          $s4 = $this->peg_FAILED;
+          $s0 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c16);
+              $this->peg_fail($this->peg_c18);
           }
         }
-        while ($s4 !== $this->peg_FAILED) {
-          $s3[] = $s4;
-          if (Gutenberg_PEG_peg_char_class_test($this->peg_c15, $this->input_substr($this->peg_currPos, 1))) {
-            $s4 = $this->input_substr($this->peg_currPos, 1);
-            $this->peg_currPos++;
+        if ($s0 === $this->peg_FAILED) {
+          if ($this->input_substr($this->peg_currPos, 7) === $this->peg_c19) {
+            $s0 = $this->peg_c19;
+            $this->peg_currPos += 7;
           } else {
-            $s4 = $this->peg_FAILED;
+            $s0 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c16);
+                $this->peg_fail($this->peg_c20);
+            }
+          }
+          if ($s0 === $this->peg_FAILED) {
+            if ($this->input_substr($this->peg_currPos, 5) === $this->peg_c21) {
+              $s0 = $this->peg_c21;
+              $this->peg_currPos += 5;
+            } else {
+              $s0 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c22);
+              }
+            }
+            if ($s0 === $this->peg_FAILED) {
+              if ($this->input_substr($this->peg_currPos, 5) === $this->peg_c23) {
+                $s0 = $this->peg_c23;
+                $this->peg_currPos += 5;
+              } else {
+                $s0 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c24);
+                }
+              }
+              if ($s0 === $this->peg_FAILED) {
+                $s0 = $this->peg_currPos;
+                $s1 = $this->peg_currPos;
+                if (Gutenberg_PEG_peg_char_class_test($this->peg_c25, $this->input_substr($this->peg_currPos, 1))) {
+                  $s2 = $this->input_substr($this->peg_currPos, 1);
+                  $this->peg_currPos++;
+                } else {
+                  $s2 = $this->peg_FAILED;
+                  if ($this->peg_silentFails === 0) {
+                      $this->peg_fail($this->peg_c26);
+                  }
+                }
+                if ($s2 !== $this->peg_FAILED) {
+                  $s3 = array();
+                  if (Gutenberg_PEG_peg_char_class_test($this->peg_c27, $this->input_substr($this->peg_currPos, 1))) {
+                    $s4 = $this->input_substr($this->peg_currPos, 1);
+                    $this->peg_currPos++;
+                  } else {
+                    $s4 = $this->peg_FAILED;
+                    if ($this->peg_silentFails === 0) {
+                        $this->peg_fail($this->peg_c28);
+                    }
+                  }
+                  while ($s4 !== $this->peg_FAILED) {
+                    $s3[] = $s4;
+                    if (Gutenberg_PEG_peg_char_class_test($this->peg_c27, $this->input_substr($this->peg_currPos, 1))) {
+                      $s4 = $this->input_substr($this->peg_currPos, 1);
+                      $this->peg_currPos++;
+                    } else {
+                      $s4 = $this->peg_FAILED;
+                      if ($this->peg_silentFails === 0) {
+                          $this->peg_fail($this->peg_c28);
+                      }
+                    }
+                  }
+                  if ($s3 !== $this->peg_FAILED) {
+                    $s2 = array($s2, $s3);
+                    $s1 = $s2;
+                  } else {
+                    $this->peg_currPos = $s1;
+                    $s1 = $this->peg_FAILED;
+                  }
+                } else {
+                  $this->peg_currPos = $s1;
+                  $s1 = $this->peg_FAILED;
+                }
+                if ($s1 !== $this->peg_FAILED) {
+                  $s0 = $this->input_substr($s0, $this->peg_currPos - $s0);
+                } else {
+                  $s0 = $s1;
+                }
+              }
             }
           }
         }
-        if ($s3 !== $this->peg_FAILED) {
-          $s2 = array($s2, $s3);
-          $s1 = $s2;
-        } else {
-          $this->peg_currPos = $s1;
-          $s1 = $this->peg_FAILED;
-        }
-      } else {
-        $this->peg_currPos = $s1;
-        $s1 = $this->peg_FAILED;
-      }
-      if ($s1 !== $this->peg_FAILED) {
-        $s0 = $this->input_substr($s0, $this->peg_currPos - $s0);
-      } else {
-        $s0 = $s1;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parseBlock_Attributes() {
 
+      $key    = $this->peg_currPos * 12 + 10;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $this->peg_silentFails++;
       $s0 = $this->peg_currPos;
       $s1 = $this->peg_currPos;
       $s2 = $this->peg_currPos;
-      if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c18) {
-        $s3 = $this->peg_c18;
+      if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c30) {
+        $s3 = $this->peg_c30;
         $this->peg_currPos++;
       } else {
         $s3 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c19);
+            $this->peg_fail($this->peg_c31);
         }
       }
       if ($s3 !== $this->peg_FAILED) {
@@ -1126,40 +1742,40 @@ private function peg_parseBlock_Attributes() {
         $s6 = $this->peg_currPos;
         $this->peg_silentFails++;
         $s7 = $this->peg_currPos;
-        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-          $s8 = $this->peg_c20;
+        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c32) {
+          $s8 = $this->peg_c32;
           $this->peg_currPos++;
         } else {
           $s8 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c21);
+              $this->peg_fail($this->peg_c33);
           }
         }
         if ($s8 !== $this->peg_FAILED) {
           $s9 = $this->peg_parse__();
           if ($s9 !== $this->peg_FAILED) {
-            $s10 = $this->peg_c22;
+            $s10 = $this->peg_c34;
             if ($s10 !== $this->peg_FAILED) {
-              if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
-                $s11 = $this->peg_c11;
+              if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c13) {
+                $s11 = $this->peg_c13;
                 $this->peg_currPos++;
               } else {
                 $s11 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c12);
+                    $this->peg_fail($this->peg_c14);
                 }
               }
               if ($s11 === $this->peg_FAILED) {
                 $s11 = null;
               }
               if ($s11 !== $this->peg_FAILED) {
-                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
-                  $s12 = $this->peg_c7;
+                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
+                  $s12 = $this->peg_c9;
                   $this->peg_currPos += 3;
                 } else {
                   $s12 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c8);
+                      $this->peg_fail($this->peg_c10);
                   }
                 }
                 if ($s12 !== $this->peg_FAILED) {
@@ -1199,7 +1815,7 @@ private function peg_parseBlock_Attributes() {
           } else {
             $s7 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c0);
+                $this->peg_fail($this->peg_c2);
             }
           }
           if ($s7 !== $this->peg_FAILED) {
@@ -1219,40 +1835,40 @@ private function peg_parseBlock_Attributes() {
           $s6 = $this->peg_currPos;
           $this->peg_silentFails++;
           $s7 = $this->peg_currPos;
-          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-            $s8 = $this->peg_c20;
+          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c32) {
+            $s8 = $this->peg_c32;
             $this->peg_currPos++;
           } else {
             $s8 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c21);
+                $this->peg_fail($this->peg_c33);
             }
           }
           if ($s8 !== $this->peg_FAILED) {
             $s9 = $this->peg_parse__();
             if ($s9 !== $this->peg_FAILED) {
-              $s10 = $this->peg_c22;
+              $s10 = $this->peg_c34;
               if ($s10 !== $this->peg_FAILED) {
-                if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
-                  $s11 = $this->peg_c11;
+                if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c13) {
+                  $s11 = $this->peg_c13;
                   $this->peg_currPos++;
                 } else {
                   $s11 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c12);
+                      $this->peg_fail($this->peg_c14);
                   }
                 }
                 if ($s11 === $this->peg_FAILED) {
                   $s11 = null;
                 }
                 if ($s11 !== $this->peg_FAILED) {
-                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
-                    $s12 = $this->peg_c7;
+                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
+                    $s12 = $this->peg_c9;
                     $this->peg_currPos += 3;
                   } else {
                     $s12 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
-                        $this->peg_fail($this->peg_c8);
+                        $this->peg_fail($this->peg_c10);
                     }
                   }
                   if ($s12 !== $this->peg_FAILED) {
@@ -1292,7 +1908,7 @@ private function peg_parseBlock_Attributes() {
             } else {
               $s7 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c0);
+                  $this->peg_fail($this->peg_c2);
               }
             }
             if ($s7 !== $this->peg_FAILED) {
@@ -1308,13 +1924,13 @@ private function peg_parseBlock_Attributes() {
           }
         }
         if ($s4 !== $this->peg_FAILED) {
-          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-            $s5 = $this->peg_c20;
+          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c32) {
+            $s5 = $this->peg_c32;
             $this->peg_currPos++;
           } else {
             $s5 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c21);
+                $this->peg_fail($this->peg_c33);
             }
           }
           if ($s5 !== $this->peg_FAILED) {
@@ -1346,35 +1962,45 @@ private function peg_parseBlock_Attributes() {
       if ($s0 === $this->peg_FAILED) {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c17);
+            $this->peg_fail($this->peg_c29);
         }
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
     private function peg_parse__() {
 
+      $key    = $this->peg_currPos * 12 + 11;
+          $cached = isset($this->peg_cache[$key]) ? $this->peg_cache[$key] : null;
+
+      if ($cached) {
+        $this->peg_currPos = $cached["nextPos"];
+        return $cached["result"];
+      }
+
       $s0 = array();
-      if (Gutenberg_PEG_peg_char_class_test($this->peg_c23, $this->input_substr($this->peg_currPos, 1))) {
+      if (Gutenberg_PEG_peg_char_class_test($this->peg_c35, $this->input_substr($this->peg_currPos, 1))) {
         $s1 = $this->input_substr($this->peg_currPos, 1);
         $this->peg_currPos++;
       } else {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c24);
+            $this->peg_fail($this->peg_c36);
         }
       }
       if ($s1 !== $this->peg_FAILED) {
         while ($s1 !== $this->peg_FAILED) {
           $s0[] = $s1;
-          if (Gutenberg_PEG_peg_char_class_test($this->peg_c23, $this->input_substr($this->peg_currPos, 1))) {
+          if (Gutenberg_PEG_peg_char_class_test($this->peg_c35, $this->input_substr($this->peg_currPos, 1))) {
             $s1 = $this->input_substr($this->peg_currPos, 1);
             $this->peg_currPos++;
           } else {
             $s1 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c24);
+                $this->peg_fail($this->peg_c36);
             }
           }
         }
@@ -1382,6 +2008,8 @@ private function peg_parse__() {
         $s0 = $this->peg_FAILED;
       }
 
+      $this->peg_cache[$key] = array ("nextPos" => $this->peg_currPos, "result" => $s0 );
+
       return $s0;
     }
 
@@ -1399,31 +2027,43 @@ public function parse($input) {
     $this->input_length = count($this->input);
 
     $this->peg_FAILED = new stdClass;
-    $this->peg_c0 = array("type" => "any", "description" => "any character" );
-    $this->peg_c1 = "<!--";
-    $this->peg_c2 = array( "type" => "literal", "value" => "<!--", "description" => "\"<!--\"" );
+    $this->peg_c0 = "<!--";
+    $this->peg_c1 = array( "type" => "literal", "value" => "<!--", "description" => "\"<!--\"" );
+    $this->peg_c2 = array("type" => "any", "description" => "any character" );
     $this->peg_c3 = "wp:";
     $this->peg_c4 = array( "type" => "literal", "value" => "wp:", "description" => "\"wp:\"" );
     $this->peg_c5 = "/-->";
     $this->peg_c6 = array( "type" => "literal", "value" => "/-->", "description" => "\"/-->\"" );
-    $this->peg_c7 = "-->";
-    $this->peg_c8 = array( "type" => "literal", "value" => "-->", "description" => "\"-->\"" );
-    $this->peg_c9 = "/wp:";
-    $this->peg_c10 = array( "type" => "literal", "value" => "/wp:", "description" => "\"/wp:\"" );
-    $this->peg_c11 = "/";
-    $this->peg_c12 = array( "type" => "literal", "value" => "/", "description" => "\"/\"" );
-    $this->peg_c13 = array(array(97,122));
-    $this->peg_c14 = array( "type" => "class", "value" => "[a-z]", "description" => "[a-z]" );
-    $this->peg_c15 = array(array(97,122), array(48,57), array(95,95), array(45,45));
-    $this->peg_c16 = array( "type" => "class", "value" => "[a-z0-9_-]", "description" => "[a-z0-9_-]" );
-    $this->peg_c17 = array("type" => "other", "description" => "JSON-encoded attributes embedded in a block's opening comment" );
-    $this->peg_c18 = "{";
-    $this->peg_c19 = array( "type" => "literal", "value" => "{", "description" => "\"{\"" );
-    $this->peg_c20 = "}";
-    $this->peg_c21 = array( "type" => "literal", "value" => "}", "description" => "\"}\"" );
-    $this->peg_c22 = "";
-    $this->peg_c23 = array(array(32,32), array(9,9), array(13,13), array(10,10));
-    $this->peg_c24 = array( "type" => "class", "value" => "[ \t\r\n]", "description" => "[ \t\r\n]" );
+    $this->peg_c7 = array(array(60,60));
+    $this->peg_c8 = array( "type" => "class", "value" => "[<]", "description" => "[<]" );
+    $this->peg_c9 = "-->";
+    $this->peg_c10 = array( "type" => "literal", "value" => "-->", "description" => "\"-->\"" );
+    $this->peg_c11 = "/wp:";
+    $this->peg_c12 = array( "type" => "literal", "value" => "/wp:", "description" => "\"/wp:\"" );
+    $this->peg_c13 = "/";
+    $this->peg_c14 = array( "type" => "literal", "value" => "/", "description" => "\"/\"" );
+    $this->peg_c15 = "paragraph";
+    $this->peg_c16 = array( "type" => "literal", "value" => "paragraph", "description" => "\"paragraph\"" );
+    $this->peg_c17 = "list";
+    $this->peg_c18 = array( "type" => "literal", "value" => "list", "description" => "\"list\"" );
+    $this->peg_c19 = "heading";
+    $this->peg_c20 = array( "type" => "literal", "value" => "heading", "description" => "\"heading\"" );
+    $this->peg_c21 = "image";
+    $this->peg_c22 = array( "type" => "literal", "value" => "image", "description" => "\"image\"" );
+    $this->peg_c23 = "table";
+    $this->peg_c24 = array( "type" => "literal", "value" => "table", "description" => "\"table\"" );
+    $this->peg_c25 = array(array(97,122));
+    $this->peg_c26 = array( "type" => "class", "value" => "[a-z]", "description" => "[a-z]" );
+    $this->peg_c27 = array(array(97,122), array(48,57), array(95,95), array(45,45));
+    $this->peg_c28 = array( "type" => "class", "value" => "[a-z0-9_-]", "description" => "[a-z0-9_-]" );
+    $this->peg_c29 = array("type" => "other", "description" => "JSON-encoded attributes embedded in a block's opening comment" );
+    $this->peg_c30 = "{";
+    $this->peg_c31 = array( "type" => "literal", "value" => "{", "description" => "\"{\"" );
+    $this->peg_c32 = "}";
+    $this->peg_c33 = array( "type" => "literal", "value" => "}", "description" => "\"}\"" );
+    $this->peg_c34 = "";
+    $this->peg_c35 = array(array(32,32), array(9,9), array(13,13), array(10,10));
+    $this->peg_c36 = array( "type" => "class", "value" => "[ \t\r\n]", "description" => "[ \t\r\n]" );
 
     $peg_startRuleFunctions = array( 'Block_List' => array($this, "peg_parseBlock_List") );
     $peg_startRuleFunction  = array($this, "peg_parseBlock_List");
@@ -1487,6 +2127,8 @@ function peg_join_blocks( $pre, $tokens, $post ) {
 
     $peg_result = call_user_func($peg_startRuleFunction);
 
+    $this->peg_cache = array();
+
     if ($peg_result !== $this->peg_FAILED && $this->peg_currPos === $this->input_length) {
       $this->cleanup_state(); // Free up memory
       return $peg_result;

From 4cdba122d767e4ce97c644da2c32023711ea5493 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 19 Jul 2018 16:06:48 +1000
Subject: [PATCH 2/3] Build the PHP parser

---
 lib/parser.php | 488 +++++++++++++++++++++----------------------------
 1 file changed, 208 insertions(+), 280 deletions(-)

diff --git a/lib/parser.php b/lib/parser.php
index 0117749255a36..040475a8e028d 100644
--- a/lib/parser.php
+++ b/lib/parser.php
@@ -264,8 +264,6 @@ private function peg_buildException($message, $expected, $pos) {
     private $peg_c32;
     private $peg_c33;
     private $peg_c34;
-    private $peg_c35;
-    private $peg_c36;
 
     private function peg_f0($pre, $b, $html) { return array( $b, $html ); }
     private function peg_f1($pre, $bs, $post) { return peg_join_blocks( $pre, $bs, $post ); }
@@ -941,26 +939,88 @@ private function peg_parseBlock_Balanced() {
         $s2 = array();
         $s3 = $this->peg_currPos;
         $s4 = array();
-        if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
-          $s5 = $this->input_substr($this->peg_currPos, 1);
-          $this->peg_currPos++;
+        $s5 = $this->peg_currPos;
+        $s6 = $this->peg_currPos;
+        $this->peg_silentFails++;
+        if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+          $s7 = $this->peg_c0;
+          $this->peg_currPos += 4;
         } else {
-          $s5 = $this->peg_FAILED;
+          $s7 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c8);
+              $this->peg_fail($this->peg_c1);
+          }
+        }
+        $this->peg_silentFails--;
+        if ($s7 === $this->peg_FAILED) {
+          $s6 = null;
+        } else {
+          $this->peg_currPos = $s6;
+          $s6 = $this->peg_FAILED;
+        }
+        if ($s6 !== $this->peg_FAILED) {
+          if ($this->input_length > $this->peg_currPos) {
+            $s7 = $this->input_substr($this->peg_currPos, 1);
+            $this->peg_currPos++;
+          } else {
+            $s7 = $this->peg_FAILED;
+            if ($this->peg_silentFails === 0) {
+                $this->peg_fail($this->peg_c2);
+            }
+          }
+          if ($s7 !== $this->peg_FAILED) {
+            $s6 = array($s6, $s7);
+            $s5 = $s6;
+          } else {
+            $this->peg_currPos = $s5;
+            $s5 = $this->peg_FAILED;
           }
+        } else {
+          $this->peg_currPos = $s5;
+          $s5 = $this->peg_FAILED;
         }
         if ($s5 !== $this->peg_FAILED) {
           while ($s5 !== $this->peg_FAILED) {
             $s4[] = $s5;
-            if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
-              $s5 = $this->input_substr($this->peg_currPos, 1);
-              $this->peg_currPos++;
+            $s5 = $this->peg_currPos;
+            $s6 = $this->peg_currPos;
+            $this->peg_silentFails++;
+            if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
+              $s7 = $this->peg_c0;
+              $this->peg_currPos += 4;
             } else {
-              $s5 = $this->peg_FAILED;
+              $s7 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c8);
+                  $this->peg_fail($this->peg_c1);
+              }
+            }
+            $this->peg_silentFails--;
+            if ($s7 === $this->peg_FAILED) {
+              $s6 = null;
+            } else {
+              $this->peg_currPos = $s6;
+              $s6 = $this->peg_FAILED;
+            }
+            if ($s6 !== $this->peg_FAILED) {
+              if ($this->input_length > $this->peg_currPos) {
+                $s7 = $this->input_substr($this->peg_currPos, 1);
+                $this->peg_currPos++;
+              } else {
+                $s7 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c2);
+                }
+              }
+              if ($s7 !== $this->peg_FAILED) {
+                $s6 = array($s6, $s7);
+                $s5 = $s6;
+              } else {
+                $this->peg_currPos = $s5;
+                $s5 = $this->peg_FAILED;
               }
+            } else {
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
             }
           }
         } else {
@@ -972,6 +1032,50 @@ private function peg_parseBlock_Balanced() {
           $s3 = $s4;
         }
         if ($s3 === $this->peg_FAILED) {
+          $s3 = $this->peg_currPos;
+          $s4 = $this->peg_currPos;
+          $s5 = $this->peg_currPos;
+          $this->peg_silentFails++;
+          $s6 = $this->peg_parseBlock_End();
+          $this->peg_silentFails--;
+          if ($s6 === $this->peg_FAILED) {
+            $s5 = null;
+          } else {
+            $this->peg_currPos = $s5;
+            $s5 = $this->peg_FAILED;
+          }
+          if ($s5 !== $this->peg_FAILED) {
+            if ($this->input_length > $this->peg_currPos) {
+              $s6 = $this->input_substr($this->peg_currPos, 1);
+              $this->peg_currPos++;
+            } else {
+              $s6 = $this->peg_FAILED;
+              if ($this->peg_silentFails === 0) {
+                  $this->peg_fail($this->peg_c2);
+              }
+            }
+            if ($s6 !== $this->peg_FAILED) {
+              $s5 = array($s5, $s6);
+              $s4 = $s5;
+            } else {
+              $this->peg_currPos = $s4;
+              $s4 = $this->peg_FAILED;
+            }
+          } else {
+            $this->peg_currPos = $s4;
+            $s4 = $this->peg_FAILED;
+          }
+          if ($s4 !== $this->peg_FAILED) {
+            $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+          } else {
+            $s3 = $s4;
+          }
+          if ($s3 === $this->peg_FAILED) {
+            $s3 = $this->peg_parseBlock();
+          }
+        }
+        while ($s3 !== $this->peg_FAILED) {
+          $s2[] = $s3;
           $s3 = $this->peg_currPos;
           $s4 = array();
           $s5 = $this->peg_currPos;
@@ -1110,180 +1214,6 @@ private function peg_parseBlock_Balanced() {
             }
           }
         }
-        while ($s3 !== $this->peg_FAILED) {
-          $s2[] = $s3;
-          $s3 = $this->peg_currPos;
-          $s4 = array();
-          if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
-            $s5 = $this->input_substr($this->peg_currPos, 1);
-            $this->peg_currPos++;
-          } else {
-            $s5 = $this->peg_FAILED;
-            if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c8);
-            }
-          }
-          if ($s5 !== $this->peg_FAILED) {
-            while ($s5 !== $this->peg_FAILED) {
-              $s4[] = $s5;
-              if (Gutenberg_PEG_peg_char_class_test($this->peg_c7, $this->input_substr($this->peg_currPos, 1))) {
-                $s5 = $this->input_substr($this->peg_currPos, 1);
-                $this->peg_currPos++;
-              } else {
-                $s5 = $this->peg_FAILED;
-                if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c8);
-                }
-              }
-            }
-          } else {
-            $s4 = $this->peg_FAILED;
-          }
-          if ($s4 !== $this->peg_FAILED) {
-            $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
-          } else {
-            $s3 = $s4;
-          }
-          if ($s3 === $this->peg_FAILED) {
-            $s3 = $this->peg_currPos;
-            $s4 = array();
-            $s5 = $this->peg_currPos;
-            $s6 = $this->peg_currPos;
-            $this->peg_silentFails++;
-            if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
-              $s7 = $this->peg_c0;
-              $this->peg_currPos += 4;
-            } else {
-              $s7 = $this->peg_FAILED;
-              if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c1);
-              }
-            }
-            $this->peg_silentFails--;
-            if ($s7 === $this->peg_FAILED) {
-              $s6 = null;
-            } else {
-              $this->peg_currPos = $s6;
-              $s6 = $this->peg_FAILED;
-            }
-            if ($s6 !== $this->peg_FAILED) {
-              if ($this->input_length > $this->peg_currPos) {
-                $s7 = $this->input_substr($this->peg_currPos, 1);
-                $this->peg_currPos++;
-              } else {
-                $s7 = $this->peg_FAILED;
-                if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c2);
-                }
-              }
-              if ($s7 !== $this->peg_FAILED) {
-                $s6 = array($s6, $s7);
-                $s5 = $s6;
-              } else {
-                $this->peg_currPos = $s5;
-                $s5 = $this->peg_FAILED;
-              }
-            } else {
-              $this->peg_currPos = $s5;
-              $s5 = $this->peg_FAILED;
-            }
-            if ($s5 !== $this->peg_FAILED) {
-              while ($s5 !== $this->peg_FAILED) {
-                $s4[] = $s5;
-                $s5 = $this->peg_currPos;
-                $s6 = $this->peg_currPos;
-                $this->peg_silentFails++;
-                if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c0) {
-                  $s7 = $this->peg_c0;
-                  $this->peg_currPos += 4;
-                } else {
-                  $s7 = $this->peg_FAILED;
-                  if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c1);
-                  }
-                }
-                $this->peg_silentFails--;
-                if ($s7 === $this->peg_FAILED) {
-                  $s6 = null;
-                } else {
-                  $this->peg_currPos = $s6;
-                  $s6 = $this->peg_FAILED;
-                }
-                if ($s6 !== $this->peg_FAILED) {
-                  if ($this->input_length > $this->peg_currPos) {
-                    $s7 = $this->input_substr($this->peg_currPos, 1);
-                    $this->peg_currPos++;
-                  } else {
-                    $s7 = $this->peg_FAILED;
-                    if ($this->peg_silentFails === 0) {
-                        $this->peg_fail($this->peg_c2);
-                    }
-                  }
-                  if ($s7 !== $this->peg_FAILED) {
-                    $s6 = array($s6, $s7);
-                    $s5 = $s6;
-                  } else {
-                    $this->peg_currPos = $s5;
-                    $s5 = $this->peg_FAILED;
-                  }
-                } else {
-                  $this->peg_currPos = $s5;
-                  $s5 = $this->peg_FAILED;
-                }
-              }
-            } else {
-              $s4 = $this->peg_FAILED;
-            }
-            if ($s4 !== $this->peg_FAILED) {
-              $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
-            } else {
-              $s3 = $s4;
-            }
-            if ($s3 === $this->peg_FAILED) {
-              $s3 = $this->peg_currPos;
-              $s4 = $this->peg_currPos;
-              $s5 = $this->peg_currPos;
-              $this->peg_silentFails++;
-              $s6 = $this->peg_parseBlock_End();
-              $this->peg_silentFails--;
-              if ($s6 === $this->peg_FAILED) {
-                $s5 = null;
-              } else {
-                $this->peg_currPos = $s5;
-                $s5 = $this->peg_FAILED;
-              }
-              if ($s5 !== $this->peg_FAILED) {
-                if ($this->input_length > $this->peg_currPos) {
-                  $s6 = $this->input_substr($this->peg_currPos, 1);
-                  $this->peg_currPos++;
-                } else {
-                  $s6 = $this->peg_FAILED;
-                  if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c2);
-                  }
-                }
-                if ($s6 !== $this->peg_FAILED) {
-                  $s5 = array($s5, $s6);
-                  $s4 = $s5;
-                } else {
-                  $this->peg_currPos = $s4;
-                  $s4 = $this->peg_FAILED;
-                }
-              } else {
-                $this->peg_currPos = $s4;
-                $s4 = $this->peg_FAILED;
-              }
-              if ($s4 !== $this->peg_FAILED) {
-                $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
-              } else {
-                $s3 = $s4;
-              }
-              if ($s3 === $this->peg_FAILED) {
-                $s3 = $this->peg_parseBlock();
-              }
-            }
-          }
-        }
         if ($s2 !== $this->peg_FAILED) {
           $s3 = $this->peg_parseBlock_End();
           if ($s3 !== $this->peg_FAILED) {
@@ -1365,13 +1295,13 @@ private function peg_parseBlock_Start() {
                   $s6 = null;
                 }
                 if ($s6 !== $this->peg_FAILED) {
-                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
-                    $s7 = $this->peg_c9;
+                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
+                    $s7 = $this->peg_c7;
                     $this->peg_currPos += 3;
                   } else {
                     $s7 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
-                        $this->peg_fail($this->peg_c10);
+                        $this->peg_fail($this->peg_c8);
                     }
                   }
                   if ($s7 !== $this->peg_FAILED) {
@@ -1435,13 +1365,13 @@ private function peg_parseBlock_End() {
       if ($s1 !== $this->peg_FAILED) {
         $s2 = $this->peg_parse__();
         if ($s2 !== $this->peg_FAILED) {
-          if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c11) {
-            $s3 = $this->peg_c11;
+          if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c9) {
+            $s3 = $this->peg_c9;
             $this->peg_currPos += 4;
           } else {
             $s3 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c12);
+                $this->peg_fail($this->peg_c10);
             }
           }
           if ($s3 !== $this->peg_FAILED) {
@@ -1449,13 +1379,13 @@ private function peg_parseBlock_End() {
             if ($s4 !== $this->peg_FAILED) {
               $s5 = $this->peg_parse__();
               if ($s5 !== $this->peg_FAILED) {
-                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
-                  $s6 = $this->peg_c9;
+                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
+                  $s6 = $this->peg_c7;
                   $this->peg_currPos += 3;
                 } else {
                   $s6 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c10);
+                      $this->peg_fail($this->peg_c8);
                   }
                 }
                 if ($s6 !== $this->peg_FAILED) {
@@ -1526,13 +1456,13 @@ private function peg_parseNamespaced_Block_Name() {
       $s1 = $this->peg_currPos;
       $s2 = $this->peg_parseBlock_Name_Part();
       if ($s2 !== $this->peg_FAILED) {
-        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c13) {
-          $s3 = $this->peg_c13;
+        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
+          $s3 = $this->peg_c11;
           $this->peg_currPos++;
         } else {
           $s3 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c14);
+              $this->peg_fail($this->peg_c12);
           }
         }
         if ($s3 !== $this->peg_FAILED) {
@@ -1602,87 +1532,87 @@ private function peg_parseBlock_Name_Part() {
         return $cached["result"];
       }
 
-      if ($this->input_substr($this->peg_currPos, 9) === $this->peg_c15) {
-        $s0 = $this->peg_c15;
+      if ($this->input_substr($this->peg_currPos, 9) === $this->peg_c13) {
+        $s0 = $this->peg_c13;
         $this->peg_currPos += 9;
       } else {
         $s0 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c16);
+            $this->peg_fail($this->peg_c14);
         }
       }
       if ($s0 === $this->peg_FAILED) {
-        if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c17) {
-          $s0 = $this->peg_c17;
+        if ($this->input_substr($this->peg_currPos, 4) === $this->peg_c15) {
+          $s0 = $this->peg_c15;
           $this->peg_currPos += 4;
         } else {
           $s0 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c18);
+              $this->peg_fail($this->peg_c16);
           }
         }
         if ($s0 === $this->peg_FAILED) {
-          if ($this->input_substr($this->peg_currPos, 7) === $this->peg_c19) {
-            $s0 = $this->peg_c19;
+          if ($this->input_substr($this->peg_currPos, 7) === $this->peg_c17) {
+            $s0 = $this->peg_c17;
             $this->peg_currPos += 7;
           } else {
             $s0 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c20);
+                $this->peg_fail($this->peg_c18);
             }
           }
           if ($s0 === $this->peg_FAILED) {
-            if ($this->input_substr($this->peg_currPos, 5) === $this->peg_c21) {
-              $s0 = $this->peg_c21;
+            if ($this->input_substr($this->peg_currPos, 5) === $this->peg_c19) {
+              $s0 = $this->peg_c19;
               $this->peg_currPos += 5;
             } else {
               $s0 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c22);
+                  $this->peg_fail($this->peg_c20);
               }
             }
             if ($s0 === $this->peg_FAILED) {
-              if ($this->input_substr($this->peg_currPos, 5) === $this->peg_c23) {
-                $s0 = $this->peg_c23;
+              if ($this->input_substr($this->peg_currPos, 5) === $this->peg_c21) {
+                $s0 = $this->peg_c21;
                 $this->peg_currPos += 5;
               } else {
                 $s0 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c24);
+                    $this->peg_fail($this->peg_c22);
                 }
               }
               if ($s0 === $this->peg_FAILED) {
                 $s0 = $this->peg_currPos;
                 $s1 = $this->peg_currPos;
-                if (Gutenberg_PEG_peg_char_class_test($this->peg_c25, $this->input_substr($this->peg_currPos, 1))) {
+                if (Gutenberg_PEG_peg_char_class_test($this->peg_c23, $this->input_substr($this->peg_currPos, 1))) {
                   $s2 = $this->input_substr($this->peg_currPos, 1);
                   $this->peg_currPos++;
                 } else {
                   $s2 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c26);
+                      $this->peg_fail($this->peg_c24);
                   }
                 }
                 if ($s2 !== $this->peg_FAILED) {
                   $s3 = array();
-                  if (Gutenberg_PEG_peg_char_class_test($this->peg_c27, $this->input_substr($this->peg_currPos, 1))) {
+                  if (Gutenberg_PEG_peg_char_class_test($this->peg_c25, $this->input_substr($this->peg_currPos, 1))) {
                     $s4 = $this->input_substr($this->peg_currPos, 1);
                     $this->peg_currPos++;
                   } else {
                     $s4 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
-                        $this->peg_fail($this->peg_c28);
+                        $this->peg_fail($this->peg_c26);
                     }
                   }
                   while ($s4 !== $this->peg_FAILED) {
                     $s3[] = $s4;
-                    if (Gutenberg_PEG_peg_char_class_test($this->peg_c27, $this->input_substr($this->peg_currPos, 1))) {
+                    if (Gutenberg_PEG_peg_char_class_test($this->peg_c25, $this->input_substr($this->peg_currPos, 1))) {
                       $s4 = $this->input_substr($this->peg_currPos, 1);
                       $this->peg_currPos++;
                     } else {
                       $s4 = $this->peg_FAILED;
                       if ($this->peg_silentFails === 0) {
-                          $this->peg_fail($this->peg_c28);
+                          $this->peg_fail($this->peg_c26);
                       }
                     }
                   }
@@ -1727,13 +1657,13 @@ private function peg_parseBlock_Attributes() {
       $s0 = $this->peg_currPos;
       $s1 = $this->peg_currPos;
       $s2 = $this->peg_currPos;
-      if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c30) {
-        $s3 = $this->peg_c30;
+      if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c28) {
+        $s3 = $this->peg_c28;
         $this->peg_currPos++;
       } else {
         $s3 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c31);
+            $this->peg_fail($this->peg_c29);
         }
       }
       if ($s3 !== $this->peg_FAILED) {
@@ -1742,40 +1672,40 @@ private function peg_parseBlock_Attributes() {
         $s6 = $this->peg_currPos;
         $this->peg_silentFails++;
         $s7 = $this->peg_currPos;
-        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c32) {
-          $s8 = $this->peg_c32;
+        if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c30) {
+          $s8 = $this->peg_c30;
           $this->peg_currPos++;
         } else {
           $s8 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
-              $this->peg_fail($this->peg_c33);
+              $this->peg_fail($this->peg_c31);
           }
         }
         if ($s8 !== $this->peg_FAILED) {
           $s9 = $this->peg_parse__();
           if ($s9 !== $this->peg_FAILED) {
-            $s10 = $this->peg_c34;
+            $s10 = $this->peg_c32;
             if ($s10 !== $this->peg_FAILED) {
-              if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c13) {
-                $s11 = $this->peg_c13;
+              if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
+                $s11 = $this->peg_c11;
                 $this->peg_currPos++;
               } else {
                 $s11 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c14);
+                    $this->peg_fail($this->peg_c12);
                 }
               }
               if ($s11 === $this->peg_FAILED) {
                 $s11 = null;
               }
               if ($s11 !== $this->peg_FAILED) {
-                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
-                  $s12 = $this->peg_c9;
+                if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
+                  $s12 = $this->peg_c7;
                   $this->peg_currPos += 3;
                 } else {
                   $s12 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c10);
+                      $this->peg_fail($this->peg_c8);
                   }
                 }
                 if ($s12 !== $this->peg_FAILED) {
@@ -1835,40 +1765,40 @@ private function peg_parseBlock_Attributes() {
           $s6 = $this->peg_currPos;
           $this->peg_silentFails++;
           $s7 = $this->peg_currPos;
-          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c32) {
-            $s8 = $this->peg_c32;
+          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c30) {
+            $s8 = $this->peg_c30;
             $this->peg_currPos++;
           } else {
             $s8 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c33);
+                $this->peg_fail($this->peg_c31);
             }
           }
           if ($s8 !== $this->peg_FAILED) {
             $s9 = $this->peg_parse__();
             if ($s9 !== $this->peg_FAILED) {
-              $s10 = $this->peg_c34;
+              $s10 = $this->peg_c32;
               if ($s10 !== $this->peg_FAILED) {
-                if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c13) {
-                  $s11 = $this->peg_c13;
+                if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
+                  $s11 = $this->peg_c11;
                   $this->peg_currPos++;
                 } else {
                   $s11 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
-                      $this->peg_fail($this->peg_c14);
+                      $this->peg_fail($this->peg_c12);
                   }
                 }
                 if ($s11 === $this->peg_FAILED) {
                   $s11 = null;
                 }
                 if ($s11 !== $this->peg_FAILED) {
-                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c9) {
-                    $s12 = $this->peg_c9;
+                  if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
+                    $s12 = $this->peg_c7;
                     $this->peg_currPos += 3;
                   } else {
                     $s12 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
-                        $this->peg_fail($this->peg_c10);
+                        $this->peg_fail($this->peg_c8);
                     }
                   }
                   if ($s12 !== $this->peg_FAILED) {
@@ -1924,13 +1854,13 @@ private function peg_parseBlock_Attributes() {
           }
         }
         if ($s4 !== $this->peg_FAILED) {
-          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c32) {
-            $s5 = $this->peg_c32;
+          if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c30) {
+            $s5 = $this->peg_c30;
             $this->peg_currPos++;
           } else {
             $s5 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c33);
+                $this->peg_fail($this->peg_c31);
             }
           }
           if ($s5 !== $this->peg_FAILED) {
@@ -1962,7 +1892,7 @@ private function peg_parseBlock_Attributes() {
       if ($s0 === $this->peg_FAILED) {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c29);
+            $this->peg_fail($this->peg_c27);
         }
       }
 
@@ -1982,25 +1912,25 @@ private function peg_parse__() {
       }
 
       $s0 = array();
-      if (Gutenberg_PEG_peg_char_class_test($this->peg_c35, $this->input_substr($this->peg_currPos, 1))) {
+      if (Gutenberg_PEG_peg_char_class_test($this->peg_c33, $this->input_substr($this->peg_currPos, 1))) {
         $s1 = $this->input_substr($this->peg_currPos, 1);
         $this->peg_currPos++;
       } else {
         $s1 = $this->peg_FAILED;
         if ($this->peg_silentFails === 0) {
-            $this->peg_fail($this->peg_c36);
+            $this->peg_fail($this->peg_c34);
         }
       }
       if ($s1 !== $this->peg_FAILED) {
         while ($s1 !== $this->peg_FAILED) {
           $s0[] = $s1;
-          if (Gutenberg_PEG_peg_char_class_test($this->peg_c35, $this->input_substr($this->peg_currPos, 1))) {
+          if (Gutenberg_PEG_peg_char_class_test($this->peg_c33, $this->input_substr($this->peg_currPos, 1))) {
             $s1 = $this->input_substr($this->peg_currPos, 1);
             $this->peg_currPos++;
           } else {
             $s1 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
-                $this->peg_fail($this->peg_c36);
+                $this->peg_fail($this->peg_c34);
             }
           }
         }
@@ -2034,36 +1964,34 @@ public function parse($input) {
     $this->peg_c4 = array( "type" => "literal", "value" => "wp:", "description" => "\"wp:\"" );
     $this->peg_c5 = "/-->";
     $this->peg_c6 = array( "type" => "literal", "value" => "/-->", "description" => "\"/-->\"" );
-    $this->peg_c7 = array(array(60,60));
-    $this->peg_c8 = array( "type" => "class", "value" => "[<]", "description" => "[<]" );
-    $this->peg_c9 = "-->";
-    $this->peg_c10 = array( "type" => "literal", "value" => "-->", "description" => "\"-->\"" );
-    $this->peg_c11 = "/wp:";
-    $this->peg_c12 = array( "type" => "literal", "value" => "/wp:", "description" => "\"/wp:\"" );
-    $this->peg_c13 = "/";
-    $this->peg_c14 = array( "type" => "literal", "value" => "/", "description" => "\"/\"" );
-    $this->peg_c15 = "paragraph";
-    $this->peg_c16 = array( "type" => "literal", "value" => "paragraph", "description" => "\"paragraph\"" );
-    $this->peg_c17 = "list";
-    $this->peg_c18 = array( "type" => "literal", "value" => "list", "description" => "\"list\"" );
-    $this->peg_c19 = "heading";
-    $this->peg_c20 = array( "type" => "literal", "value" => "heading", "description" => "\"heading\"" );
-    $this->peg_c21 = "image";
-    $this->peg_c22 = array( "type" => "literal", "value" => "image", "description" => "\"image\"" );
-    $this->peg_c23 = "table";
-    $this->peg_c24 = array( "type" => "literal", "value" => "table", "description" => "\"table\"" );
-    $this->peg_c25 = array(array(97,122));
-    $this->peg_c26 = array( "type" => "class", "value" => "[a-z]", "description" => "[a-z]" );
-    $this->peg_c27 = array(array(97,122), array(48,57), array(95,95), array(45,45));
-    $this->peg_c28 = array( "type" => "class", "value" => "[a-z0-9_-]", "description" => "[a-z0-9_-]" );
-    $this->peg_c29 = array("type" => "other", "description" => "JSON-encoded attributes embedded in a block's opening comment" );
-    $this->peg_c30 = "{";
-    $this->peg_c31 = array( "type" => "literal", "value" => "{", "description" => "\"{\"" );
-    $this->peg_c32 = "}";
-    $this->peg_c33 = array( "type" => "literal", "value" => "}", "description" => "\"}\"" );
-    $this->peg_c34 = "";
-    $this->peg_c35 = array(array(32,32), array(9,9), array(13,13), array(10,10));
-    $this->peg_c36 = array( "type" => "class", "value" => "[ \t\r\n]", "description" => "[ \t\r\n]" );
+    $this->peg_c7 = "-->";
+    $this->peg_c8 = array( "type" => "literal", "value" => "-->", "description" => "\"-->\"" );
+    $this->peg_c9 = "/wp:";
+    $this->peg_c10 = array( "type" => "literal", "value" => "/wp:", "description" => "\"/wp:\"" );
+    $this->peg_c11 = "/";
+    $this->peg_c12 = array( "type" => "literal", "value" => "/", "description" => "\"/\"" );
+    $this->peg_c13 = "paragraph";
+    $this->peg_c14 = array( "type" => "literal", "value" => "paragraph", "description" => "\"paragraph\"" );
+    $this->peg_c15 = "list";
+    $this->peg_c16 = array( "type" => "literal", "value" => "list", "description" => "\"list\"" );
+    $this->peg_c17 = "heading";
+    $this->peg_c18 = array( "type" => "literal", "value" => "heading", "description" => "\"heading\"" );
+    $this->peg_c19 = "image";
+    $this->peg_c20 = array( "type" => "literal", "value" => "image", "description" => "\"image\"" );
+    $this->peg_c21 = "table";
+    $this->peg_c22 = array( "type" => "literal", "value" => "table", "description" => "\"table\"" );
+    $this->peg_c23 = array(array(97,122));
+    $this->peg_c24 = array( "type" => "class", "value" => "[a-z]", "description" => "[a-z]" );
+    $this->peg_c25 = array(array(97,122), array(48,57), array(95,95), array(45,45));
+    $this->peg_c26 = array( "type" => "class", "value" => "[a-z0-9_-]", "description" => "[a-z0-9_-]" );
+    $this->peg_c27 = array("type" => "other", "description" => "JSON-encoded attributes embedded in a block's opening comment" );
+    $this->peg_c28 = "{";
+    $this->peg_c29 = array( "type" => "literal", "value" => "{", "description" => "\"{\"" );
+    $this->peg_c30 = "}";
+    $this->peg_c31 = array( "type" => "literal", "value" => "}", "description" => "\"}\"" );
+    $this->peg_c32 = "";
+    $this->peg_c33 = array(array(32,32), array(9,9), array(13,13), array(10,10));
+    $this->peg_c34 = array( "type" => "class", "value" => "[ \t\r\n]", "description" => "[ \t\r\n]" );
 
     $peg_startRuleFunctions = array( 'Block_List' => array($this, "peg_parseBlock_List") );
     $peg_startRuleFunction  = array($this, "peg_parseBlock_List");

From 1e43228410f045337335a2f49f28a52d6e62e76b Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 19 Jul 2018 16:29:30 +1000
Subject: [PATCH 3/3] Swap the Block / Block_End child tests of Block_Balanced
 back.

---
 blocks/api/post.pegjs |   2 +-
 lib/parser.php        | 136 +++++++++++++++++++++---------------------
 2 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/blocks/api/post.pegjs b/blocks/api/post.pegjs
index 4b155563f7afe..2a99d42d37b09 100644
--- a/blocks/api/post.pegjs
+++ b/blocks/api/post.pegjs
@@ -196,7 +196,7 @@ Block_Void
   }
 
 Block_Balanced
-  = s:Block_Start children:( $(!"<!--" .)+ / $(!Block_End .) / Block )* e:Block_End
+  = s:Block_Start children:( $(!"<!--" .)+ / Block / $(!Block_End .) )* e:Block_End
   {
     /** <?php
     list( $innerHTML, $innerBlocks ) = peg_array_partition( $children, 'is_string' );
diff --git a/lib/parser.php b/lib/parser.php
index 040475a8e028d..4947f70ff621d 100644
--- a/lib/parser.php
+++ b/lib/parser.php
@@ -1032,46 +1032,46 @@ private function peg_parseBlock_Balanced() {
           $s3 = $s4;
         }
         if ($s3 === $this->peg_FAILED) {
-          $s3 = $this->peg_currPos;
-          $s4 = $this->peg_currPos;
-          $s5 = $this->peg_currPos;
-          $this->peg_silentFails++;
-          $s6 = $this->peg_parseBlock_End();
-          $this->peg_silentFails--;
-          if ($s6 === $this->peg_FAILED) {
-            $s5 = null;
-          } else {
-            $this->peg_currPos = $s5;
-            $s5 = $this->peg_FAILED;
-          }
-          if ($s5 !== $this->peg_FAILED) {
-            if ($this->input_length > $this->peg_currPos) {
-              $s6 = $this->input_substr($this->peg_currPos, 1);
-              $this->peg_currPos++;
+          $s3 = $this->peg_parseBlock();
+          if ($s3 === $this->peg_FAILED) {
+            $s3 = $this->peg_currPos;
+            $s4 = $this->peg_currPos;
+            $s5 = $this->peg_currPos;
+            $this->peg_silentFails++;
+            $s6 = $this->peg_parseBlock_End();
+            $this->peg_silentFails--;
+            if ($s6 === $this->peg_FAILED) {
+              $s5 = null;
             } else {
-              $s6 = $this->peg_FAILED;
-              if ($this->peg_silentFails === 0) {
-                  $this->peg_fail($this->peg_c2);
-              }
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
             }
-            if ($s6 !== $this->peg_FAILED) {
-              $s5 = array($s5, $s6);
-              $s4 = $s5;
+            if ($s5 !== $this->peg_FAILED) {
+              if ($this->input_length > $this->peg_currPos) {
+                $s6 = $this->input_substr($this->peg_currPos, 1);
+                $this->peg_currPos++;
+              } else {
+                $s6 = $this->peg_FAILED;
+                if ($this->peg_silentFails === 0) {
+                    $this->peg_fail($this->peg_c2);
+                }
+              }
+              if ($s6 !== $this->peg_FAILED) {
+                $s5 = array($s5, $s6);
+                $s4 = $s5;
+              } else {
+                $this->peg_currPos = $s4;
+                $s4 = $this->peg_FAILED;
+              }
             } else {
               $this->peg_currPos = $s4;
               $s4 = $this->peg_FAILED;
             }
-          } else {
-            $this->peg_currPos = $s4;
-            $s4 = $this->peg_FAILED;
-          }
-          if ($s4 !== $this->peg_FAILED) {
-            $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
-          } else {
-            $s3 = $s4;
-          }
-          if ($s3 === $this->peg_FAILED) {
-            $s3 = $this->peg_parseBlock();
+            if ($s4 !== $this->peg_FAILED) {
+              $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+            } else {
+              $s3 = $s4;
+            }
           }
         }
         while ($s3 !== $this->peg_FAILED) {
@@ -1171,46 +1171,46 @@ private function peg_parseBlock_Balanced() {
             $s3 = $s4;
           }
           if ($s3 === $this->peg_FAILED) {
-            $s3 = $this->peg_currPos;
-            $s4 = $this->peg_currPos;
-            $s5 = $this->peg_currPos;
-            $this->peg_silentFails++;
-            $s6 = $this->peg_parseBlock_End();
-            $this->peg_silentFails--;
-            if ($s6 === $this->peg_FAILED) {
-              $s5 = null;
-            } else {
-              $this->peg_currPos = $s5;
-              $s5 = $this->peg_FAILED;
-            }
-            if ($s5 !== $this->peg_FAILED) {
-              if ($this->input_length > $this->peg_currPos) {
-                $s6 = $this->input_substr($this->peg_currPos, 1);
-                $this->peg_currPos++;
+            $s3 = $this->peg_parseBlock();
+            if ($s3 === $this->peg_FAILED) {
+              $s3 = $this->peg_currPos;
+              $s4 = $this->peg_currPos;
+              $s5 = $this->peg_currPos;
+              $this->peg_silentFails++;
+              $s6 = $this->peg_parseBlock_End();
+              $this->peg_silentFails--;
+              if ($s6 === $this->peg_FAILED) {
+                $s5 = null;
               } else {
-                $s6 = $this->peg_FAILED;
-                if ($this->peg_silentFails === 0) {
-                    $this->peg_fail($this->peg_c2);
-                }
+                $this->peg_currPos = $s5;
+                $s5 = $this->peg_FAILED;
               }
-              if ($s6 !== $this->peg_FAILED) {
-                $s5 = array($s5, $s6);
-                $s4 = $s5;
+              if ($s5 !== $this->peg_FAILED) {
+                if ($this->input_length > $this->peg_currPos) {
+                  $s6 = $this->input_substr($this->peg_currPos, 1);
+                  $this->peg_currPos++;
+                } else {
+                  $s6 = $this->peg_FAILED;
+                  if ($this->peg_silentFails === 0) {
+                      $this->peg_fail($this->peg_c2);
+                  }
+                }
+                if ($s6 !== $this->peg_FAILED) {
+                  $s5 = array($s5, $s6);
+                  $s4 = $s5;
+                } else {
+                  $this->peg_currPos = $s4;
+                  $s4 = $this->peg_FAILED;
+                }
               } else {
                 $this->peg_currPos = $s4;
                 $s4 = $this->peg_FAILED;
               }
-            } else {
-              $this->peg_currPos = $s4;
-              $s4 = $this->peg_FAILED;
-            }
-            if ($s4 !== $this->peg_FAILED) {
-              $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
-            } else {
-              $s3 = $s4;
-            }
-            if ($s3 === $this->peg_FAILED) {
-              $s3 = $this->peg_parseBlock();
+              if ($s4 !== $this->peg_FAILED) {
+                $s3 = $this->input_substr($s3, $this->peg_currPos - $s3);
+              } else {
+                $s3 = $s4;
+              }
             }
           }
         }