diff options
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 1395 |
1 files changed, 666 insertions, 729 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index d46149957a..97fc4de546 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -3,7 +3,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -15,6 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Andi Gutmans <andi@zend.com> | | Zeev Suraski <zeev@zend.com> | + | Nikita Popov <nikic@php.net> | +----------------------------------------------------------------------+ */ @@ -40,12 +41,12 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); #define YYERROR_VERBOSE -#define YYSTYPE znode +#define YYSTYPE zend_parser_stack_elem %} %pure_parser -%expect 3 +%expect 2 %code requires { #ifdef ZTS @@ -54,25 +55,62 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); #endif } -%token END 0 "end of file" +%destructor { zend_ast_destroy($$); } <ast> +%destructor { if ($$) zend_string_release($$); } <str> + %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE +%left ',' +%left T_LOGICAL_OR +%left T_LOGICAL_XOR +%left T_LOGICAL_AND +%right T_PRINT +%right T_YIELD +%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL T_POW_EQUAL +%left '?' ':' +%right T_COALESCE +%left T_BOOLEAN_OR +%left T_BOOLEAN_AND +%left '|' +%left '^' +%left '&' +%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL +%nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL +%left T_SL T_SR +%left '+' '-' '.' +%left '*' '/' '%' +%right '!' +%nonassoc T_INSTANCEOF +%right '~' T_INC T_DEC T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST '@' +%right T_POW +%right '[' +%nonassoc T_NEW T_CLONE +%left T_ELSEIF +%left T_ELSE +%left T_ENDIF +%right T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC +%right T_DOUBLE_ARROW + +%token <ast> T_LNUMBER "integer number (T_LNUMBER)" +%token <ast> T_DNUMBER "floating-point number (T_DNUMBER)" +%token <ast> T_STRING "identifier (T_STRING)" +%token <ast> T_VARIABLE "variable (T_VARIABLE)" +%token <ast> T_INLINE_HTML +%token <ast> T_ENCAPSED_AND_WHITESPACE "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" +%token <ast> T_CONSTANT_ENCAPSED_STRING "quoted-string (T_CONSTANT_ENCAPSED_STRING)" +%token <ast> T_STRING_VARNAME "variable name (T_STRING_VARNAME)" +%token <ast> T_NUM_STRING "number (T_NUM_STRING)" + +%token END 0 "end of file" %token T_INCLUDE "include (T_INCLUDE)" %token T_INCLUDE_ONCE "include_once (T_INCLUDE_ONCE)" %token T_EVAL "eval (T_EVAL)" %token T_REQUIRE "require (T_REQUIRE)" %token T_REQUIRE_ONCE "require_once (T_REQUIRE_ONCE)" -%left ',' -%left T_LOGICAL_OR %token T_LOGICAL_OR "or (T_LOGICAL_OR)" -%left T_LOGICAL_XOR %token T_LOGICAL_XOR "xor (T_LOGICAL_XOR)" -%left T_LOGICAL_AND %token T_LOGICAL_AND "and (T_LOGICAL_AND)" -%right T_PRINT %token T_PRINT "print (T_PRINT)" -%right T_YIELD %token T_YIELD "yield (T_YIELD)" -%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL %token T_PLUS_EQUAL "+= (T_PLUS_EQUAL)" %token T_MINUS_EQUAL "-= (T_MINUS_EQUAL)" %token T_MUL_EQUAL "*= (T_MUL_EQUAL)" @@ -84,31 +122,17 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_XOR_EQUAL "^= (T_XOR_EQUAL)" %token T_SL_EQUAL "<<= (T_SL_EQUAL)" %token T_SR_EQUAL ">>= (T_SR_EQUAL)" -%left '?' ':' -%left T_BOOLEAN_OR %token T_BOOLEAN_OR "|| (T_BOOLEAN_OR)" -%left T_BOOLEAN_AND %token T_BOOLEAN_AND "&& (T_BOOLEAN_AND)" -%left '|' -%left '^' -%left '&' -%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL %token T_IS_EQUAL "== (T_IS_EQUAL)" %token T_IS_NOT_EQUAL "!= (T_IS_NOT_EQUAL)" %token T_IS_IDENTICAL "=== (T_IS_IDENTICAL)" %token T_IS_NOT_IDENTICAL "!== (T_IS_NOT_IDENTICAL)" -%nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL %token T_IS_SMALLER_OR_EQUAL "<= (T_IS_SMALLER_OR_EQUAL)" %token T_IS_GREATER_OR_EQUAL ">= (T_IS_GREATER_OR_EQUAL)" -%left T_SL T_SR %token T_SL "<< (T_SL)" %token T_SR ">> (T_SR)" -%left '+' '-' '.' -%left '*' '/' '%' -%right '!' -%nonassoc T_INSTANCEOF %token T_INSTANCEOF "instanceof (T_INSTANCEOF)" -%right '~' T_INC T_DEC T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST '@' %token T_INC "++ (T_INC)" %token T_DEC "-- (T_DEC)" %token T_INT_CAST "(int) (T_INT_CAST)" @@ -118,29 +142,15 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_OBJECT_CAST "(object) (T_OBJECT_CAST)" %token T_BOOL_CAST "(bool) (T_BOOL_CAST)" %token T_UNSET_CAST "(unset) (T_UNSET_CAST)" -%right '[' -%nonassoc T_NEW T_CLONE %token T_NEW "new (T_NEW)" %token T_CLONE "clone (T_CLONE)" %token T_EXIT "exit (T_EXIT)" %token T_IF "if (T_IF)" -%left T_ELSEIF %token T_ELSEIF "elseif (T_ELSEIF)" -%left T_ELSE %token T_ELSE "else (T_ELSE)" -%left T_ENDIF %token T_ENDIF "endif (T_ENDIF)" -%token T_LNUMBER "integer number (T_LNUMBER)" -%token T_DNUMBER "floating-point number (T_DNUMBER)" -%token T_STRING "identifier (T_STRING)" -%token T_STRING_VARNAME "variable name (T_STRING_VARNAME)" -%token T_VARIABLE "variable (T_VARIABLE)" -%token T_NUM_STRING "number (T_NUM_STRING)" -%token T_INLINE_HTML %token T_CHARACTER %token T_BAD_CHARACTER -%token T_ENCAPSED_AND_WHITESPACE "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" -%token T_CONSTANT_ENCAPSED_STRING "quoted-string (T_CONSTANT_ENCAPSED_STRING)" %token T_ECHO "echo (T_ECHO)" %token T_DO "do (T_DO)" %token T_WHILE "while (T_WHILE)" @@ -169,7 +179,6 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_USE "use (T_USE)" %token T_INSTEADOF "insteadof (T_INSTEADOF)" %token T_GLOBAL "global (T_GLOBAL)" -%right T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC %token T_STATIC "static (T_STATIC)" %token T_ABSTRACT "abstract (T_ABSTRACT)" %token T_FINAL "final (T_FINAL)" @@ -191,12 +200,13 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_LIST "list (T_LIST)" %token T_ARRAY "array (T_ARRAY)" %token T_CALLABLE "callable (T_CALLABLE)" +%token T_LINE "__LINE__ (T_LINE)" +%token T_FILE "__FILE__ (T_FILE)" +%token T_DIR "__DIR__ (T_DIR)" %token T_CLASS_C "__CLASS__ (T_CLASS_C)" %token T_TRAIT_C "__TRAIT__ (T_TRAIT_C)" %token T_METHOD_C "__METHOD__ (T_METHOD_C)" %token T_FUNC_C "__FUNCTION__ (T_FUNC_C)" -%token T_LINE "__LINE__ (T_LINE)" -%token T_FILE "__FILE__ (T_FILE)" %token T_COMMENT "comment (T_COMMENT)" %token T_DOC_COMMENT "doc comment (T_DOC_COMMENT)" %token T_OPEN_TAG "open tag (T_OPEN_TAG)" @@ -210,265 +220,256 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_PAAMAYIM_NEKUDOTAYIM ":: (T_PAAMAYIM_NEKUDOTAYIM)" %token T_NAMESPACE "namespace (T_NAMESPACE)" %token T_NS_C "__NAMESPACE__ (T_NS_C)" -%token T_DIR "__DIR__ (T_DIR)" %token T_NS_SEPARATOR "\\ (T_NS_SEPARATOR)" %token T_ELLIPSIS "... (T_ELLIPSIS)" +%token T_COALESCE "?? (T_COALESCE)" +%token T_POW "** (T_POW)" +%token T_POW_EQUAL "**= (T_POW_EQUAL)" + +%type <ast> top_statement namespace_name name statement function_declaration_statement +%type <ast> class_declaration_statement use_declaration const_decl inner_statement +%type <ast> expr optional_expr while_statement for_statement foreach_variable +%type <ast> foreach_statement declare_statement finally_statement unset_variable variable +%type <ast> extends_from parameter optional_type argument expr_without_variable global_var +%type <ast> static_var class_statement trait_adaptation trait_precedence trait_alias +%type <ast> absolute_trait_method_reference trait_method_reference property echo_expr +%type <ast> new_expr class_name class_name_reference simple_variable internal_functions_in_yacc +%type <ast> exit_expr scalar backticks_expr lexical_var function_call member_name +%type <ast> variable_class_name dereferencable_scalar class_name_scalar constant dereferencable +%type <ast> callable_expr callable_variable static_member new_variable +%type <ast> assignment_list_element array_pair encaps_var encaps_var_offset isset_variables +%type <ast> isset_variable +%type <ast> top_statement_list use_declarations const_list inner_statement_list if_stmt +%type <ast> alt_if_stmt for_exprs switch_case_list global_var_list static_var_list +%type <ast> echo_expr_list unset_variables catch_list parameter_list class_statement_list +%type <ast> implements_list interface_extends_list case_list if_stmt_without_else +%type <ast> non_empty_parameter_list argument_list non_empty_argument_list property_list +%type <ast> class_const_list name_list trait_adaptations method_body non_empty_for_exprs +%type <ast> ctor_arguments alt_if_stmt_without_else trait_adaptation_list lexical_vars +%type <ast> lexical_var_list encaps_list array_pair_list non_empty_array_pair_list +%type <ast> assignment_list + +%type <num> returns_ref function is_reference is_variadic class_type variable_modifiers +%type <num> method_modifiers trait_modifiers non_empty_member_modifiers member_modifier + +%type <str> backup_doc_comment %% /* Rules */ start: - top_statement_list { zend_do_end_compilation(TSRMLS_C); } + top_statement_list { CG(ast) = $1; } ; top_statement_list: - top_statement_list { zend_do_extended_info(TSRMLS_C); } top_statement { HANDLE_INTERACTIVE(); } - | /* empty */ + top_statement_list top_statement { $$ = zend_ast_list_add($1, $2); } + | /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; namespace_name: - T_STRING { $$ = $1; } - | namespace_name T_NS_SEPARATOR T_STRING { zend_do_build_namespace_name(&$$, &$1, &$3 TSRMLS_CC); } + T_STRING { $$ = $1; } + | namespace_name T_NS_SEPARATOR T_STRING { $$ = zend_ast_append_str($1, $3); } +; + +name: + namespace_name { $$ = $1; $$->attr = ZEND_NAME_NOT_FQ; } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = $3; $$->attr = ZEND_NAME_RELATIVE; } + | T_NS_SEPARATOR namespace_name { $$ = $2; $$->attr = ZEND_NAME_FQ; } ; top_statement: - statement { zend_verify_namespace(TSRMLS_C); } - | function_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } - | class_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } - | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } - | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); } - | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); } - top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } - | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); } - top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } - | T_USE use_declarations ';' { zend_verify_namespace(TSRMLS_C); } - | constant_declaration ';' { zend_verify_namespace(TSRMLS_C); } + statement { $$ = $1; } + | function_declaration_statement { $$ = $1; } + | class_declaration_statement { $$ = $1; } + | T_HALT_COMPILER '(' ')' ';' + { $$ = zend_ast_create(ZEND_AST_HALT_COMPILER, + zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); + zend_stop_lexing(TSRMLS_C); } + | T_NAMESPACE namespace_name ';' + { $$ = zend_ast_create(ZEND_AST_NAMESPACE, $2, NULL); + RESET_DOC_COMMENT(); } + | T_NAMESPACE namespace_name { RESET_DOC_COMMENT(); } + '{' top_statement_list '}' + { $$ = zend_ast_create(ZEND_AST_NAMESPACE, $2, $5); } + | T_NAMESPACE { RESET_DOC_COMMENT(); } + '{' top_statement_list '}' + { $$ = zend_ast_create(ZEND_AST_NAMESPACE, NULL, $4); } + | T_USE use_declarations ';' { $$ = $2; $$->attr = T_CLASS; } + | T_USE T_FUNCTION use_declarations ';' { $$ = $3; $$->attr = T_FUNCTION; } + | T_USE T_CONST use_declarations ';' { $$ = $3; $$->attr = T_CONST; } + | T_CONST const_list ';' { $$ = $2; } ; use_declarations: use_declarations ',' use_declaration + { $$ = zend_ast_list_add($1, $3); } | use_declaration + { $$ = zend_ast_create_list(1, ZEND_AST_USE, $1); } ; use_declaration: - namespace_name { zend_do_use(&$1, NULL, 0 TSRMLS_CC); } - | namespace_name T_AS T_STRING { zend_do_use(&$1, &$3, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL, 1 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); } + namespace_name + { $$ = zend_ast_create(ZEND_AST_USE_ELEM, $1, NULL); } + | namespace_name T_AS T_STRING + { $$ = zend_ast_create(ZEND_AST_USE_ELEM, $1, $3); } + | T_NS_SEPARATOR namespace_name + { $$ = zend_ast_create(ZEND_AST_USE_ELEM, $2, NULL); } + | T_NS_SEPARATOR namespace_name T_AS T_STRING + { $$ = zend_ast_create(ZEND_AST_USE_ELEM, $2, $4); } ; -constant_declaration: - constant_declaration ',' T_STRING '=' static_scalar { zend_do_declare_constant(&$3, &$5 TSRMLS_CC); } - | T_CONST T_STRING '=' static_scalar { zend_do_declare_constant(&$2, &$4 TSRMLS_CC); } +const_list: + const_list ',' const_decl { $$ = zend_ast_list_add($1, $3); } + | const_decl { $$ = zend_ast_create_list(1, ZEND_AST_CONST_DECL, $1); } ; inner_statement_list: - inner_statement_list { zend_do_extended_info(TSRMLS_C); } inner_statement { HANDLE_INTERACTIVE(); } + inner_statement_list inner_statement + { $$ = zend_ast_list_add($1, $2); } | /* empty */ + { $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; inner_statement: - statement - | function_declaration_statement - | class_declaration_statement - | T_HALT_COMPILER '(' ')' ';' { zend_error(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } + statement { $$ = $1; } + | function_declaration_statement { $$ = $1; } + | class_declaration_statement { $$ = $1; } + | T_HALT_COMPILER '(' ')' ';' + { $$ = NULL; zend_error_noreturn(E_COMPILE_ERROR, + "__HALT_COMPILER() can only be used from the outermost scope"); } ; statement: - unticked_statement { DO_TICKS(); } - | T_STRING ':' { zend_do_label(&$1 TSRMLS_CC); } + '{' inner_statement_list '}' { $$ = $2; } + | if_stmt { $$ = $1; } + | alt_if_stmt { $$ = $1; } + | T_WHILE '(' expr ')' while_statement + { $$ = zend_ast_create(ZEND_AST_WHILE, $3, $5); } + | T_DO statement T_WHILE '(' expr ')' ';' + { $$ = zend_ast_create(ZEND_AST_DO_WHILE, $2, $5); } + | T_FOR '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement + { $$ = zend_ast_create(ZEND_AST_FOR, $3, $5, $7, $9); } + | T_SWITCH '(' expr ')' switch_case_list + { $$ = zend_ast_create(ZEND_AST_SWITCH, $3, $5); } + | T_BREAK optional_expr ';' { $$ = zend_ast_create(ZEND_AST_BREAK, $2); } + | T_CONTINUE optional_expr ';' { $$ = zend_ast_create(ZEND_AST_CONTINUE, $2); } + | T_RETURN optional_expr ';' { $$ = zend_ast_create(ZEND_AST_RETURN, $2); } + | T_GLOBAL global_var_list ';' { $$ = $2; } + | T_STATIC static_var_list ';' { $$ = $2; } + | T_ECHO echo_expr_list ';' { $$ = $2; } + | T_INLINE_HTML { $$ = zend_ast_create(ZEND_AST_ECHO, $1); } + | expr ';' { $$ = $1; } + | T_UNSET '(' unset_variables ')' ';' { $$ = $3; } + | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement + { $$ = zend_ast_create(ZEND_AST_FOREACH, $3, $5, NULL, $7); } + | T_FOREACH '(' expr T_AS foreach_variable T_DOUBLE_ARROW foreach_variable ')' + foreach_statement + { $$ = zend_ast_create(ZEND_AST_FOREACH, $3, $7, $5, $9); } + | T_DECLARE '(' const_list ')' + { zend_handle_encoding_declaration($3 TSRMLS_CC); } + declare_statement + { $$ = zend_ast_create(ZEND_AST_DECLARE, $3, $6); } + | ';' /* empty statement */ { $$ = NULL; } + | T_TRY '{' inner_statement_list '}' catch_list finally_statement + { $$ = zend_ast_create(ZEND_AST_TRY, $3, $5, $6); } + | T_THROW expr ';' { $$ = zend_ast_create(ZEND_AST_THROW, $2); } + | T_GOTO T_STRING ';' { $$ = zend_ast_create(ZEND_AST_GOTO, $2); } + | T_STRING ':' { $$ = zend_ast_create(ZEND_AST_LABEL, $1); } +; + +catch_list: + /* empty */ + { $$ = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); } + | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' + { $$ = zend_ast_list_add($1, zend_ast_create(ZEND_AST_CATCH, $4, $5, $8)); } ; -unticked_statement: - '{' inner_statement_list '}' - | T_IF parenthesis_expr { zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); } - | T_IF parenthesis_expr ':' { zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); } - | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); } - | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); } - | T_FOR - '(' - for_expr - ';' { zend_do_free(&$3 TSRMLS_CC); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } - for_expr - ';' { zend_do_extended_info(TSRMLS_C); zend_do_for_cond(&$6, &$7 TSRMLS_CC); } - for_expr - ')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); } - for_statement { zend_do_for_end(&$7 TSRMLS_CC); } - | T_SWITCH parenthesis_expr { zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); } - | T_BREAK ';' { zend_do_brk_cont(ZEND_BRK, NULL TSRMLS_CC); } - | T_BREAK expr ';' { zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); } - | T_CONTINUE ';' { zend_do_brk_cont(ZEND_CONT, NULL TSRMLS_CC); } - | T_CONTINUE expr ';' { zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); } - | T_RETURN ';' { zend_do_return(NULL, 0 TSRMLS_CC); } - | T_RETURN expr_without_variable ';' { zend_do_return(&$2, 0 TSRMLS_CC); } - | T_RETURN variable ';' { zend_do_return(&$2, 1 TSRMLS_CC); } - | yield_expr ';' { zend_do_free(&$1 TSRMLS_CC); } - | T_GLOBAL global_var_list ';' - | T_STATIC static_var_list ';' - | T_ECHO echo_expr_list ';' - | T_INLINE_HTML { zend_do_echo(&$1 TSRMLS_CC); } - | expr ';' { zend_do_free(&$1 TSRMLS_CC); } - | T_UNSET '(' unset_variables ')' ';' - | T_FOREACH '(' variable T_AS - { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 1 TSRMLS_CC); } - foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); } - | T_FOREACH '(' expr_without_variable T_AS - { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 0 TSRMLS_CC); } - foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); } - | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); } - | ';' /* empty statement */ - | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' - catch_statement { zend_do_bind_catch(&$1, &$6 TSRMLS_CC); } - finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); } - | T_THROW expr ';' { zend_do_throw(&$2 TSRMLS_CC); } - | T_GOTO T_STRING ';' { zend_do_goto(&$2 TSRMLS_CC); } -; - -catch_statement: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_CATCH '(' { zend_initialize_try_catch_element(&$1 TSRMLS_CC); } - fully_qualified_class_name { zend_do_first_catch(&$2 TSRMLS_CC); } - T_VARIABLE ')' { zend_do_begin_catch(&$1, &$4, &$6, &$2 TSRMLS_CC); } - '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); } - additional_catches { zend_do_mark_last_catch(&$2, &$13 TSRMLS_CC); $$ = $1;} - finally_statement: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_FINALLY { zend_do_finally(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { $$ = $1; } -; - -additional_catches: - non_empty_additional_catches { $$ = $1; } - | /* empty */ { $$.u.op.opline_num = -1; } -; - -non_empty_additional_catches: - additional_catch { $$ = $1; } - | non_empty_additional_catches additional_catch { $$ = $2; } -; - -additional_catch: - T_CATCH '(' fully_qualified_class_name { $$.u.op.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$3, &$5, NULL TSRMLS_CC); } '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); } + /* empty */ { $$ = NULL; } + | T_FINALLY '{' inner_statement_list '}' { $$ = $3; } ; unset_variables: - unset_variable - | unset_variables ',' unset_variable + unset_variable { $$ = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1); } + | unset_variables ',' unset_variable { $$ = zend_ast_list_add($1, $3); } ; unset_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_UNSET, 0 TSRMLS_CC); zend_do_unset(&$1 TSRMLS_CC); } + variable { $$ = zend_ast_create(ZEND_AST_UNSET, $1); } ; function_declaration_statement: - unticked_function_declaration_statement { DO_TICKS(); } -; - -class_declaration_statement: - unticked_class_declaration_statement { DO_TICKS(); } + function returns_ref T_STRING '(' parameter_list ')' backup_doc_comment + '{' inner_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2, $1, $7, + zend_ast_get_str($3), $5, NULL, $9); } ; is_reference: - /* empty */ { $$.op_type = 0; } - | '&' { $$.op_type = 1; } + /* empty */ { $$ = 0; } + | '&' { $$ = ZEND_PARAM_REF; } ; is_variadic: - /* empty */ { $$.op_type = 0; } - | T_ELLIPSIS { $$.op_type = 1; } + /* empty */ { $$ = 0; } + | T_ELLIPSIS { $$ = ZEND_PARAM_VARIADIC; } ; -unticked_function_declaration_statement: - function is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$3, 0, $2.op_type, NULL TSRMLS_CC); } - '(' parameter_list ')' - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); } +class_declaration_statement: + class_type { $<num>$ = CG(zend_lineno); } + T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLASS, $1, $<num>2, $6, + zend_ast_get_str($3), $4, $5, $8); } + | T_INTERFACE { $<num>$ = CG(zend_lineno); } + T_STRING interface_extends_list backup_doc_comment '{' class_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, $<num>2, $5, + zend_ast_get_str($3), NULL, $4, $7); } ; -unticked_class_declaration_statement: - class_entry_type T_STRING extends_from - { zend_do_begin_class_declaration(&$1, &$2, &$3 TSRMLS_CC); } - implements_list - '{' - class_statement_list - '}' { zend_do_end_class_declaration(&$1, &$3 TSRMLS_CC); } - | interface_entry T_STRING - { zend_do_begin_class_declaration(&$1, &$2, NULL TSRMLS_CC); } - interface_extends_list - '{' - class_statement_list - '}' { zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); } -; - - -class_entry_type: - T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = 0; } - | T_ABSTRACT T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } - | T_TRAIT { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_TRAIT; } - | T_FINAL T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_FINAL_CLASS; } +class_type: + T_CLASS { $$ = 0; } + | T_ABSTRACT T_CLASS { $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } + | T_FINAL T_CLASS { $$ = ZEND_ACC_FINAL_CLASS; } + | T_TRAIT { $$ = ZEND_ACC_TRAIT; } ; extends_from: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_EXTENDS fully_qualified_class_name { zend_do_fetch_class(&$$, &$2 TSRMLS_CC); } -; - -interface_entry: - T_INTERFACE { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_INTERFACE; } + /* empty */ { $$ = NULL; } + | T_EXTENDS name { $$ = $2; } ; interface_extends_list: - /* empty */ - | T_EXTENDS interface_list + /* empty */ { $$ = NULL; } + | T_EXTENDS name_list { $$ = $2; } ; implements_list: - /* empty */ - | T_IMPLEMENTS interface_list -; - -interface_list: - fully_qualified_class_name { zend_do_implements_interface(&$1 TSRMLS_CC); } - | interface_list ',' fully_qualified_class_name { zend_do_implements_interface(&$3 TSRMLS_CC); } -; - -foreach_optional_arg: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_DOUBLE_ARROW foreach_variable { $$ = $2; } + /* empty */ { $$ = NULL; } + | T_IMPLEMENTS name_list { $$ = $2; } ; foreach_variable: - variable { zend_check_writable_variable(&$1); $$ = $1; } - | '&' variable { zend_check_writable_variable(&$2); $$ = $2; $$.EA |= ZEND_PARSED_REFERENCE_VARIABLE; } - | T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' { $$ = $1; $$.EA = ZEND_PARSED_LIST_EXPR; } + variable { $$ = $1; } + | '&' variable { $$ = zend_ast_create(ZEND_AST_REF, $2); } + | T_LIST '(' assignment_list ')' { $$ = $3; } ; for_statement: - statement - | ':' inner_statement_list T_ENDFOR ';' + statement { $$ = $1; } + | ':' inner_statement_list T_ENDFOR ';' { $$ = $2; } ; - foreach_statement: - statement - | ':' inner_statement_list T_ENDFOREACH ';' + statement { $$ = $1; } + | ':' inner_statement_list T_ENDFOREACH ';' { $$ = $2; } ; - declare_statement: - statement - | ':' inner_statement_list T_ENDDECLARE ';' -; - - -declare_list: - T_STRING '=' static_scalar { zend_do_declare_stmt(&$1, &$3 TSRMLS_CC); } - | declare_list ',' T_STRING '=' static_scalar { zend_do_declare_stmt(&$3, &$5 TSRMLS_CC); } + statement { $$ = $1; } + | ':' inner_statement_list T_ENDDECLARE ';' { $$ = $2; } ; - switch_case_list: '{' case_list '}' { $$ = $2; } | '{' ';' case_list '}' { $$ = $3; } @@ -476,14 +477,14 @@ switch_case_list: | ':' ';' case_list T_ENDSWITCH ';' { $$ = $3; } ; - case_list: - /* empty */ { $$.op_type = IS_UNUSED; } - | case_list T_CASE expr case_separator { zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } - | case_list T_DEFAULT case_separator { zend_do_extended_info(TSRMLS_C); zend_do_default_before_statement(&$1, &$2 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } + /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_SWITCH_LIST); } + | case_list T_CASE expr case_separator inner_statement_list + { $$ = zend_ast_list_add($1, zend_ast_create(ZEND_AST_SWITCH_CASE, $3, $5)); } + | case_list T_DEFAULT case_separator inner_statement_list + { $$ = zend_ast_list_add($1, zend_ast_create(ZEND_AST_SWITCH_CASE, NULL, $4)); } ; - case_separator: ':' | ';' @@ -491,498 +492,476 @@ case_separator: while_statement: - statement - | ':' inner_statement_list T_ENDWHILE ';' + statement { $$ = $1; } + | ':' inner_statement_list T_ENDWHILE ';' { $$ = $2; } ; - -elseif_list: - /* empty */ - | elseif_list T_ELSEIF parenthesis_expr { zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } +if_stmt_without_else: + T_IF '(' expr ')' statement + { $$ = zend_ast_create_list(1, ZEND_AST_IF, + zend_ast_create(ZEND_AST_IF_ELEM, $3, $5)); } + | if_stmt_without_else T_ELSEIF '(' expr ')' statement + { $$ = zend_ast_list_add($1, + zend_ast_create(ZEND_AST_IF_ELEM, $4, $6)); } ; - -new_elseif_list: - /* empty */ - | new_elseif_list T_ELSEIF parenthesis_expr ':' { zend_do_if_cond(&$3, &$2 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } +if_stmt: + if_stmt_without_else { $$ = $1; } + | if_stmt_without_else T_ELSE statement + { $$ = zend_ast_list_add($1, zend_ast_create(ZEND_AST_IF_ELEM, NULL, $3)); } ; - -else_single: - /* empty */ - | T_ELSE statement +alt_if_stmt_without_else: + T_IF '(' expr ')' ':' inner_statement_list + { $$ = zend_ast_create_list(1, ZEND_AST_IF, + zend_ast_create(ZEND_AST_IF_ELEM, $3, $6)); } + | alt_if_stmt_without_else T_ELSEIF '(' expr ')' ':' inner_statement_list + { $$ = zend_ast_list_add($1, + zend_ast_create(ZEND_AST_IF_ELEM, $4, $7)); } ; - -new_else_single: - /* empty */ - | T_ELSE ':' inner_statement_list +alt_if_stmt: + alt_if_stmt_without_else T_ENDIF ';' { $$ = $1; } + | alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';' + { $$ = zend_ast_list_add($1, + zend_ast_create(ZEND_AST_IF_ELEM, NULL, $4)); } ; - parameter_list: - non_empty_parameter_list - | /* empty */ + non_empty_parameter_list { $$ = $1; } + | /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_PARAM_LIST); } ; non_empty_parameter_list: parameter + { $$ = zend_ast_create_list(1, ZEND_AST_PARAM_LIST, $1); } | non_empty_parameter_list ',' parameter + { $$ = zend_ast_list_add($1, $3); } ; parameter: - optional_class_type is_reference is_variadic T_VARIABLE - { zend_do_receive_param(ZEND_RECV, &$4, NULL, &$1, $2.op_type, $3.op_type TSRMLS_CC); } - | optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar - { zend_do_receive_param(ZEND_RECV_INIT, &$4, &$6, &$1, $2.op_type, $3.op_type TSRMLS_CC); } + optional_type is_reference is_variadic T_VARIABLE + { $$ = zend_ast_create_ex(ZEND_AST_PARAM, $2 | $3, $1, $4, NULL); } + | optional_type is_reference is_variadic T_VARIABLE '=' expr + { $$ = zend_ast_create_ex(ZEND_AST_PARAM, $2 | $3, $1, $4, $6); } ; -optional_class_type: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_ARRAY { $$.op_type = IS_CONST; Z_TYPE($$.u.constant)=IS_ARRAY; } - | T_CALLABLE { $$.op_type = IS_CONST; Z_TYPE($$.u.constant)=IS_CALLABLE; } - | fully_qualified_class_name { $$ = $1; } +optional_type: + /* empty */ { $$ = NULL; } + | T_ARRAY { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); } + | T_CALLABLE { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); } + | name { $$ = $1; } ; - -function_call_parameter_list: - '(' ')' { Z_LVAL($$.u.constant) = 0; } - | '(' non_empty_function_call_parameter_list ')' { $$ = $2; } - | '(' yield_expr ')' { Z_LVAL($$.u.constant) = 1; zend_do_pass_param(&$2, ZEND_SEND_VAL, Z_LVAL($$.u.constant) TSRMLS_CC); } +argument_list: + '(' ')' { $$ = zend_ast_create_list(0, ZEND_AST_ARG_LIST); } + | '(' non_empty_argument_list ')' { $$ = $2; } ; +non_empty_argument_list: + argument + { $$ = zend_ast_create_list(1, ZEND_AST_ARG_LIST, $1); } + | non_empty_argument_list ',' argument + { $$ = zend_ast_list_add($1, $3); } +; -non_empty_function_call_parameter_list: - expr_without_variable { Z_LVAL($$.u.constant) = 1; zend_do_pass_param(&$1, ZEND_SEND_VAL, Z_LVAL($$.u.constant) TSRMLS_CC); } - | variable { Z_LVAL($$.u.constant) = 1; zend_do_pass_param(&$1, ZEND_SEND_VAR, Z_LVAL($$.u.constant) TSRMLS_CC); } - | '&' w_variable { Z_LVAL($$.u.constant) = 1; zend_do_pass_param(&$2, ZEND_SEND_REF, Z_LVAL($$.u.constant) TSRMLS_CC); } - | non_empty_function_call_parameter_list ',' expr_without_variable { Z_LVAL($$.u.constant)=Z_LVAL($1.u.constant)+1; zend_do_pass_param(&$3, ZEND_SEND_VAL, Z_LVAL($$.u.constant) TSRMLS_CC); } - | non_empty_function_call_parameter_list ',' variable { Z_LVAL($$.u.constant)=Z_LVAL($1.u.constant)+1; zend_do_pass_param(&$3, ZEND_SEND_VAR, Z_LVAL($$.u.constant) TSRMLS_CC); } - | non_empty_function_call_parameter_list ',' '&' w_variable { Z_LVAL($$.u.constant)=Z_LVAL($1.u.constant)+1; zend_do_pass_param(&$4, ZEND_SEND_REF, Z_LVAL($$.u.constant) TSRMLS_CC); } +argument: + expr { $$ = $1; } + | T_ELLIPSIS expr { $$ = zend_ast_create(ZEND_AST_UNPACK, $2); } ; global_var_list: - global_var_list ',' global_var { zend_do_fetch_global_variable(&$3, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } - | global_var { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } + global_var_list ',' global_var { $$ = zend_ast_list_add($1, $3); } + | global_var { $$ = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1); } ; - global_var: - T_VARIABLE { $$ = $1; } - | '$' r_variable { $$ = $2; } - | '$' '{' expr '}' { $$ = $3; } + simple_variable + { $$ = zend_ast_create(ZEND_AST_GLOBAL, zend_ast_create(ZEND_AST_VAR, $1)); } ; static_var_list: - static_var_list ',' T_VARIABLE { zend_do_fetch_static_variable(&$3, NULL, ZEND_FETCH_STATIC TSRMLS_CC); } - | static_var_list ',' T_VARIABLE '=' static_scalar { zend_do_fetch_static_variable(&$3, &$5, ZEND_FETCH_STATIC TSRMLS_CC); } - | T_VARIABLE { zend_do_fetch_static_variable(&$1, NULL, ZEND_FETCH_STATIC TSRMLS_CC); } - | T_VARIABLE '=' static_scalar { zend_do_fetch_static_variable(&$1, &$3, ZEND_FETCH_STATIC TSRMLS_CC); } + static_var_list ',' static_var { $$ = zend_ast_list_add($1, $3); } + | static_var { $$ = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1); } +; +static_var: + T_VARIABLE { $$ = zend_ast_create(ZEND_AST_STATIC, $1, NULL); } + | T_VARIABLE '=' expr { $$ = zend_ast_create(ZEND_AST_STATIC, $1, $3); } ; class_statement_list: class_statement_list class_statement + { $$ = zend_ast_list_add($1, $2); } | /* empty */ + { $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; class_statement: - variable_modifiers { CG(access_type) = Z_LVAL($1.u.constant); } class_variable_declaration ';' - | class_constant_declaration ';' - | trait_use_statement - | method_modifiers function is_reference T_STRING { zend_do_begin_function_declaration(&$2, &$4, 1, $3.op_type, &$1 TSRMLS_CC); } - '(' parameter_list ')' - method_body { zend_do_abstract_method(&$4, &$1, &$9 TSRMLS_CC); zend_do_end_function_declaration(&$2 TSRMLS_CC); } + variable_modifiers property_list ';' + { $$ = zend_ast_append_doc_comment($2 TSRMLS_CC); $$->attr = $1; } + | T_CONST class_const_list ';' + { $$ = $2; RESET_DOC_COMMENT(); } + | T_USE name_list trait_adaptations + { $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); } + | method_modifiers function returns_ref T_STRING '(' parameter_list ')' backup_doc_comment + method_body + { $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1, $2, $8, + zend_ast_get_str($4), $6, NULL, $9); } ; -trait_use_statement: - T_USE trait_list trait_adaptations -; - -trait_list: - fully_qualified_class_name { zend_do_use_trait(&$1 TSRMLS_CC); } - | trait_list ',' fully_qualified_class_name { zend_do_use_trait(&$3 TSRMLS_CC); } +name_list: + name { $$ = zend_ast_create_list(1, ZEND_AST_NAME_LIST, $1); } + | name_list ',' name { $$ = zend_ast_list_add($1, $3); } ; trait_adaptations: - ';' - | '{' trait_adaptation_list '}' + ';' { $$ = NULL; } + | '{' '}' { $$ = NULL; } + | '{' trait_adaptation_list '}' { $$ = $2; } ; trait_adaptation_list: - /* empty */ - | non_empty_trait_adaptation_list + trait_adaptation + { $$ = zend_ast_create_list(1, ZEND_AST_TRAIT_ADAPTATIONS, $1); } + | trait_adaptation_list trait_adaptation + { $$ = zend_ast_list_add($1, $2); } ; -non_empty_trait_adaptation_list: - trait_adaptation_statement - | non_empty_trait_adaptation_list trait_adaptation_statement -; - -trait_adaptation_statement: - trait_precedence ';' - | trait_alias ';' +trait_adaptation: + trait_precedence ';' { $$ = $1; } + | trait_alias ';' { $$ = $1; } ; trait_precedence: - trait_method_reference_fully_qualified T_INSTEADOF trait_reference_list { zend_add_trait_precedence(&$1, &$3 TSRMLS_CC); } + absolute_trait_method_reference T_INSTEADOF name_list + { $$ = zend_ast_create(ZEND_AST_TRAIT_PRECEDENCE, $1, $3); } ; -trait_reference_list: - fully_qualified_class_name { zend_resolve_class_name(&$1 TSRMLS_CC); zend_init_list(&$$.u.op.ptr, Z_STRVAL($1.u.constant) TSRMLS_CC); } - | trait_reference_list ',' fully_qualified_class_name { zend_resolve_class_name(&$3 TSRMLS_CC); zend_add_to_list(&$1.u.op.ptr, Z_STRVAL($3.u.constant) TSRMLS_CC); $$ = $1; } +trait_alias: + trait_method_reference T_AS trait_modifiers T_STRING + { $$ = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, $3, $1, $4); } + | trait_method_reference T_AS member_modifier + { $$ = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, $3, $1, NULL); } ; trait_method_reference: - T_STRING { zend_prepare_reference(&$$, NULL, &$1 TSRMLS_CC); } - | trait_method_reference_fully_qualified { $$ = $1; } + T_STRING + { $$ = zend_ast_create(ZEND_AST_METHOD_REFERENCE, NULL, $1); } + | absolute_trait_method_reference { $$ = $1; } ; -trait_method_reference_fully_qualified: - fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_prepare_reference(&$$, &$1, &$3 TSRMLS_CC); } -; - -trait_alias: - trait_method_reference T_AS trait_modifiers T_STRING { zend_add_trait_alias(&$1, &$3, &$4 TSRMLS_CC); } - | trait_method_reference T_AS member_modifier { zend_add_trait_alias(&$1, &$3, NULL TSRMLS_CC); } +absolute_trait_method_reference: + name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$ = zend_ast_create(ZEND_AST_METHOD_REFERENCE, $1, $3); } ; trait_modifiers: - /* empty */ { Z_LVAL($$.u.constant) = 0x0; } /* No change of methods visibility */ - | member_modifier { $$ = $1; } /* REM: Keep in mind, there are not only visibility modifiers */ + /* empty */ { $$ = 0; } + | member_modifier { $$ = $1; } ; method_body: - ';' /* abstract method */ { Z_LVAL($$.u.constant) = ZEND_ACC_ABSTRACT; } - | '{' inner_statement_list '}' { Z_LVAL($$.u.constant) = 0; } + ';' /* abstract method */ { $$ = NULL; } + | '{' inner_statement_list '}' { $$ = $2; } ; variable_modifiers: non_empty_member_modifiers { $$ = $1; } - | T_VAR { Z_LVAL($$.u.constant) = ZEND_ACC_PUBLIC; } + | T_VAR { $$ = ZEND_ACC_PUBLIC; } ; method_modifiers: - /* empty */ { Z_LVAL($$.u.constant) = ZEND_ACC_PUBLIC; } - | non_empty_member_modifiers { $$ = $1; if (!(Z_LVAL($$.u.constant) & ZEND_ACC_PPP_MASK)) { Z_LVAL($$.u.constant) |= ZEND_ACC_PUBLIC; } } + /* empty */ { $$ = ZEND_ACC_PUBLIC; } + | non_empty_member_modifiers + { $$ = $1; if (!($$ & ZEND_ACC_PPP_MASK)) { $$ |= ZEND_ACC_PUBLIC; } } ; non_empty_member_modifiers: - member_modifier { $$ = $1; } - | non_empty_member_modifiers member_modifier { Z_LVAL($$.u.constant) = zend_do_verify_access_types(&$1, &$2); } + member_modifier { $$ = $1; } + | non_empty_member_modifiers member_modifier + { $$ = zend_add_member_modifier($1, $2); } ; member_modifier: - T_PUBLIC { Z_LVAL($$.u.constant) = ZEND_ACC_PUBLIC; } - | T_PROTECTED { Z_LVAL($$.u.constant) = ZEND_ACC_PROTECTED; } - | T_PRIVATE { Z_LVAL($$.u.constant) = ZEND_ACC_PRIVATE; } - | T_STATIC { Z_LVAL($$.u.constant) = ZEND_ACC_STATIC; } - | T_ABSTRACT { Z_LVAL($$.u.constant) = ZEND_ACC_ABSTRACT; } - | T_FINAL { Z_LVAL($$.u.constant) = ZEND_ACC_FINAL; } + T_PUBLIC { $$ = ZEND_ACC_PUBLIC; } + | T_PROTECTED { $$ = ZEND_ACC_PROTECTED; } + | T_PRIVATE { $$ = ZEND_ACC_PRIVATE; } + | T_STATIC { $$ = ZEND_ACC_STATIC; } + | T_ABSTRACT { $$ = ZEND_ACC_ABSTRACT; } + | T_FINAL { $$ = ZEND_ACC_FINAL; } ; -class_variable_declaration: - class_variable_declaration ',' T_VARIABLE { zend_do_declare_property(&$3, NULL, CG(access_type) TSRMLS_CC); } - | class_variable_declaration ',' T_VARIABLE '=' static_scalar { zend_do_declare_property(&$3, &$5, CG(access_type) TSRMLS_CC); } - | T_VARIABLE { zend_do_declare_property(&$1, NULL, CG(access_type) TSRMLS_CC); } - | T_VARIABLE '=' static_scalar { zend_do_declare_property(&$1, &$3, CG(access_type) TSRMLS_CC); } +property_list: + property_list ',' property { $$ = zend_ast_list_add($1, $3); } + | property { $$ = zend_ast_create_list(1, ZEND_AST_PROP_DECL, $1); } ; -class_constant_declaration: - class_constant_declaration ',' T_STRING '=' static_scalar { zend_do_declare_class_constant(&$3, &$5 TSRMLS_CC); } - | T_CONST T_STRING '=' static_scalar { zend_do_declare_class_constant(&$2, &$4 TSRMLS_CC); } +property: + T_VARIABLE { $$ = zend_ast_create(ZEND_AST_PROP_ELEM, $1, NULL); } + | T_VARIABLE '=' expr + { $$ = zend_ast_create(ZEND_AST_PROP_ELEM, $1, $3); } ; -echo_expr_list: - echo_expr_list ',' expr { zend_do_echo(&$3 TSRMLS_CC); } - | expr { zend_do_echo(&$1 TSRMLS_CC); } +class_const_list: + class_const_list ',' const_decl { $$ = zend_ast_list_add($1, $3); } + | const_decl { $$ = zend_ast_create_list(1, ZEND_AST_CLASS_CONST_DECL, $1); } ; - -for_expr: - /* empty */ { $$.op_type = IS_CONST; Z_TYPE($$.u.constant) = IS_BOOL; Z_LVAL($$.u.constant) = 1; } - | non_empty_for_expr { $$ = $1; } +const_decl: + T_STRING '=' expr { $$ = zend_ast_create(ZEND_AST_CONST_ELEM, $1, $3); } ; -non_empty_for_expr: - non_empty_for_expr ',' { zend_do_free(&$1 TSRMLS_CC); } expr { $$ = $4; } - | expr { $$ = $1; } +echo_expr_list: + echo_expr_list ',' echo_expr { $$ = zend_ast_list_add($1, $3); } + | echo_expr { $$ = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1); } ; - -chaining_method_or_property: - chaining_method_or_property variable_property { $$.EA = $2.EA; } - | variable_property { $$.EA = $1.EA; } +echo_expr: + expr { $$ = zend_ast_create(ZEND_AST_ECHO, $1); } ; -chaining_dereference: - chaining_dereference '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | '[' dim_offset ']' { zend_do_pop_object(&$1 TSRMLS_CC); fetch_array_dim(&$$, &$1, &$2 TSRMLS_CC); } +for_exprs: + /* empty */ { $$ = NULL; } + | non_empty_for_exprs { $$ = $1; } ; -chaining_instance_call: - chaining_dereference { zend_do_push_object(&$1 TSRMLS_CC); } chaining_method_or_property { $$ = $3; } - | chaining_dereference { zend_do_push_object(&$1 TSRMLS_CC); $$ = $1; } - | chaining_method_or_property { $$ = $1; } -; - -instance_call: - /* empty */ { $$ = $0; } - | { zend_do_push_object(&$0 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); } - chaining_instance_call { zend_do_pop_object(&$$ TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); } +non_empty_for_exprs: + non_empty_for_exprs ',' expr { $$ = zend_ast_list_add($1, $3); } + | expr { $$ = zend_ast_create_list(1, ZEND_AST_EXPR_LIST, $1); } ; new_expr: - T_NEW class_name_reference { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$1, &$4 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} + T_NEW class_name_reference ctor_arguments + { $$ = zend_ast_create(ZEND_AST_NEW, $2, $3); } ; expr_without_variable: - T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' '=' expr { zend_do_list_end(&$$, &$7 TSRMLS_CC); } - | variable '=' expr { zend_check_writable_variable(&$1); zend_do_assign(&$$, &$1, &$3 TSRMLS_CC); } - | variable '=' '&' variable { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$4, BP_VAR_W, 1 TSRMLS_CC); zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$4 TSRMLS_CC); } - | variable '=' '&' T_NEW class_name_reference { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); zend_check_writable_variable(&$1); zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4, &$7 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); $3.EA = ZEND_PARSED_NEW; zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); } - | T_CLONE expr { zend_do_clone(&$$, &$2 TSRMLS_CC); } - | variable T_PLUS_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_ADD, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_MINUS_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SUB, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_MUL_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_MUL, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_DIV_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_DIV, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_CONCAT_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_CONCAT, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_MOD_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_MOD, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_AND_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_AND, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_OR_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_OR, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_XOR_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_SL_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SL, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_SR_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SR, &$$, &$1, &$3 TSRMLS_CC); } - | rw_variable T_INC { zend_do_post_incdec(&$$, &$1, ZEND_POST_INC TSRMLS_CC); } - | T_INC rw_variable { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_INC TSRMLS_CC); } - | rw_variable T_DEC { zend_do_post_incdec(&$$, &$1, ZEND_POST_DEC TSRMLS_CC); } - | T_DEC rw_variable { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_DEC TSRMLS_CC); } - | expr T_BOOLEAN_OR { zend_do_boolean_or_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_or_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_BOOLEAN_AND { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_LOGICAL_OR { zend_do_boolean_or_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_or_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_LOGICAL_AND { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_LOGICAL_XOR expr { zend_do_binary_op(ZEND_BOOL_XOR, &$$, &$1, &$3 TSRMLS_CC); } - | expr '|' expr { zend_do_binary_op(ZEND_BW_OR, &$$, &$1, &$3 TSRMLS_CC); } - | expr '&' expr { zend_do_binary_op(ZEND_BW_AND, &$$, &$1, &$3 TSRMLS_CC); } - | expr '^' expr { zend_do_binary_op(ZEND_BW_XOR, &$$, &$1, &$3 TSRMLS_CC); } - | expr '.' expr { zend_do_binary_op(ZEND_CONCAT, &$$, &$1, &$3 TSRMLS_CC); } - | expr '+' expr { zend_do_binary_op(ZEND_ADD, &$$, &$1, &$3 TSRMLS_CC); } - | expr '-' expr { zend_do_binary_op(ZEND_SUB, &$$, &$1, &$3 TSRMLS_CC); } - | expr '*' expr { zend_do_binary_op(ZEND_MUL, &$$, &$1, &$3 TSRMLS_CC); } - | expr '/' expr { zend_do_binary_op(ZEND_DIV, &$$, &$1, &$3 TSRMLS_CC); } - | expr '%' expr { zend_do_binary_op(ZEND_MOD, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_SL expr { zend_do_binary_op(ZEND_SL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_SR expr { zend_do_binary_op(ZEND_SR, &$$, &$1, &$3 TSRMLS_CC); } - | '+' expr %prec T_INC { ZVAL_LONG(&$1.u.constant, 0); if ($2.op_type == IS_CONST) { add_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } else { $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); zend_do_binary_op(ZEND_ADD, &$$, &$1, &$2 TSRMLS_CC); } } - | '-' expr %prec T_INC { ZVAL_LONG(&$1.u.constant, 0); if ($2.op_type == IS_CONST) { sub_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } else { $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); zend_do_binary_op(ZEND_SUB, &$$, &$1, &$2 TSRMLS_CC); } } - | '!' expr { zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$2 TSRMLS_CC); } - | '~' expr { zend_do_unary_op(ZEND_BW_NOT, &$$, &$2 TSRMLS_CC); } - | expr T_IS_IDENTICAL expr { zend_do_binary_op(ZEND_IS_IDENTICAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_NOT_IDENTICAL expr { zend_do_binary_op(ZEND_IS_NOT_IDENTICAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_EQUAL expr { zend_do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_NOT_EQUAL expr { zend_do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr '<' expr { zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_SMALLER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr '>' expr { zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 TSRMLS_CC); } - | expr T_IS_GREATER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 TSRMLS_CC); } - | expr T_INSTANCEOF class_name_reference { zend_do_instanceof(&$$, &$1, &$3, 0 TSRMLS_CC); } - | parenthesis_expr { $$ = $1; } - | new_expr { $$ = $1; } - | '(' new_expr ')' { $$ = $2; } instance_call { $$ = $5; } - | expr '?' { zend_do_begin_qm_op(&$1, &$2 TSRMLS_CC); } - expr ':' { zend_do_qm_true(&$4, &$2, &$5 TSRMLS_CC); } - expr { zend_do_qm_false(&$$, &$7, &$2, &$5 TSRMLS_CC); } - | expr '?' ':' { zend_do_jmp_set(&$1, &$2, &$3 TSRMLS_CC); } - expr { zend_do_jmp_set_else(&$$, &$5, &$2, &$3 TSRMLS_CC); } + T_LIST '(' assignment_list ')' '=' expr + { $$ = zend_ast_create(ZEND_AST_ASSIGN, $3, $6); } + | variable '=' expr + { $$ = zend_ast_create(ZEND_AST_ASSIGN, $1, $3); } + | variable '=' '&' variable + { $$ = zend_ast_create(ZEND_AST_ASSIGN_REF, $1, $4); } + | variable '=' '&' new_expr + { $$ = zend_ast_create(ZEND_AST_ASSIGN_REF, $1, $4); } + | T_CLONE expr { $$ = zend_ast_create(ZEND_AST_CLONE, $2); } + | variable T_PLUS_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1, $3); } + | variable T_MINUS_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_SUB, $1, $3); } + | variable T_MUL_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_MUL, $1, $3); } + | variable T_POW_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_POW, $1, $3); } + | variable T_DIV_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_DIV, $1, $3); } + | variable T_CONCAT_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_CONCAT, $1, $3); } + | variable T_MOD_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_MOD, $1, $3); } + | variable T_AND_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_BW_AND, $1, $3); } + | variable T_OR_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_BW_OR, $1, $3); } + | variable T_XOR_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_BW_XOR, $1, $3); } + | variable T_SL_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1, $3); } + | variable T_SR_EQUAL expr + { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1, $3); } + | variable T_INC { $$ = zend_ast_create(ZEND_AST_POST_INC, $1); } + | T_INC variable { $$ = zend_ast_create(ZEND_AST_PRE_INC, $2); } + | variable T_DEC { $$ = zend_ast_create(ZEND_AST_POST_DEC, $1); } + | T_DEC variable { $$ = zend_ast_create(ZEND_AST_PRE_DEC, $2); } + | expr T_BOOLEAN_OR expr + { $$ = zend_ast_create(ZEND_AST_OR, $1, $3); } + | expr T_BOOLEAN_AND expr + { $$ = zend_ast_create(ZEND_AST_AND, $1, $3); } + | expr T_LOGICAL_OR expr + { $$ = zend_ast_create(ZEND_AST_OR, $1, $3); } + | expr T_LOGICAL_AND expr + { $$ = zend_ast_create(ZEND_AST_AND, $1, $3); } + | expr T_LOGICAL_XOR expr + { $$ = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1, $3); } + | expr '|' expr { $$ = zend_ast_create_binary_op(ZEND_BW_OR, $1, $3); } + | expr '&' expr { $$ = zend_ast_create_binary_op(ZEND_BW_AND, $1, $3); } + | expr '^' expr { $$ = zend_ast_create_binary_op(ZEND_BW_XOR, $1, $3); } + | expr '.' expr { $$ = zend_ast_create_binary_op(ZEND_CONCAT, $1, $3); } + | expr '+' expr { $$ = zend_ast_create_binary_op(ZEND_ADD, $1, $3); } + | expr '-' expr { $$ = zend_ast_create_binary_op(ZEND_SUB, $1, $3); } + | expr '*' expr { $$ = zend_ast_create_binary_op(ZEND_MUL, $1, $3); } + | expr T_POW expr { $$ = zend_ast_create_binary_op(ZEND_POW, $1, $3); } + | expr '/' expr { $$ = zend_ast_create_binary_op(ZEND_DIV, $1, $3); } + | expr '%' expr { $$ = zend_ast_create_binary_op(ZEND_MOD, $1, $3); } + | expr T_SL expr { $$ = zend_ast_create_binary_op(ZEND_SL, $1, $3); } + | expr T_SR expr { $$ = zend_ast_create_binary_op(ZEND_SR, $1, $3); } + | '+' expr %prec T_INC { $$ = zend_ast_create(ZEND_AST_UNARY_PLUS, $2); } + | '-' expr %prec T_INC { $$ = zend_ast_create(ZEND_AST_UNARY_MINUS, $2); } + | '!' expr { $$ = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, $2); } + | '~' expr { $$ = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BW_NOT, $2); } + | expr T_IS_IDENTICAL expr + { $$ = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1, $3); } + | expr T_IS_NOT_IDENTICAL expr + { $$ = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, $1, $3); } + | expr T_IS_EQUAL expr + { $$ = zend_ast_create_binary_op(ZEND_IS_EQUAL, $1, $3); } + | expr T_IS_NOT_EQUAL expr + { $$ = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1, $3); } + | expr '<' expr + { $$ = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1, $3); } + | expr T_IS_SMALLER_OR_EQUAL expr + { $$ = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1, $3); } + | expr '>' expr + { $$ = zend_ast_create(ZEND_AST_GREATER, $1, $3); } + | expr T_IS_GREATER_OR_EQUAL expr + { $$ = zend_ast_create(ZEND_AST_GREATER_EQUAL, $1, $3); } + | expr T_INSTANCEOF class_name_reference + { $$ = zend_ast_create(ZEND_AST_INSTANCEOF, $1, $3); } + | '(' expr ')' { $$ = $2; } + | new_expr { $$ = $1; } + | expr '?' expr ':' expr + { $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, $3, $5); } + | expr '?' ':' expr + { $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, NULL, $4); } + | expr T_COALESCE expr + { $$ = zend_ast_create(ZEND_AST_COALESCE, $1, $3); } | internal_functions_in_yacc { $$ = $1; } - | T_INT_CAST expr { zend_do_cast(&$$, &$2, IS_LONG TSRMLS_CC); } - | T_DOUBLE_CAST expr { zend_do_cast(&$$, &$2, IS_DOUBLE TSRMLS_CC); } - | T_STRING_CAST expr { zend_do_cast(&$$, &$2, IS_STRING TSRMLS_CC); } - | T_ARRAY_CAST expr { zend_do_cast(&$$, &$2, IS_ARRAY TSRMLS_CC); } - | T_OBJECT_CAST expr { zend_do_cast(&$$, &$2, IS_OBJECT TSRMLS_CC); } - | T_BOOL_CAST expr { zend_do_cast(&$$, &$2, IS_BOOL TSRMLS_CC); } - | T_UNSET_CAST expr { zend_do_cast(&$$, &$2, IS_NULL TSRMLS_CC); } - | T_EXIT exit_expr { zend_do_exit(&$$, &$2 TSRMLS_CC); } - | '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; } - | scalar { $$ = $1; } - | combined_scalar_offset { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); } - | combined_scalar { $$ = $1; } - | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); } - | T_PRINT expr { zend_do_print(&$$, &$2 TSRMLS_CC); } - | T_YIELD { zend_do_yield(&$$, NULL, NULL, 0 TSRMLS_CC); } - | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } - '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; } - | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } - '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; } -; - -yield_expr: - T_YIELD expr_without_variable { zend_do_yield(&$$, &$2, NULL, 0 TSRMLS_CC); } - | T_YIELD variable { zend_do_yield(&$$, &$2, NULL, 1 TSRMLS_CC); } - | T_YIELD expr T_DOUBLE_ARROW expr_without_variable { zend_do_yield(&$$, &$4, &$2, 0 TSRMLS_CC); } - | T_YIELD expr T_DOUBLE_ARROW variable { zend_do_yield(&$$, &$4, &$2, 1 TSRMLS_CC); } -; - -combined_scalar_offset: - combined_scalar '[' dim_offset ']' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | combined_scalar_offset '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' { $1.EA = 0; zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - -combined_scalar: - T_ARRAY '(' array_pair_list ')' { $$ = $3; } - | '[' array_pair_list ']' { $$ = $2; } - -function: - T_FUNCTION { $$.u.op.opline_num = CG(zend_lineno); } + | T_INT_CAST expr { $$ = zend_ast_create_cast(IS_LONG, $2); } + | T_DOUBLE_CAST expr { $$ = zend_ast_create_cast(IS_DOUBLE, $2); } + | T_STRING_CAST expr { $$ = zend_ast_create_cast(IS_STRING, $2); } + | T_ARRAY_CAST expr { $$ = zend_ast_create_cast(IS_ARRAY, $2); } + | T_OBJECT_CAST expr { $$ = zend_ast_create_cast(IS_OBJECT, $2); } + | T_BOOL_CAST expr { $$ = zend_ast_create_cast(_IS_BOOL, $2); } + | T_UNSET_CAST expr { $$ = zend_ast_create_cast(IS_NULL, $2); } + | T_EXIT exit_expr { $$ = zend_ast_create(ZEND_AST_EXIT, $2); } + | '@' expr { $$ = zend_ast_create(ZEND_AST_SILENCE, $2); } + | scalar { $$ = $1; } + | '`' backticks_expr '`' { $$ = zend_ast_create(ZEND_AST_SHELL_EXEC, $2); } + | T_PRINT expr { $$ = zend_ast_create(ZEND_AST_PRINT, $2); } + | T_YIELD { $$ = zend_ast_create(ZEND_AST_YIELD, NULL, NULL); } + | T_YIELD expr { $$ = zend_ast_create(ZEND_AST_YIELD, $2, NULL); } + | T_YIELD expr T_DOUBLE_ARROW expr { $$ = zend_ast_create(ZEND_AST_YIELD, $4, $2); } + | function returns_ref '(' parameter_list ')' lexical_vars backup_doc_comment + '{' inner_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLOSURE, $2, $1, $7, + zend_string_init("{closure}", sizeof("{closure}") - 1, 0), + $4, $6, $9); } + | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars backup_doc_comment + '{' inner_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLOSURE, $3 | ZEND_ACC_STATIC, $2, $8, + zend_string_init("{closure}", sizeof("{closure}") - 1, 0), + $5, $7, $10); } ; -lexical_vars: - /* empty */ - | T_USE '(' lexical_var_list ')' +function: + T_FUNCTION { $$ = CG(zend_lineno); } ; -lexical_var_list: - lexical_var_list ',' T_VARIABLE { zend_do_fetch_lexical_variable(&$3, 0 TSRMLS_CC); } - | lexical_var_list ',' '&' T_VARIABLE { zend_do_fetch_lexical_variable(&$4, 1 TSRMLS_CC); } - | T_VARIABLE { zend_do_fetch_lexical_variable(&$1, 0 TSRMLS_CC); } - | '&' T_VARIABLE { zend_do_fetch_lexical_variable(&$2, 1 TSRMLS_CC); } +backup_doc_comment: + /* empty */ { $$ = CG(doc_comment); CG(doc_comment) = NULL; } ; -function_call: - namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$1, 1 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, &$3, 0, $2.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $1.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$1.u.constant); zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $$.u.op.opline_num = zend_do_begin_function_call(&$1, 0 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, &$5, 0, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | T_NS_SEPARATOR namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$2, 0 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$2, &$$, &$4, 0, $3.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | class_name T_PAAMAYIM_NEKUDOTAYIM variable_name { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call($4.u.op.opline_num?NULL:&$3, &$$, &$5, $4.u.op.opline_num, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { zend_do_end_variable_parse(&$3, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(NULL, &$$, &$5, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_name { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(NULL, &$$, &$5, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { zend_do_end_variable_parse(&$3, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(NULL, &$$, &$5, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_without_objects { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, &$3, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} +returns_ref: + /* empty */ { $$ = 0; } + | '&' { $$ = ZEND_ACC_RETURN_REFERENCE; } ; -class_name: - T_STATIC { $$.op_type = IS_CONST; ZVAL_STRINGL(&$$.u.constant, "static", sizeof("static")-1, 1);} - | namespace_name { $$ = $1; } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); $$ = $2; } +lexical_vars: + /* empty */ { $$ = NULL; } + | T_USE '(' lexical_var_list ')' { $$ = $3; } ; -fully_qualified_class_name: - namespace_name { $$ = $1; } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); $$ = $2; } +lexical_var_list: + lexical_var_list ',' lexical_var { $$ = zend_ast_list_add($1, $3); } + | lexical_var { $$ = zend_ast_create_list(1, ZEND_AST_CLOSURE_USES, $1); } ; - - -class_name_reference: - class_name { zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } - | dynamic_class_name_reference { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } +lexical_var: + T_VARIABLE { $$ = $1; } + | '&' T_VARIABLE { $$ = $2; $$->attr = 1; } ; - -dynamic_class_name_reference: - base_variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } - object_property { zend_do_push_object(&$4 TSRMLS_CC); } dynamic_class_name_variable_properties - { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } - | base_variable { $$ = $1; } +function_call: + name argument_list + { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); } + | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list + { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list + { $$ = zend_ast_create(ZEND_AST_STATIC_CALL, $1, $3, $4); } + | callable_expr argument_list + { $$ = zend_ast_create(ZEND_AST_CALL, $1, $2); } ; - -dynamic_class_name_variable_properties: - dynamic_class_name_variable_properties dynamic_class_name_variable_property - | /* empty */ +class_name: + T_STATIC + { zval zv; ZVAL_STRINGL(&zv, "static", sizeof("static")-1); + $$ = zend_ast_create_zval_ex(&zv, ZEND_NAME_NOT_FQ); } + | name { $$ = $1; } ; - -dynamic_class_name_variable_property: - T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } +class_name_reference: + class_name { $$ = $1; } + | new_variable { $$ = $1; } ; exit_expr: - /* empty */ { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; } - | '(' ')' { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; } - | parenthesis_expr { $$ = $1; } + /* empty */ { $$ = NULL; } + | '(' optional_expr ')' { $$ = $2; } ; backticks_expr: - /* empty */ { ZVAL_EMPTY_STRING(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; } - | T_ENCAPSED_AND_WHITESPACE { $$ = $1; } - | encaps_list { $$ = $1; } + /* empty */ + { $$ = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } + | T_ENCAPSED_AND_WHITESPACE { $$ = $1; } + | encaps_list { $$ = $1; } ; ctor_arguments: - /* empty */ { Z_LVAL($$.u.constant) = 0; } - | function_call_parameter_list { $$ = $1; } -; - - -common_scalar: - T_LNUMBER { $$ = $1; } - | T_DNUMBER { $$ = $1; } - | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } - | T_LINE { $$ = $1; } - | T_FILE { $$ = $1; } - | T_DIR { $$ = $1; } - | T_TRAIT_C { $$ = $1; } - | T_METHOD_C { $$ = $1; } - | T_FUNC_C { $$ = $1; } - | T_NS_C { $$ = $1; } - | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = $2; } - | T_START_HEREDOC T_END_HEREDOC { ZVAL_EMPTY_STRING(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; } + /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_ARG_LIST); } + | argument_list { $$ = $1; } ; -static_scalar: /* compile-time evaluated scalars */ - common_scalar { $$ = $1; } - | static_class_name_scalar { $$ = $1; } - | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); } - | '+' static_scalar { ZVAL_LONG(&$1.u.constant, 0); add_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } - | '-' static_scalar { ZVAL_LONG(&$1.u.constant, 0); sub_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } - | T_ARRAY '(' static_array_pair_list ')' { $$ = $3; Z_TYPE($$.u.constant) = IS_CONSTANT_ARRAY; } - | '[' static_array_pair_list ']' { $$ = $2; Z_TYPE($$.u.constant) = IS_CONSTANT_ARRAY; } - | static_class_constant { $$ = $1; } - | T_CLASS_C { $$ = $1; } -; - -static_class_constant: - class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_CT, 0 TSRMLS_CC); } +dereferencable_scalar: + T_ARRAY '(' array_pair_list ')' { $$ = $3; } + | '[' array_pair_list ']' { $$ = $2; } + | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } ; scalar: - T_STRING_VARNAME { $$ = $1; } - | class_name_scalar { $$ = $1; } - | class_constant { $$ = $1; } - | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_RT, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_RT, 0 TSRMLS_CC); } - | common_scalar { $$ = $1; } + T_LNUMBER { $$ = $1; } + | T_DNUMBER { $$ = $1; } + | T_LINE { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_LINE); } + | T_FILE { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FILE); } + | T_DIR { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_DIR); } + | T_TRAIT_C { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_TRAIT_C); } + | T_METHOD_C { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_METHOD_C); } + | T_FUNC_C { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FUNC_C); } + | T_NS_C { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_NS_C); } + | T_CLASS_C { $$ = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_CLASS_C); } + | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = $2; } + | T_START_HEREDOC T_END_HEREDOC + { $$ = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } | '"' encaps_list '"' { $$ = $2; } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; } - | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_CONSTANT) {zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC);} else {$$ = $1;} } + | dereferencable_scalar { $$ = $1; } + | class_name_scalar { $$ = $1; } + | constant { $$ = $1; } ; - -static_array_pair_list: - /* empty */ { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); } - | non_empty_static_array_pair_list possible_comma { $$ = $1; } +constant: + name { $$ = zend_ast_create(ZEND_AST_CONST, $1); } + | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$ = zend_ast_create(ZEND_AST_CLASS_CONST, $1, $3); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$ = zend_ast_create(ZEND_AST_CLASS_CONST, $1, $3); } ; possible_comma: @@ -990,232 +969,190 @@ possible_comma: | ',' ; -non_empty_static_array_pair_list: - non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW static_scalar { zend_do_add_static_array_element(&$$, &$3, &$5); } - | non_empty_static_array_pair_list ',' static_scalar { zend_do_add_static_array_element(&$$, NULL, &$3); } - | static_scalar T_DOUBLE_ARROW static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); zend_do_add_static_array_element(&$$, &$1, &$3); } - | static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); zend_do_add_static_array_element(&$$, NULL, &$1); } -; - expr: - r_variable { $$ = $1; } + variable { $$ = $1; } | expr_without_variable { $$ = $1; } ; -parenthesis_expr: - '(' expr ')' { $$ = $2; } - | '(' yield_expr ')' { $$ = $2; } -; - - -r_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } -; - - -w_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); $$ = $1; - zend_check_writable_variable(&$1); } -; - -rw_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); $$ = $1; - zend_check_writable_variable(&$1); } -; - -variable: - base_variable_with_function_calls T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } - object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not variable_properties - { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $1.EA | ($7.EA ? $7.EA : $6.EA); } - | base_variable_with_function_calls { $$ = $1; } -; - -variable_properties: - variable_properties variable_property { $$.EA = $2.EA; } - | /* empty */ { $$.EA = 0; } -; - - -variable_property: - T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not { $$.EA = $4.EA; } -; - -array_method_dereference: - array_method_dereference '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | method '[' dim_offset ']' { $1.EA = ZEND_PARSED_METHOD_CALL; fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } -; - -method: - { zend_do_pop_object(&$$ TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, &$2, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } -; - -method_or_not: - method { $$ = $1; $$.EA = ZEND_PARSED_METHOD_CALL; zend_do_push_object(&$$ TSRMLS_CC); } - | array_method_dereference { $$ = $1; zend_do_push_object(&$$ TSRMLS_CC); } - | /* empty */ { $$.EA = ZEND_PARSED_MEMBER; } -; - -variable_without_objects: - reference_variable { $$ = $1; } - | simple_indirect_reference reference_variable { zend_do_indirect_references(&$$, &$1, &$2 TSRMLS_CC); } -; - -static_member: - class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { $$ = $3; zend_do_fetch_static_member(&$$, &$1 TSRMLS_CC); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { $$ = $3; zend_do_fetch_static_member(&$$, &$1 TSRMLS_CC); } - +optional_expr: + /* empty */ { $$ = NULL; } + | expr { $$ = $1; } ; variable_class_name: - reference_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } + dereferencable { $$ = $1; } ; -array_function_dereference: - array_function_dereference '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $1.EA = ZEND_PARSED_FUNCTION_CALL; } - '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } +dereferencable: + variable { $$ = $1; } + | '(' expr ')' { $$ = $2; } + | dereferencable_scalar { $$ = $1; } ; -base_variable_with_function_calls: - base_variable { $$ = $1; } - | array_function_dereference { $$ = $1; } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } +callable_expr: + callable_variable { $$ = $1; } + | '(' expr ')' { $$ = $2; } + | dereferencable_scalar { $$ = $1; } ; - -base_variable: - reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } - | simple_indirect_reference reference_variable { zend_do_indirect_references(&$$, &$1, &$2 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } +callable_variable: + simple_variable + { $$ = zend_ast_create(ZEND_AST_VAR, $1); } + | dereferencable '[' optional_expr ']' + { $$ = zend_ast_create(ZEND_AST_DIM, $1, $3); } + | constant '[' optional_expr ']' + { $$ = zend_ast_create(ZEND_AST_DIM, $1, $3); } + | dereferencable '{' expr '}' + { $$ = zend_ast_create(ZEND_AST_DIM, $1, $3); } + | dereferencable T_OBJECT_OPERATOR member_name argument_list + { $$ = zend_ast_create(ZEND_AST_METHOD_CALL, $1, $3, $4); } + | function_call { $$ = $1; } ; -reference_variable: - reference_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | reference_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | compound_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } +variable: + callable_variable + { $$ = $1; } + | static_member + { $$ = $1; } + | dereferencable T_OBJECT_OPERATOR member_name + { $$ = zend_ast_create(ZEND_AST_PROP, $1, $3); } ; - -compound_variable: +simple_variable: T_VARIABLE { $$ = $1; } | '$' '{' expr '}' { $$ = $3; } + | '$' simple_variable { $$ = zend_ast_create(ZEND_AST_VAR, $2); } ; -dim_offset: - /* empty */ { $$.op_type = IS_UNUSED; } - | expr { $$ = $1; } -; - - -object_property: - object_dim_list { $$ = $1; } - | variable_without_objects { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); } { znode tmp_znode; zend_do_pop_object(&tmp_znode TSRMLS_CC); zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);} -; - -object_dim_list: - object_dim_list '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | object_dim_list '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | variable_name { znode tmp_znode; zend_do_pop_object(&tmp_znode TSRMLS_CC); zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);} -; - -variable_name: +static_member: + class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable + { $$ = zend_ast_create(ZEND_AST_STATIC_PROP, $1, $3); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable + { $$ = zend_ast_create(ZEND_AST_STATIC_PROP, $1, $3); } +; + +new_variable: + simple_variable + { $$ = zend_ast_create(ZEND_AST_VAR, $1); } + | new_variable '[' optional_expr ']' + { $$ = zend_ast_create(ZEND_AST_DIM, $1, $3); } + | new_variable '{' expr '}' + { $$ = zend_ast_create(ZEND_AST_DIM, $1, $3); } + | new_variable T_OBJECT_OPERATOR member_name + { $$ = zend_ast_create(ZEND_AST_PROP, $1, $3); } + | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable + { $$ = zend_ast_create(ZEND_AST_STATIC_PROP, $1, $3); } + | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable + { $$ = zend_ast_create(ZEND_AST_STATIC_PROP, $1, $3); } +; + +member_name: T_STRING { $$ = $1; } | '{' expr '}' { $$ = $2; } -; - -simple_indirect_reference: - '$' { Z_LVAL($$.u.constant) = 1; } - | simple_indirect_reference '$' { Z_LVAL($$.u.constant)++; } + | simple_variable { $$ = zend_ast_create(ZEND_AST_VAR, $1); } ; assignment_list: assignment_list ',' assignment_list_element + { $$ = zend_ast_list_add($1, $3); } | assignment_list_element + { $$ = zend_ast_create_list(1, ZEND_AST_LIST, $1); } ; - assignment_list_element: - variable { zend_do_add_list_element(&$1 TSRMLS_CC); } - | T_LIST '(' { zend_do_new_list_begin(TSRMLS_C); } assignment_list ')' { zend_do_new_list_end(TSRMLS_C); } - | /* empty */ { zend_do_add_list_element(NULL TSRMLS_CC); } + variable { $$ = $1; } + | T_LIST '(' assignment_list ')' { $$ = $3; } + | /* empty */ { $$ = NULL; } ; array_pair_list: - /* empty */ { zend_do_init_array(&$$, NULL, NULL, 0 TSRMLS_CC); } - | non_empty_array_pair_list possible_comma { $$ = $1; } + /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_ARRAY); } + | non_empty_array_pair_list possible_comma { $$ = $1; } ; non_empty_array_pair_list: - non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr { zend_do_add_array_element(&$$, &$5, &$3, 0 TSRMLS_CC); } - | non_empty_array_pair_list ',' expr { zend_do_add_array_element(&$$, &$3, NULL, 0 TSRMLS_CC); } - | expr T_DOUBLE_ARROW expr { zend_do_init_array(&$$, &$3, &$1, 0 TSRMLS_CC); } - | expr { zend_do_init_array(&$$, &$1, NULL, 0 TSRMLS_CC); } - | non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable { zend_do_add_array_element(&$$, &$6, &$3, 1 TSRMLS_CC); } - | non_empty_array_pair_list ',' '&' w_variable { zend_do_add_array_element(&$$, &$4, NULL, 1 TSRMLS_CC); } - | expr T_DOUBLE_ARROW '&' w_variable { zend_do_init_array(&$$, &$4, &$1, 1 TSRMLS_CC); } - | '&' w_variable { zend_do_init_array(&$$, &$2, NULL, 1 TSRMLS_CC); } + non_empty_array_pair_list ',' array_pair + { $$ = zend_ast_list_add($1, $3); } + | array_pair + { $$ = zend_ast_create_list(1, ZEND_AST_ARRAY, $1); } ; -encaps_list: - encaps_list encaps_var { zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, &$1, &$2 TSRMLS_CC); } - | encaps_list T_ENCAPSED_AND_WHITESPACE { zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); } - | encaps_var { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, NULL, &$1 TSRMLS_CC); } - | T_ENCAPSED_AND_WHITESPACE encaps_var { zend_do_add_string(&$$, NULL, &$1 TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, &$$, &$2 TSRMLS_CC); } +array_pair: + expr T_DOUBLE_ARROW expr + { $$ = zend_ast_create(ZEND_AST_ARRAY_ELEM, $3, $1); } + | expr { $$ = zend_ast_create(ZEND_AST_ARRAY_ELEM, $1, NULL); } + | expr T_DOUBLE_ARROW '&' variable + { $$ = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, $4, $1); } + | '&' variable + { $$ = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, $2, NULL); } ; - +encaps_list: + encaps_list encaps_var + { $$ = zend_ast_list_add($1, $2); } + | encaps_list T_ENCAPSED_AND_WHITESPACE + { $$ = zend_ast_list_add($1, $2); } + | encaps_var + { $$ = zend_ast_create_list(1, ZEND_AST_ENCAPS_LIST, $1); } + | T_ENCAPSED_AND_WHITESPACE encaps_var + { $$ = zend_ast_create_list(2, ZEND_AST_ENCAPS_LIST, $1, $2); } +; encaps_var: - T_VARIABLE { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } - | T_VARIABLE '[' { zend_do_begin_variable_parse(TSRMLS_C); } encaps_var_offset ']' { fetch_array_begin(&$$, &$1, &$4 TSRMLS_CC); } - | T_VARIABLE T_OBJECT_OPERATOR T_STRING { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$2, &$1, 1 TSRMLS_CC); zend_do_fetch_property(&$$, &$2, &$3 TSRMLS_CC); } - | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$2, 1 TSRMLS_CC); } - | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_begin(&$$, &$2, &$4 TSRMLS_CC); } + T_VARIABLE + { $$ = zend_ast_create(ZEND_AST_VAR, $1); } + | T_VARIABLE '[' encaps_var_offset ']' + { $$ = zend_ast_create(ZEND_AST_DIM, + zend_ast_create(ZEND_AST_VAR, $1), $3); } + | T_VARIABLE T_OBJECT_OPERATOR T_STRING + { $$ = zend_ast_create(ZEND_AST_PROP, + zend_ast_create(ZEND_AST_VAR, $1), $3); } + | T_DOLLAR_OPEN_CURLY_BRACES expr '}' + { $$ = zend_ast_create(ZEND_AST_VAR, $2); } + | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' + { $$ = zend_ast_create(ZEND_AST_VAR, $2); } + | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' + { $$ = zend_ast_create(ZEND_AST_DIM, + zend_ast_create(ZEND_AST_VAR, $2), $4); } | T_CURLY_OPEN variable '}' { $$ = $2; } ; - encaps_var_offset: T_STRING { $$ = $1; } | T_NUM_STRING { $$ = $1; } - | T_VARIABLE { fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } + | T_VARIABLE { $$ = zend_ast_create(ZEND_AST_VAR, $1); } ; internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$ = $3; } - | T_EMPTY '(' variable ')' { zend_do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 TSRMLS_CC); } - | T_EMPTY '(' expr_without_variable ')' { zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$3 TSRMLS_CC); } - | T_INCLUDE expr { zend_do_include_or_eval(ZEND_INCLUDE, &$$, &$2 TSRMLS_CC); } - | T_INCLUDE_ONCE expr { zend_do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 TSRMLS_CC); } - | T_EVAL '(' expr ')' { zend_do_include_or_eval(ZEND_EVAL, &$$, &$3 TSRMLS_CC); } - | T_REQUIRE expr { zend_do_include_or_eval(ZEND_REQUIRE, &$$, &$2 TSRMLS_CC); } - | T_REQUIRE_ONCE expr { zend_do_include_or_eval(ZEND_REQUIRE_ONCE, &$$, &$2 TSRMLS_CC); } + | T_EMPTY '(' expr ')' { $$ = zend_ast_create(ZEND_AST_EMPTY, $3); } + | T_INCLUDE expr + { $$ = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2); } + | T_INCLUDE_ONCE expr + { $$ = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2); } + | T_EVAL '(' expr ')' + { $$ = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_EVAL, $3); } + | T_REQUIRE expr + { $$ = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2); } + | T_REQUIRE_ONCE expr + { $$ = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2); } ; isset_variables: - isset_variable { $$ = $1; } - | isset_variables ',' { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } isset_variable { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } + isset_variable { $$ = $1; } + | isset_variables ',' isset_variable + { $$ = zend_ast_create(ZEND_AST_AND, $1, $3); } ; isset_variable: - variable { zend_do_isset_or_isempty(ZEND_ISSET, &$$, &$1 TSRMLS_CC); } - | expr_without_variable { zend_error(E_COMPILE_ERROR, "Cannot use isset() on the result of an expression (you can use \"null !== expression\" instead)"); } -; - -class_constant: - class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_RT, 0 TSRMLS_CC); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_RT, 0 TSRMLS_CC); } -; - -static_class_name_scalar: - class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS { zend_do_resolve_class_name(&$$, &$1, 1 TSRMLS_CC); } + expr { $$ = zend_ast_create(ZEND_AST_ISSET, $1); } ; class_name_scalar: - class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS { zend_do_resolve_class_name(&$$, &$1, 0 TSRMLS_CC); } + class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS + { $$ = zend_ast_create(ZEND_AST_RESOLVE_CLASS_NAME, $1); } ; %% |