Move the code generation from the lexer to a compile function, courtesy Ilija.

Author: Crell

Zend/zend_ast.c

@@ -2211,17 +2211,10 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 			zend_ast_export_var(str, ast->child[1], 0, indent);
 			break;
 		case ZEND_AST_CALL:
-			if (ast->attr & ZEND_CALL_SYNTAX_PIPE) {
-				zend_ast_export_ex(str, ast->child[1], 0, indent);
-				smart_str_appends(str, " |> ");
-				zend_ast_export_ns_name(str, ast->child[0], 0, indent);
-			}
-			else {
-				zend_ast_export_ns_name(str, ast->child[0], 0, indent);
-				smart_str_appendc(str, '(');
-				zend_ast_export_ex(str, ast->child[1], 0, indent);
-				smart_str_appendc(str, ')');
-			}
+			zend_ast_export_ns_name(str, ast->child[0], 0, indent);
+			smart_str_appendc(str, '(');
+			zend_ast_export_ex(str, ast->child[1], 0, indent);
+			smart_str_appendc(str, ')');
 			break;
 		case ZEND_AST_PARENT_PROPERTY_HOOK_CALL:
 			smart_str_append(str, Z_STR_P(zend_ast_get_zval(ast->child[0])));

Zend/zend_ast.h

@@ -153,6 +153,7 @@ enum _zend_ast_kind {
 	ZEND_AST_MATCH_ARM,
 	ZEND_AST_NAMED_ARG,
 	ZEND_AST_PARENT_PROPERTY_HOOK_CALL,
+	ZEND_AST_PIPE,
 
 	/* 3 child nodes */
 	ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT,

Zend/zend_compile.c

@@ -6598,6 +6598,30 @@ static void zend_compile_match(znode *result, zend_ast *ast)
 	efree(jmp_end_opnums);
 }
 
+static void zend_compile_pipe(znode *result, zend_ast *ast)
+{
+	zend_ast *operand_ast = ast->child[0];
+	zend_ast *callable_ast = ast->child[1];
+
+	znode operand_result;
+	zend_compile_expr(&operand_result, operand_ast);
+
+	/* Turn $foo |> bar(...) into bar($foo). */
+	if (callable_ast->kind == ZEND_AST_CALL
+	 && callable_ast->child[1]->kind == ZEND_AST_CALLABLE_CONVERT) {
+		callable_ast = callable_ast->child[0];
+	 }
+
+	znode callable_result;
+	zend_compile_expr(&callable_result, callable_ast);
+
+	zend_ast *fcall_ast = zend_ast_create(ZEND_AST_CALL,
+		zend_ast_create_znode(&callable_result),
+		zend_ast_create_list(1, ZEND_AST_ARG_LIST, zend_ast_create_znode(&operand_result)));
+
+	zend_compile_expr(result, fcall_ast);
+}
+
 static void zend_compile_try(zend_ast *ast) /* {{{ */
 {
 	zend_ast *try_ast = ast->child[0];
@@ -11603,6 +11627,9 @@ static void zend_compile_expr_inner(znode *result, zend_ast *ast) /* {{{ */
 		case ZEND_AST_MATCH:
 			zend_compile_match(result, ast);
 			return;
+		case ZEND_AST_PIPE:
+			zend_compile_pipe(result, ast);
+		return;
 		default:
 			ZEND_ASSERT(0 /* not supported */);
 	}

Zend/zend_compile.h

@@ -1030,7 +1030,6 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 /* These should not clash with ZEND_ACC_PPP_MASK and ZEND_ACC_PPP_SET_MASK */
 #define ZEND_PARAM_REF      (1<<3)
 #define ZEND_PARAM_VARIADIC (1<<4)
-#define ZEND_CALL_SYNTAX_PIPE (1u << 2u)
 
 #define ZEND_NAME_FQ       0
 #define ZEND_NAME_NOT_FQ   1

Zend/zend_language_parser.y

@@ -1281,7 +1281,7 @@ expr:
 	|	expr T_IS_NOT_EQUAL expr
 			{ $$ = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1, $3); }
 	|	expr T_PIPE expr
-			{ $$ = zend_ast_create(ZEND_AST_CALL, $3, zend_ast_create_list(1, ZEND_AST_ARG_LIST, $1) ); $$->attr = ZEND_CALL_SYNTAX_PIPE; }
+			{ $$ = zend_ast_create(ZEND_AST_PIPE, $1, $3); }
 	|	expr '<' expr
 			{ $$ = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1, $3); }
 	|	expr T_IS_SMALLER_OR_EQUAL expr