Rename some child names

Author: nikic

README.md

@@ -294,7 +294,7 @@ Version changelog
 * `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_SILENCE`, `AST_UNARY_MINUS` and `AST_UNARY_PLUS` nodes are now 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_STATIC` and `AST_CATCH` now use an `AST_VAR` node for the static/catch variable. Previously

ast_data.c

@@ -631,15 +631,15 @@ zend_string *ast_kind_child_name(zend_ast_kind kind, uint32_t child) {
 		case ZEND_AST_CONDITIONAL:
 			switch (child) {
 				case 0: return AST_STR(cond);
-				case 1: return AST_STR(trueExpr);
-				case 2: return AST_STR(falseExpr);
+				case 1: return AST_STR(true);
+				case 2: return AST_STR(false);
 			}
 			return NULL;
 		case ZEND_AST_TRY:
 			switch (child) {
-				case 0: return AST_STR(tryStmts);
+				case 0: return AST_STR(try);
 				case 1: return AST_STR(catches);
-				case 2: return AST_STR(finallyStmts);
+				case 2: return AST_STR(finally);
 			}
 			return NULL;
 		case ZEND_AST_CATCH:

ast_str_defs.h

@@ -38,11 +38,11 @@
 	X(insteadof) \
 	X(alias) \
 	X(prefix) \
-	X(trueExpr) \
-	X(falseExpr) \
-	X(tryStmts) \
+	X(true) \
+	X(false) \
+	X(try) \
 	X(catches) \
-	X(finallyStmts) \
+	X(finally) \
 	X(type) \
 	X(init) \
 	X(loop) \

generate_ast_data.php

@@ -63,8 +63,8 @@
     'ZEND_AST_VAR' => ['name'],
     'ZEND_AST_CONST' => ['name'],
     'ZEND_AST_UNPACK' => ['expr'],
-    'ZEND_AST_UNARY_PLUS' => ['expr'],
-    'ZEND_AST_UNARY_MINUS' => ['expr'],
+    'ZEND_AST_UNARY_PLUS' => ['expr'],       // version < 20
+    'ZEND_AST_UNARY_MINUS' => ['expr'],      // version < 20
     'ZEND_AST_CAST' => ['expr'],
     'ZEND_AST_EMPTY' => ['expr'],
     'ZEND_AST_ISSET' => ['var'],
@@ -103,10 +103,10 @@
     'ZEND_AST_ASSIGN_REF' => ['var', 'expr'],
     'ZEND_AST_ASSIGN_OP' => ['var', 'expr'],
     'ZEND_AST_BINARY_OP' => ['left', 'right'],
-    'ZEND_AST_GREATER' => ['left', 'right'],
-    'ZEND_AST_GREATER_EQUAL' => ['left', 'right'],
-    'ZEND_AST_AND' => ['left', 'right'],
-    'ZEND_AST_OR' => ['left', 'right'],
+    'ZEND_AST_GREATER' => ['left', 'right'],       // version < 20
+    'ZEND_AST_GREATER_EQUAL' => ['left', 'right'], // version < 20
+    'ZEND_AST_AND' => ['left', 'right'],           // version < 20
+    'ZEND_AST_OR' => ['left', 'right'],            // version < 20
     'ZEND_AST_ARRAY_ELEM' => ['value', 'key'],
     'ZEND_AST_NEW' => ['class', 'args'],
     'ZEND_AST_INSTANCEOF' => ['expr', 'class'],
@@ -133,9 +133,9 @@
     /* 3 child nodes */
     'ZEND_AST_METHOD_CALL' => ['expr', 'method', 'args'],
     'ZEND_AST_STATIC_CALL' => ['class', 'method', 'args'],
-    'ZEND_AST_CONDITIONAL' => ['cond', 'trueExpr', 'falseExpr'],
+    'ZEND_AST_CONDITIONAL' => ['cond', 'true', 'false'],
 
-    'ZEND_AST_TRY' => ['tryStmts', 'catches', 'finallyStmts'],
+    'ZEND_AST_TRY' => ['try', 'catches', 'finally'],
     'ZEND_AST_CATCH' => ['class', 'var', 'stmts'],
     'ZEND_AST_PARAM' => ['type', 'name', 'default'],