Switch to alternative object syntax

Topic of discussion for the community.

Author: iluuu1994

Zend/tests/pattern_matching/is/binding.phpt

@@ -36,10 +36,10 @@ var_dump($a);
 var_dump('Hello world' is $a);
 var_dump($a);
 
-var_dump(new Box(42) is Box & { value: $a });
+var_dump(new Box(42) is Box(value: $a));
 var_dump($a);
 
-var_dump(new NotBox(43) is Box & { value: $a });
+var_dump(new NotBox(43) is Box(value: $a));
 var_dump($a);
 
 var_dump(43 is $a & int);
@@ -48,10 +48,10 @@ var_dump($a);
 var_dump([] is $a & string);
 var_dump($a);
 
-var_dump(new Many() is { $a, $b, $c, $d });
+var_dump(new Many() is Many(:$a, :$b, :$c, :$d));
 var_dump($a, $b, $c, $d, isset($e));
 
-var_dump(new Many() is { $a, $b, $c, $d, $e, $f, $g, $h, $i, $j });
+var_dump(new Many() is Many(:$a, :$b, :$c, :$d, :$e, :$f, :$g, :$h, :$i, :$j));
 var_dump($a, $b, $c, $d, $e, $f, $g, $h, $i, $j);
 
 ?>

Zend/tests/pattern_matching/is/delayed_binding.phpt

@@ -7,19 +7,19 @@ class Pair {
     public function __construct(public $a, public $b) {}
 }
 
-var_dump(new Pair(1, 2) is { a: $a, b: $b });
+var_dump(new Pair(1, 2) is Pair(a: $a, b: $b));
 var_dump($a, $b);
 unset($a, $b);
 
-var_dump(new Pair(1, 2) is { a: $a, b: 3 });
+var_dump(new Pair(1, 2) is Pair(a: $a, b: 3));
 var_dump($a, $b);
 unset($a, $b);
 
-var_dump(new Pair(new \stdClass(), 2) is { a: $a, b: 2 });
+var_dump(new Pair(new \stdClass(), 2) is Pair(a: $a, b: 2));
 var_dump($a, $b);
 unset($a, $b);
 
-var_dump(new Pair(new \stdClass(), 2) is { a: $a, b: 3 });
+var_dump(new Pair(new \stdClass(), 2) is Pair(a: $a, b: 3));
 var_dump($a, $b);
 unset($a, $b);
 

Zend/tests/pattern_matching/is/object.phpt

@@ -50,14 +50,14 @@ var_dump(null is Baz);
 var_dump(null is Qux);
 var_dump(null is Quux);
 
-var_dump($foo is { a: 42 });
-var_dump($foo is { a: 42|43 });
-var_dump($foo is { a: 'hello world' });
-var_dump($foo is { b: 42 });
-var_dump($bar is { a: 42 });
-var_dump($bar is { a: 42|43 });
-var_dump($bar is { a: 'hello world' });
-var_dump($bar is { b: 42 });
+var_dump($foo is Foo(a: 42));
+var_dump($foo is Foo(a: 42|43));
+var_dump($foo is Foo(a: 'hello world'));
+var_dump($foo is Foo(b: 42));
+var_dump($bar is Foo(a: 42));
+var_dump($bar is Foo(a: 42|43));
+var_dump($bar is Foo(a: 'hello world'));
+var_dump($bar is Foo(b: 42));
 
 var_dump(Foo::isSelfFoo($foo));
 var_dump(Foo::isSelfFoo($bar));

Zend/tests/pattern_matching/is/object_shorthand.phpt

@@ -7,9 +7,9 @@ class Foo {
     public function __construct(public $a, public $b) {}
 }
 
-var_dump(new Foo(1, 2) is { $a, b: 2 });
+var_dump(new Foo(1, 2) is Foo(:$a, b: 2));
 var_dump($a);
-var_dump(new Foo(1, 2) is { a: 3, $b });
+var_dump(new Foo(1, 2) is Foo(a: 3, :$b));
 var_dump($b);
 
 ?>

Zend/zend_ast.h

