Implement and pattern

Author: iluuu1994

Zend/tests/pattern_matching/is/and.phpt

@@ -0,0 +1,20 @@
+--TEST--
+And pattern
+--FILE--
+<?php
+
+var_dump(1 is (int&1));
+var_dump(2 is (int&(1|2)));
+var_dump(3 is (float&1));
+var_dump(4 is (int&float));
+var_dump([] is ([]&[...]));
+var_dump('foo' is (string&'bar'));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(false)
+bool(false)
+bool(true)
+bool(false)

Zend/tests/pattern_matching/is/array_mixed_keys.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Array pattern with mixed implicit and explicit keys
+--FILE--
+<?php
+
+var_dump([] is ['foo', 1 => 'bar']);
+
+?>
+--EXPECTF--
+Fatal error: Must not mix implicit and explicit array keys in array pattern in %s on line %d

Zend/zend_ast.h

@@ -156,6 +156,7 @@ enum _zend_ast_kind {
 	ZEND_AST_NAMED_ARG,
 	ZEND_AST_IS,
 	ZEND_AST_OR_PATTERN,
+	ZEND_AST_AND_PATTERN,
 	ZEND_AST_OBJECT_PATTERN,
 	ZEND_AST_OBJECT_PATTERN_ELEMENT,
 	ZEND_AST_RANGE_PATTERN,

Zend/zend_compile.c

@@ -6155,11 +6155,13 @@ static void zend_compile_array_pattern(zend_ast **ast_ptr)
 {
 	zend_ast *array_pattern = *ast_ptr;
 	zend_ast_list *element_list = zend_ast_get_list(array_pattern->child[0]);
+	bool has_implicit = false, has_explicit = false;
 
 	for (uint32_t i = 0; i < element_list->children; i++) {
 		zend_ast *element = element_list->child[i];
 		zend_ast *key_ast = element->child[0];
 		if (key_ast) {
+			has_explicit = true;
 			zval *key = zend_ast_get_zval(key_ast);
 			if (Z_TYPE_P(key) == IS_STRING) {
 				zend_ulong index;
@@ -6168,8 +6170,13 @@ static void zend_compile_array_pattern(zend_ast **ast_ptr)
 					ZVAL_LONG(key, index);
 				}
 			}
+		} else {
+			has_implicit = true;
 		}
 	}
+	if (has_implicit && has_explicit) {
+		zend_throw_exception(zend_ce_compile_error, "Must not mix implicit and explicit array keys in array pattern", 0);
+	}
 }
 
 static void zend_compile_pattern(zend_ast **ast_ptr, void *context)
@@ -6204,7 +6211,7 @@ static void zend_compile_is(znode *result, zend_ast *ast)
 
 	znode expr_node;
 	zend_compile_expr(&expr_node, expr_ast);
-	
+
 	zend_compile_pattern(pattern_ast_ptr, NULL);
 	zval pattern_zv;
 	ZVAL_AST(&pattern_zv, zend_ast_copy(*pattern_ast_ptr));

Zend/zend_language_parser.y

@@ -284,7 +284,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list match_arm_cond
 %type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
 %type <ast> function_name non_empty_member_modifiers
-%type <ast> pattern atomic_pattern compound_pattern type_pattern scalar_pattern or_pattern
+%type <ast> pattern atomic_pattern compound_pattern type_pattern scalar_pattern or_pattern and_pattern
 %type <ast> object_pattern object_pattern_element_list non_empty_object_pattern_element_list
 %type <ast> object_pattern_element range_pattern binding_pattern
 %type <ast> array_pattern array_pattern_element_list array_pattern_element
@@ -1297,6 +1297,7 @@ atomic_pattern:
 
 compound_pattern:
 		or_pattern { $$ = $1; }
+	|	and_pattern { $$ = $1; }
 ;
 
 type_pattern:
@@ -1337,6 +1338,10 @@ or_pattern:
 		pattern '|' pattern { $$ = zend_ast_create(ZEND_AST_OR_PATTERN, $1, $3); }
 ;
 
+and_pattern:
+		pattern T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG pattern { $$ = zend_ast_create(ZEND_AST_AND_PATTERN, $1, $3); }
+;
+
 range_pattern:
 		scalar_pattern T_RANGE_EXCLUSIVE_END scalar_pattern { $$ = zend_ast_create(ZEND_AST_RANGE_PATTERN, $1, $3); }
 	|	scalar_pattern T_RANGE_INCLUSIVE_END scalar_pattern

Zend/zend_pattern_matching.c

@@ -189,11 +189,18 @@ static pm_result match_array(zval *zv, zend_ast *pattern)
 	HashTable *ht = Z_ARRVAL_P(zv);
 	zend_ast_list *element_list = zend_ast_get_list(pattern->child[0]);
 
-	if (!(pattern->attr & ZEND_ARRAY_PATTERN_NON_EXHAUSTIVE) && element_list->children != zend_hash_num_elements(ht)) {
-		return PM_MISMATCH;
+	if (pattern->attr & ZEND_ARRAY_PATTERN_NON_EXHAUSTIVE) {
+		if (element_list->children > zend_hash_num_elements(ht)) {
+			return PM_MISMATCH;
+		}
+	} else {
+		if (element_list->children != zend_hash_num_elements(ht)) {
+			return PM_MISMATCH;
+		}
 	}
 
-	// FIXME: Deal with indexes properly
+	/* Explicit and implicit keys may not be mixed, so there's no need to
+	 * replicate array key sequencing logic. */
 	zend_long index = 0;
 
 	for (uint32_t i = 0; i < element_list->children; i++) {
@@ -213,7 +220,7 @@ static pm_result match_array(zval *zv, zend_ast *pattern)
 			element_zv = zend_hash_index_find(ht, index);
 			index++;
 		}
-		if (Z_TYPE_P(element_zv) == IS_UNDEF || !zend_pattern_match_ex(element_zv, pattern_ast)) {
+		if (!element_zv || Z_TYPE_P(element_zv) == IS_UNDEF || !zend_pattern_match_ex(element_zv, pattern_ast)) {
 			return PM_MISMATCH;
 		}
 	}
@@ -235,12 +242,20 @@ pm_result zend_pattern_match_ex(zval *zv, zend_ast *pattern)
 			return match_object(zv, pattern);
 		case ZEND_AST_WILDCARD_PATTERN:
 			return PM_MATCH;
-		case ZEND_AST_OR_PATTERN:;
+		case ZEND_AST_OR_PATTERN: {
 			pm_result lhs = zend_pattern_match_ex(zv, pattern->child[0]);
 			if (lhs != PM_MISMATCH) {
 				return lhs;
 			}
 			return zend_pattern_match_ex(zv, pattern->child[1]);
+		}
+		case ZEND_AST_AND_PATTERN: {
+			pm_result lhs = zend_pattern_match_ex(zv, pattern->child[0]);
+			if (lhs != PM_MATCH) {
+				return lhs;
+			}
+			return zend_pattern_match_ex(zv, pattern->child[1]);
+		}
 		case ZEND_AST_RANGE_PATTERN:
 			return match_range(zv, pattern);
 		case ZEND_AST_BINDING_PATTERN: