Limit facade PR to polyfill extraction

Author: adamziel

packages/mysql-on-sqlite/src/mysql/class-wp-mysql-lexer.php

@@ -2,9 +2,5 @@
 
 require_once __DIR__ . '/class-wp-mysql-polyfill-lexer.php';
 
-if ( ! class_exists( 'WP_MySQL_Native_Lexer', false ) ) {
-	require_once __DIR__ . '/class-wp-mysql-native-lexer.php';
-}
-
-class WP_MySQL_Lexer extends WP_MySQL_Native_Lexer {
+class WP_MySQL_Lexer extends WP_MySQL_Polyfill_Lexer {
 }

packages/mysql-on-sqlite/src/mysql/class-wp-mysql-native-lexer.php

@@ -2,13 +2,5 @@
 
 require_once __DIR__ . '/class-wp-mysql-polyfill-parser.php';
 
-if ( class_exists( 'WP_MySQL_Native_Parser', false ) ) {
-	if ( ! function_exists( 'wp_sqlite_mysql_native_export_grammar' ) ) {
-		require_once __DIR__ . '/mysql-rust-bridge.php';
-	}
-} else {
-	require_once __DIR__ . '/class-wp-mysql-native-parser.php';
-}
-
-class WP_MySQL_Parser extends WP_MySQL_Native_Parser {
+class WP_MySQL_Parser extends WP_MySQL_Polyfill_Parser {
 }

packages/mysql-on-sqlite/src/mysql/class-wp-mysql-native-parser.php

@@ -15,17 +15,14 @@ class WP_Parser_Node {
 	 */
 	public $rule_id;
 	public $rule_name;
-	private $children          = array();
-	private $native_ast        = null;
-	private $native_node_index = null;
+	private $children = array();
 
 	public function __construct( $rule_id, $rule_name ) {
 		$this->rule_id   = $rule_id;
 		$this->rule_name = $rule_name;
 	}
 
 	public function append_child( $node ) {
-		$this->materialize_native_children();
 		$this->children[] = $node;
 	}
 
@@ -102,8 +99,6 @@ public function append_child( $node ) {
 	 * ]
 	 */
 	public function merge_fragment( $node ) {
-		$this->materialize_native_children();
-		$node->materialize_native_children();
 		$this->children = array_merge( $this->children, $node->children );
 	}
 
@@ -113,9 +108,6 @@ public function merge_fragment( $node ) {
 	 * @return bool True if this node has any child nodes or tokens, false otherwise.
 	 */
 	public function has_child(): bool {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_has_child( $this->native_ast, $this->native_node_index );
-		}
 		return count( $this->children ) > 0;
 	}
 
@@ -126,9 +118,6 @@ public function has_child(): bool {
 	 * @return bool                   True if any child nodes are found, false otherwise.
 	 */
 	public function has_child_node( ?string $rule_name = null ): bool {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_has_child_node( $this->native_ast, $this->native_node_index, $rule_name );
-		}
 		foreach ( $this->children as $child ) {
 			if (
 				$child instanceof WP_Parser_Node
@@ -147,9 +136,6 @@ public function has_child_node( ?string $rule_name = null ): bool {
 	 * @return bool               True if any child tokens are found, false otherwise.
 	 */
 	public function has_child_token( ?int $token_id = null ): bool {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_has_child_token( $this->native_ast, $this->native_node_index, $token_id );
-		}
 		foreach ( $this->children as $child ) {
 			if (
 				$child instanceof WP_Parser_Token
@@ -168,9 +154,6 @@ public function has_child_token( ?int $token_id = null ): bool {
 	 *                                             null when no children are found.
 	 */
 	public function get_first_child() {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_first_child( $this->native_ast, $this->native_node_index );
-		}
 		return $this->children[0] ?? null;
 	}
 
@@ -181,9 +164,6 @@ public function get_first_child() {
 	 * @return WP_Parser_Node|null    The first matching child node; null when no children are found.
 	 */
 	public function get_first_child_node( ?string $rule_name = null ): ?WP_Parser_Node {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_first_child_node( $this->native_ast, $this->native_node_index, $rule_name );
-		}
 		foreach ( $this->children as $child ) {
 			if (
 				$child instanceof WP_Parser_Node
@@ -202,9 +182,6 @@ public function get_first_child_node( ?string $rule_name = null ): ?WP_Parser_No
 	 * @return WP_Parser_Token|null The first matching child token; null when no children are found.
 	 */
 	public function get_first_child_token( ?int $token_id = null ): ?WP_Parser_Token {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_first_child_token( $this->native_ast, $this->native_node_index, $token_id );
-		}
 		foreach ( $this->children as $child ) {
 			if (
 				$child instanceof WP_Parser_Token
@@ -226,9 +203,6 @@ public function get_first_child_token( ?int $token_id = null ): ?WP_Parser_Token
 	 * @return WP_Parser_Node|null    The first matching descendant node; null when no descendants are found.
 	 */
 	public function get_first_descendant_node( ?string $rule_name = null ): ?WP_Parser_Node {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_first_descendant_node( $this->native_ast, $this->native_node_index, $rule_name );
-		}
 		for ( $i = 0; $i < count( $this->children ); $i++ ) {
 			$child = $this->children[ $i ];
 			if ( ! $child instanceof WP_Parser_Node ) {
@@ -255,9 +229,6 @@ public function get_first_descendant_node( ?string $rule_name = null ): ?WP_Pars
 	 * @return WP_Parser_Token|null The first matching descendant token; null when no descendants are found.
 	 */
 	public function get_first_descendant_token( ?int $token_id = null ): ?WP_Parser_Token {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_first_descendant_token( $this->native_ast, $this->native_node_index, $token_id );
-		}
 		for ( $i = 0; $i < count( $this->children ); $i++ ) {
 			$child = $this->children[ $i ];
 			if ( $child instanceof WP_Parser_Token ) {
@@ -280,9 +251,6 @@ public function get_first_descendant_token( ?int $token_id = null ): ?WP_Parser_
 	 * @return array<WP_Parser_Node|WP_Parser_Token> An array of all child nodes and tokens of this node.
 	 */
 	public function get_children(): array {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_children( $this->native_ast, $this->native_node_index );
-		}
 		return $this->children;
 	}
 
@@ -293,9 +261,6 @@ public function get_children(): array {
 	 * @return WP_Parser_Node[]       An array of all matching child nodes.
 	 */
 	public function get_child_nodes( ?string $rule_name = null ): array {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_child_nodes( $this->native_ast, $this->native_node_index, $rule_name );
-		}
 		$nodes = array();
 		foreach ( $this->children as $child ) {
 			if (
@@ -315,9 +280,6 @@ public function get_child_nodes( ?string $rule_name = null ): array {
 	 * @return WP_Parser_Token[]  An array of all matching child tokens.
 	 */
 	public function get_child_tokens( ?int $token_id = null ): array {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_child_tokens( $this->native_ast, $this->native_node_index, $token_id );
-		}
 		$tokens = array();
 		foreach ( $this->children as $child ) {
 			if (
@@ -339,9 +301,6 @@ public function get_child_tokens( ?int $token_id = null ): array {
 	 * @return array<WP_Parser_Node|WP_Parser_Token> An array of all descendant nodes and tokens of this node.
 	 */
 	public function get_descendants(): array {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_descendants( $this->native_ast, $this->native_node_index );
-		}
 		$descendants = array();
 		foreach ( $this->children as $child ) {
 			if ( $child instanceof WP_Parser_Node ) {
@@ -365,9 +324,6 @@ public function get_descendants(): array {
 	 * @return WP_Parser_Node[]       An array of all matching descendant nodes.
 	 */
 	public function get_descendant_nodes( ?string $rule_name = null ): array {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_descendant_nodes( $this->native_ast, $this->native_node_index, $rule_name );
-		}
 		$nodes = array();
 		foreach ( $this->children as $child ) {
 			if ( ! $child instanceof WP_Parser_Node ) {
@@ -392,9 +348,6 @@ public function get_descendant_nodes( ?string $rule_name = null ): array {
 	 * @return WP_Parser_Token[]  An array of all matching descendant tokens.
 	 */
 	public function get_descendant_tokens( ?int $token_id = null ): array {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_descendant_tokens( $this->native_ast, $this->native_node_index, $token_id );
-		}
 		$tokens = array();
 		foreach ( $this->children as $child ) {
 			if ( $child instanceof WP_Parser_Token ) {
@@ -414,9 +367,6 @@ public function get_descendant_tokens( ?int $token_id = null ): array {
 	 * @return int The byte offset in the input string where this node begins.
 	 */
 	public function get_start(): int {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_start( $this->native_ast, $this->native_node_index );
-		}
 		return $this->get_first_descendant_token()->start;
 	}
 
@@ -426,26 +376,9 @@ public function get_start(): int {
 	 * @return int The byte length of this node in the input string.
 	 */
 	public function get_length(): int {
-		if ( $this->has_native_ast() ) {
-			return wp_sqlite_mysql_native_ast_get_length( $this->native_ast, $this->native_node_index );
-		}
 		$tokens      = $this->get_descendant_tokens();
 		$first_token = $tokens[0];
 		$last_token  = $tokens[ count( $tokens ) - 1 ];
 		return $last_token->start + $last_token->length - $first_token->start;
 	}
-
-	private function has_native_ast(): bool {
-		return null !== $this->native_ast;
-	}
-
-	private function materialize_native_children(): void {
-		if ( ! $this->has_native_ast() ) {
-			return;
-		}
-
-		$this->children          = wp_sqlite_mysql_native_ast_get_children( $this->native_ast, $this->native_node_index );
-		$this->native_ast        = null;
-		$this->native_node_index = null;
-	}
 }