@@ -118,7 +118,6 @@ enum _zend_ast_kind {
 	ZEND_AST_TYPE_PATTERN,
 	ZEND_AST_ARRAY_PATTERN,
 	ZEND_AST_BINDING_PATTERN,
-	ZEND_AST_OBJECT_PATTERN,
 	ZEND_AST_EXPR_LIKE_PATTERN,
 
 	/* 2 child nodes */
@@ -164,6 +163,7 @@ enum _zend_ast_kind {
 	ZEND_AST_PARENT_PROPERTY_HOOK_CALL,
 	ZEND_AST_PIPE,
 	ZEND_AST_IS,
+	ZEND_AST_OBJECT_PATTERN,
 	ZEND_AST_OBJECT_PATTERN_ELEMENT,
 	ZEND_AST_ARRAY_PATTERN_ELEMENT,
 	ZEND_AST_CLASS_CONST_PATTERN,

Zend/zend_compile.c

@@ -6914,13 +6914,13 @@ static void zend_pm_compile_container(
 	zend_ast_list *element_list = zend_ast_get_list(ast->child[0]);
 
 	/* Make sure the value is actually of the right type. */
-	zend_pm_copy_tmp(&expr_copy_node, expr_node, false);
-	zend_op *is_array_op = zend_emit_op(NULL, ZEND_TYPE_CHECK, &expr_copy_node, NULL);
-	SET_NODE(is_array_op->result, result);
-	is_array_op->extended_value = is_array ? MAY_BE_ARRAY : MAY_BE_OBJECT;
-	zend_pm_emit_jmpz_ex(result, false_label);
-
 	if (is_array) {
+		zend_pm_copy_tmp(&expr_copy_node, expr_node, false);
+		zend_op *is_array_op = zend_emit_op(NULL, ZEND_TYPE_CHECK, &expr_copy_node, NULL);
+		SET_NODE(is_array_op->result, result);
+		is_array_op->extended_value = is_array ? MAY_BE_ARRAY : MAY_BE_OBJECT;
+		zend_pm_emit_jmpz_ex(result, false_label);
+
 		/* Make sure the array has the right size. */
 		zend_pm_copy_tmp(&expr_copy_node, expr_node, false);
 		znode count_node;
@@ -6934,6 +6934,19 @@ static void zend_pm_compile_container(
 			(ast->attr & ZEND_ARRAY_PATTERN_NON_EXHAUSTIVE) ? ZEND_IS_SMALLER_OR_EQUAL : ZEND_IS_EQUAL,
 			&count_target_node, &count_node);
 		SET_NODE(count_ok_op->result, result);
+		zend_pm_emit_jmpz_ex(result, false_label);
+	} else {
+		zend_pm_copy_tmp(&expr_copy_node, expr_node, false);
+
+		znode class_node;
+		zend_compile_class_ref(&class_node, ast->child[1], ZEND_FETCH_CLASS_NO_AUTOLOAD | ZEND_FETCH_CLASS_EXCEPTION | ZEND_FETCH_CLASS_SILENT);
+
+		zend_op *opline = zend_emit_op_tmp(NULL, ZEND_INSTANCEOF, &expr_copy_node, NULL);
+		SET_NODE(opline->result, result);
+		opline->op2_type = IS_CONST;
+		opline->op2.constant = zend_add_class_name_literal(Z_STR(class_node.u.constant));
+		opline->extended_value = zend_alloc_cache_slot();
+
 		zend_pm_emit_jmpz_ex(result, false_label);
 	}
 

Zend/zend_language_parser.y

@@ -1446,7 +1446,7 @@ scalar_pattern:
 ;
 
 object_pattern:
-		'{' object_pattern_element_list '}' { $$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN, $2); }
+		class_name '(' object_pattern_element_list ')' { $$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN, $3, $1); }
 ;
 
 object_pattern_element_list:
@@ -1462,9 +1462,9 @@ non_empty_object_pattern_element_list:
 
 object_pattern_element:
 		T_STRING ':' pattern { $$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN_ELEMENT, $1, $3); }
-	|	binding_pattern {
-			zend_string *name = zend_string_copy(zend_ast_get_str($1->child[0]));
-			$$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN_ELEMENT, zend_ast_create_zval_from_str(name), $1);
+	|	':' binding_pattern {
+			zend_string *name = zend_string_copy(zend_ast_get_str($2->child[0]));
+			$$ = zend_ast_create(ZEND_AST_OBJECT_PATTERN_ELEMENT, zend_ast_create_zval_from_str(name), $2);
 		}
 ;