diff --git a/src/parser/xhpast/__tests__/data/anonymous_class.php.test b/src/parser/xhpast/__tests__/data/anonymous_class.php.test --- a/src/parser/xhpast/__tests__/data/anonymous_class.php.test +++ b/src/parser/xhpast/__tests__/data/anonymous_class.php.test @@ -54,13 +54,11 @@ [ [ 9051, - 8, + 10, 11, [ [ - 0, - 8, - 8 + 9005 ], [ 9005 @@ -114,13 +112,11 @@ [ [ 9051, - 20, + 25, 62, [ [ - 0, - 20, - 20 + 9005 ], [ 9005 diff --git a/src/parser/xhpast/bin/PhutilXHPASTBinary.php b/src/parser/xhpast/bin/PhutilXHPASTBinary.php --- a/src/parser/xhpast/bin/PhutilXHPASTBinary.php +++ b/src/parser/xhpast/bin/PhutilXHPASTBinary.php @@ -8,7 +8,7 @@ * This is the version that would be obtained with an up-to-date XHPAST * build. The //actual// XHPAST build version may vary. */ - const EXPECTED_VERSION = '7.1.3'; + const EXPECTED_VERSION = '7.1.4'; /** * The XHPAST build version. diff --git a/support/xhpast/parser.y b/support/xhpast/parser.y --- a/support/xhpast/parser.y +++ b/support/xhpast/parser.y @@ -2749,7 +2749,7 @@ | T_NEW T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}' { $$ = NNEW(n_CLASS_DECLARATION); - $$->appendChild($2); + $$->appendChild(NNEW(n_EMPTY)); $$->appendChild(NNEW(n_EMPTY)); $$->appendChild($4); $$->appendChild($5); diff --git a/support/xhpast/parser.yacc.cpp b/support/xhpast/parser.yacc.cpp --- a/support/xhpast/parser.yacc.cpp +++ b/support/xhpast/parser.yacc.cpp @@ -7346,7 +7346,7 @@ #line 2750 "parser.y" /* yacc.c:1646 */ { (yyval) = NNEW(n_CLASS_DECLARATION); - (yyval)->appendChild((yyvsp[-6])); + (yyval)->appendChild(NNEW(n_EMPTY)); (yyval)->appendChild(NNEW(n_EMPTY)); (yyval)->appendChild((yyvsp[-4])); (yyval)->appendChild((yyvsp[-3])); diff --git a/support/xhpast/xhpast.cpp b/support/xhpast/xhpast.cpp --- a/support/xhpast/xhpast.cpp +++ b/support/xhpast/xhpast.cpp @@ -12,7 +12,7 @@ int main(int argc, char* argv[]) { if (argc != 1) { // Coupling: modify also src/parser/xhpast/bin/PhutilXHPASTBinary.php - cout << "7.1.3\n"; + cout << "7.1.4\n"; return 0; }