Fix matching terminology

iluuu1994 · iluuu1994 · commit 115227313433 · 2020-04-18T13:16:29.000+02:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5180,7 +5180,7 @@ static zend_uchar determine_match_jumptable_type(zend_ast_list *arms) {
 	for (uint32_t i = 0; i < arms->children; i++) {
 		zend_ast *arm_ast = arms->child[i];
 		if (!arm_ast->child[0]) {
-			/* Skip default clause */
+			/* Skip default arm */
 			continue;
 		}
 
@@ -5190,7 +5190,7 @@ static zend_uchar determine_match_jumptable_type(zend_ast_list *arms) {
 
 			zend_eval_const_expr(cond_ast);
 			if ((*cond_ast)->kind != ZEND_AST_ZVAL) {
-				/* Non-constant case */
+				/* Non-constant condition */
 				return IS_UNDEF;
 			}
 
@@ -5203,7 +5203,7 @@ static zend_uchar determine_match_jumptable_type(zend_ast_list *arms) {
 			if (common_type == IS_UNDEF) {
 				common_type = Z_TYPE_P(cond_zv);
 			} else if (common_type != Z_TYPE_P(cond_zv)) {
-				/* Non-uniform case types */
+				/* Non-uniform condition types */
 				return IS_UNDEF;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -5180,7 +5180,7 @@ static zend_uchar determine_match_jumptable_type(zend_ast_list *arms) {`
`5180`	`5180`	`for (uint32_t i = 0; i < arms->children; i++) {`
`5181`	`5181`	`zend_ast *arm_ast = arms->child[i];`
`5182`	`5182`	`if (!arm_ast->child[0]) {`
`5183`		`- /* Skip default clause */`
	`5183`	`+ /* Skip default arm */`
`5184`	`5184`	`continue;`
`5185`	`5185`	`}`
`5186`	`5186`
`@@ -5190,7 +5190,7 @@ static zend_uchar determine_match_jumptable_type(zend_ast_list *arms) {`
`5190`	`5190`
`5191`	`5191`	`zend_eval_const_expr(cond_ast);`
`5192`	`5192`	`if ((*cond_ast)->kind != ZEND_AST_ZVAL) {`
`5193`		`- /* Non-constant case */`
	`5193`	`+ /* Non-constant condition */`
`5194`	`5194`	`return IS_UNDEF;`
`5195`	`5195`	`}`
`5196`	`5196`
`@@ -5203,7 +5203,7 @@ static zend_uchar determine_match_jumptable_type(zend_ast_list *arms) {`
`5203`	`5203`	`if (common_type == IS_UNDEF) {`
`5204`	`5204`	`common_type = Z_TYPE_P(cond_zv);`
`5205`	`5205`	`} else if (common_type != Z_TYPE_P(cond_zv)) {`
`5206`		`- /* Non-uniform case types */`
	`5206`	`+ /* Non-uniform condition types */`
`5207`	`5207`	`return IS_UNDEF;`
`5208`	`5208`	`}`
`5209`	`5209`	`}`