Use AST_BINARY_OP instead of AST_GREATER(_EQUAL)

Version 20

Author: nikic

README.md

@@ -225,6 +225,8 @@ ast\flags\BINARY_IS_EQUAL
 ast\flags\BINARY_IS_NOT_EQUAL
 ast\flags\BINARY_IS_SMALLER
 ast\flags\BINARY_IS_SMALLER_OR_EQUAL
+ast\flags\BINARY_IS_GREATER          // since version 20
+ast\flags\BINARY_IS_GREATER_OR_EQUAL // since version 20
 ast\flags\BINARY_SPACESHIP
 
 // Used by ast\AST_ASSIGN_OP (exclusive)

ast.c

@@ -32,6 +32,10 @@
 
 #define AST_DEFAULT_VERSION 10
 
+/* Flag for BINARY_OP to use instead of AST_GREATER(_EQUAL) */
+#define AST_BINARY_IS_GREATER 256
+#define AST_BINARY_IS_GREATER_OR_EQUAL 257
+
 static inline void ast_update_property(zval *object, zend_string *name, zval *value, void **cache_slot) {
 	zval name_zv;
 	ZVAL_STR(&name_zv, name);
@@ -161,7 +165,7 @@ static void ast_create_virtual_node(zval *zv, zend_ast_kind kind, zend_ast *ast)
 	zend_hash_next_index_insert(Z_ARRVAL(tmp_zv), &tmp_zv2);
 }
 
-static void ast_to_zval(zval *zv, zend_ast *ast) {
+static void ast_to_zval(zval *zv, zend_ast *ast, zend_long version) {
 	zval tmp_zv;
 	zend_bool is_decl;
 
@@ -175,6 +179,14 @@ static void ast_to_zval(zval *zv, zend_ast *ast) {
 		return;
 	}
 
+	if (version >= 20) {
+		if (ast->kind == ZEND_AST_GREATER || ast->kind == ZEND_AST_GREATER_EQUAL) {
+			ast->attr = ast->kind == ZEND_AST_GREATER
+				? AST_BINARY_IS_GREATER : AST_BINARY_IS_GREATER_OR_EQUAL;
+			ast->kind = ZEND_AST_BINARY_OP;
+		}
+	}
+
 	is_decl = ast_kind_is_decl(ast->kind);
 	object_init_ex(zv, is_decl ? ast_decl_ce : ast_node_ce);
 
@@ -239,7 +251,7 @@ static void ast_to_zval(zval *zv, zend_ast *ast) {
 			} else if (ast->kind == ZEND_AST_CLOSURE_USES) {
 				ast_create_virtual_node(&child_zv, AST_CLOSURE_VAR, child);
 			} else {
-				ast_to_zval(&child_zv, child);
+				ast_to_zval(&child_zv, child, version);
 			}
 
 			zend_hash_next_index_insert(Z_ARRVAL(tmp_zv), &child_zv);
@@ -248,7 +260,7 @@ static void ast_to_zval(zval *zv, zend_ast *ast) {
 }
 
 static int ast_check_version(zend_long version) {
-	if (version == 10) {
+	if (version == 10 || version == 20) {
 		return SUCCESS;
 	}
 
@@ -293,7 +305,7 @@ PHP_FUNCTION(parse_file) {
 		return;
 	}
 
-	ast_to_zval(return_value, ast);
+	ast_to_zval(return_value, ast, version);
 
 	zend_string_free(code);
 	zend_ast_destroy(ast);
@@ -319,7 +331,7 @@ PHP_FUNCTION(parse_code) {
 		return;
 	}
 
-	ast_to_zval(return_value, ast);
+	ast_to_zval(return_value, ast, version);
 
 	zend_ast_destroy(ast);
 	zend_arena_destroy(arena);
@@ -455,6 +467,8 @@ PHP_MINIT_FUNCTION(ast) {
 	ast_register_flag_constant("BINARY_IS_NOT_EQUAL", ZEND_IS_NOT_EQUAL);
 	ast_register_flag_constant("BINARY_IS_SMALLER", ZEND_IS_SMALLER);
 	ast_register_flag_constant("BINARY_IS_SMALLER_OR_EQUAL", ZEND_IS_SMALLER_OR_EQUAL);
+	ast_register_flag_constant("BINARY_IS_GREATER", AST_BINARY_IS_GREATER);
+	ast_register_flag_constant("BINARY_IS_GREATER_OR_EQUAL", AST_BINARY_IS_GREATER_OR_EQUAL);
 	ast_register_flag_constant("BINARY_SPACESHIP", ZEND_SPACESHIP);
 
 	ast_register_flag_constant("ASSIGN_BITWISE_OR", ZEND_ASSIGN_BW_OR);

tests/binop_greater.phpt

@@ -0,0 +1,42 @@
+--TEST--
+AST_GREATER(_EQUAL) converted to AST_BINARY_OP
+--FILE--
+<?php
+
+require __DIR__ . '/../util.php';
+
+$code = <<<'PHP'
+<?php
+$a > $b;
+$a >= $b;
+PHP;
+
+echo ast_dump(ast\parse_code($code, $version=10)), "\n";
+echo ast_dump(ast\parse_code($code, $version=20)), "\n";
+
+?>
+--EXPECT--
+AST_STMT_LIST
+    0: AST_GREATER
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"
+    1: AST_GREATER_EQUAL
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"
+AST_STMT_LIST
+    0: AST_BINARY_OP
+        flags: BINARY_IS_GREATER (256)
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"
+    1: AST_BINARY_OP
+        flags: BINARY_IS_GREATER_OR_EQUAL (257)
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"

util.php

@@ -77,6 +77,8 @@ function get_flag_info() : array {
             flags\BINARY_IS_NOT_EQUAL => 'BINARY_IS_NOT_EQUAL',
             flags\BINARY_IS_SMALLER => 'BINARY_IS_SMALLER',
             flags\BINARY_IS_SMALLER_OR_EQUAL => 'BINARY_IS_SMALLER_OR_EQUAL',
+            flags\BINARY_IS_GREATER => 'BINARY_IS_GREATER',
+            flags\BINARY_IS_GREATER_OR_EQUAL => 'BINARY_IS_GREATER_OR_EQUAL',
             flags\BINARY_SPACESHIP => 'BINARY_SPACESHIP',
         ],
         ast\AST_ASSIGN_OP => [