Move AST_AND, AST_OR to AST_BINARY_OP as well

Author: nikic

README.md

@@ -204,9 +204,9 @@ ast\flags\TYPE_OBJECT
 // Used by ast\AST_UNARY_OP (exclusive)
 ast\flags\UNARY_BOOL_NOT
 ast\flags\UNARY_BITWISE_NOT
-ast\flags\UNARY_MINUS
-ast\flags\UNARY_PLUS
-ast\flags\UNARY_SILENCE
+ast\flags\UNARY_MINUS   // since version 20
+ast\flags\UNARY_PLUS    // since version 20
+ast\flags\UNARY_SILENCE // since version 20
 
 // Used by ast\AST_BINARY_OP and ast\AST_ASSIGN_OP in version >= 20 (exclusive)
 ast\flags\BINARY_BITWISE_OR
@@ -223,6 +223,8 @@ ast\flags\BINARY_SHIFT_LEFT
 ast\flags\BINARY_SHIFT_RIGHT
 
 // Used by ast\AST_BINARY_OP (exclusive)
+ast\flags\BINARY_BOOL_AND            // since version 20
+ast\flags\BINARY_BOOL_OR             // since version 20
 ast\flags\BINARY_BOOL_XOR
 ast\flags\BINARY_IS_IDENTICAL
 ast\flags\BINARY_IS_NOT_IDENTICAL
@@ -278,8 +280,9 @@ Version changelog
 
 ### 20 (unstable)
 
-* `AST_GREATER` and `AST_GREATER_EQUAL` nodes are now instead represented using
-  `AST_BINARY_OP` with flags `BINARY_IS_GREATER` and `BINARY_IS_GREATER_OR_EQUAL`.
+* `AST_GREATER`, `AST_GREATER_EQUAL`, `AST_OR`, `AST_AND` nodes are now represented using
+  `AST_BINARY_OP` with flags `BINARY_IS_GREATER`, `BINARY_IS_GREATER_OR_EQUAL`, `BINARY_BOOL_OR`
+  and `BINARY_BOOL_AND`.
 * `AST_SILENCE`, `AST_UNARY_MINUS` and `AST_UNARY_PLUS` nodes are noew represented using
   `AST_UNARY_OP` with flags `UNARY_SILENCE`, `UNARY_MINUS` and `UNARY_PLUS`
 * `AST_ASSIGN_OP` now uses `BINARY_*` flags instead of separate `ASSIGN_*` flags.

ast.c

@@ -30,14 +30,16 @@
 
 #define AST_DEFAULT_VERSION 10
 
-/* Flag for BINARY_OP to use instead of AST_GREATER(_EQUAL) */
+/* Additional flags for BINARY_OP */
 #define AST_BINARY_IS_GREATER 256
 #define AST_BINARY_IS_GREATER_OR_EQUAL 257
+#define AST_BINARY_BOOL_OR 258
+#define AST_BINARY_BOOL_AND 259
 
 /* Flags for UNARY_OP to use instead of AST_SILENCE, AST_UNARY_PLUS, AST_UNARY_MINUS */
-#define AST_SILENCE 258
-#define AST_PLUS 259
-#define AST_MINUS 260
+#define AST_SILENCE 260
+#define AST_PLUS 261
+#define AST_MINUS 262
 
 static inline void ast_update_property(zval *object, zend_string *name, zval *value, void **cache_slot) {
 	zval name_zv;
@@ -213,6 +215,14 @@ static void ast_to_zval(zval *zv, zend_ast *ast, zend_long version) {
 				ast->kind = ZEND_AST_BINARY_OP;
 				ast->attr = AST_BINARY_IS_GREATER_OR_EQUAL;
 				break;
+			case ZEND_AST_OR:
+				ast->kind = ZEND_AST_BINARY_OP;
+				ast->attr = AST_BINARY_BOOL_OR;
+				break;
+			case ZEND_AST_AND:
+				ast->kind = ZEND_AST_BINARY_OP;
+				ast->attr = AST_BINARY_BOOL_AND;
+				break;
 			case ZEND_AST_SILENCE:
 				ast->kind = ZEND_AST_UNARY_OP;
 				ast->attr = AST_SILENCE;
@@ -490,6 +500,8 @@ PHP_MINIT_FUNCTION(ast) {
 	ast_register_flag_constant("UNARY_PLUS", AST_PLUS);
 	ast_register_flag_constant("UNARY_MINUS", AST_MINUS);
 
+	ast_register_flag_constant("BINARY_BOOL_AND", AST_BINARY_BOOL_AND);
+	ast_register_flag_constant("BINARY_BOOL_OR", AST_BINARY_BOOL_OR);
 	ast_register_flag_constant("BINARY_BOOL_XOR", ZEND_BOOL_XOR);
 	ast_register_flag_constant("BINARY_BITWISE_OR", ZEND_BW_OR);
 	ast_register_flag_constant("BINARY_BITWISE_AND", ZEND_BW_AND);

tests/binop_greater.phpt renamed to tests/binary_ops.phpt

@@ -9,6 +9,8 @@ $code = <<<'PHP'
 <?php
 $a > $b;
 $a >= $b;
+$a and $b;
+$a or $b;
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=10)), "\n";
@@ -27,6 +29,16 @@ AST_STMT_LIST
             0: "a"
         1: AST_VAR
             0: "b"
+    2: AST_AND
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"
+    3: AST_OR
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"
 AST_STMT_LIST
     0: AST_BINARY_OP
         flags: BINARY_IS_GREATER (256)
@@ -40,3 +52,15 @@ AST_STMT_LIST
             0: "a"
         1: AST_VAR
             0: "b"
+    2: AST_BINARY_OP
+        flags: BINARY_BOOL_AND (259)
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"
+    3: AST_BINARY_OP
+        flags: BINARY_BOOL_OR (258)
+        0: AST_VAR
+            0: "a"
+        1: AST_VAR
+            0: "b"

tests/unary_ops.phpt

@@ -27,12 +27,12 @@ AST_STMT_LIST
         0: 1
 AST_STMT_LIST
     0: AST_UNARY_OP
-        flags: UNARY_SILENCE (258)
+        flags: UNARY_SILENCE (260)
         0: AST_VAR
             0: "a"
     1: AST_UNARY_OP
-        flags: UNARY_PLUS (259)
+        flags: UNARY_PLUS (261)
         0: 1
     2: AST_UNARY_OP
-        flags: UNARY_MINUS (260)
+        flags: UNARY_MINUS (262)
         0: 1

util.php

@@ -75,6 +75,8 @@ function get_flag_info() : array {
             flags\UNARY_SILENCE => 'UNARY_SILENCE',
         ],
         ast\AST_BINARY_OP => $sharedBinaryOps + [
+            flags\BINARY_BOOL_AND => 'BINARY_BOOL_AND',
+            flags\BINARY_BOOL_OR => 'BINARY_BOOL_OR',
             flags\BINARY_BOOL_XOR => 'BINARY_BOOL_XOR',
             flags\BINARY_IS_IDENTICAL => 'BINARY_IS_IDENTICAL',
             flags\BINARY_IS_NOT_IDENTICAL => 'BINARY_IS_NOT_IDENTICAL',