Version 35: Forward/backward emulation of AST_CATCH format

Author: nikic

README.md

@@ -435,6 +435,12 @@ Version changelog
   These will now be normalized to always use an `AST_STMT_LIST`. A `null` is only allowed if it is
   semantically meaningful, e.g. in the case of `declare(ticks=1);` vs `declare(ticks=1) {}`.
 
+### 35 (in development)
+
+* The `class` node of `AST_CATCH` is now always represented as an `AST_NAME_LIST`. In lower
+  versions: On PHP 7.0 it will always be an `AST_NAME`. In PHP 7.1 it will be an `AST_NAME` if
+  there is only a single class and `AST_NAME_LIST` otherwise.
+
 ### 30 (current)
 
 Supported since 2015-03-10.

ast.c

@@ -357,6 +357,20 @@ static void ast_fill_children_ht(HashTable *ht, zend_ast *ast, zend_long version
 				&& (ast->kind == ZEND_AST_PROP_ELEM || ast->kind == ZEND_AST_CONST_ELEM)) {
 			/* Skip docComment child -- It's handled separately */
 			continue;
+#if PHP_VERSION_ID >= 70100
+		} else if (ast->kind == ZEND_AST_CATCH && version < 35
+				&& i == 0 && zend_ast_get_list(child)->children == 1) {
+			/* Emulate PHP 7.0 format (no list) */
+			ast_create_virtual_node(
+				&child_zv, AST_NAME, zend_ast_get_list(child)->child[0], version);
+#else
+		} else if (ast->kind == ZEND_AST_CATCH && version >= 35) {
+			/* Emulate PHP 7.1 format (name list) */
+			zval tmp;
+			ast_create_virtual_node(&tmo, AST_NAME, child, version);
+			ast_create_virtual_node_ex(
+				&child_zv, ZEND_AST_NAME_LIST, 0, zend_ast_get_lineno(child), &tmp, version);
+#endif
 		} else {
 			ast_to_zval(&child_zv, child, version);
 		}
@@ -499,7 +513,7 @@ static void ast_to_zval(zval *zv, zend_ast *ast, zend_long version) {
 	ast_fill_children_ht(Z_ARRVAL(tmp_zv), ast, version);
 }
 
-static const zend_long versions[] = {10, 15, 20, 30, 40};
+static const zend_long versions[] = {10, 15, 20, 30, 35, 40};
 static const size_t versions_count = sizeof(versions)/sizeof(versions[0]);
 
 static zend_string *ast_version_info() {

tests/try_catch_finally.phpt

@@ -20,6 +20,7 @@ PHP;
 
 echo ast_dump(ast\parse_code($code, $version=15)), "\n";
 echo ast_dump(ast\parse_code($code, $version=20)), "\n";
+echo ast_dump(ast\parse_code($code, $version=35)), "\n";
 
 ?>
 --EXPECTF--
@@ -80,3 +81,32 @@ AST_STMT_LIST
         2: AST_STMT_LIST
             0: AST_ECHO
                 0: "finally"
+AST_STMT_LIST
+    0: AST_TRY
+        try: AST_STMT_LIST
+            0: AST_ECHO
+                expr: "try"
+        catches: AST_CATCH_LIST
+            0: AST_CATCH
+                class: AST_NAME_LIST
+                    0: AST_NAME
+                        flags: NAME_NOT_FQ (1)
+                        name: "Exception"
+                var: AST_VAR
+                    name: "e"
+                stmts: AST_STMT_LIST
+                    0: AST_ECHO
+                        expr: "catch 1"
+            1: AST_CATCH
+                class: AST_NAME_LIST
+                    0: AST_NAME
+                        flags: NAME_NOT_FQ (1)
+                        name: "bar\FooException"
+                var: AST_VAR
+                    name: "e2"
+                stmts: AST_STMT_LIST
+                    0: AST_ECHO
+                        expr: "catch 2"
+        finally: AST_STMT_LIST
+            0: AST_ECHO
+                expr: "finally"