Add support for constant dereferencing (PHP 5.5)

Examples: "foo"[2], [1, 2, 3][2]
nikic · Sep 7, 2012 · 4259b44 · 4259b44
1 parent 417a8bb
commit 4259b44
Show file tree

Hide file tree

Showing 4 changed files with 732 additions and 513 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Version 0.9.3-dev
 -----------------
 
+* [PHP 5.5] Add support for constant array / string dereferencing.
+  Examples: `"foo"[2]`, `[1, 2, 3][2]`
+
 * [PHP 5.5] Add support for `yield` expressions. This adds a new `Yield` expression type, with subnodes `key` and
   `value`.
 

diff --git a/grammar/zend_language_parser.phpy b/grammar/zend_language_parser.phpy
@@ -582,8 +582,8 @@ expr:
     | T_EXIT exit_expr                                      { $$ = Expr_Exit         [$2]; }
     | '@' expr                                              { $$ = Expr_ErrorSuppress[$2]; }
     | scalar                                                { $$ = $1; }
-    | T_ARRAY '(' array_pair_list ')'                       { $$ = Expr_Array[$3]; }
-    | '[' array_pair_list ']'                               { $$ = Expr_Array[$2]; }
+    | array_expr                                            { $$ = $1; }
+    | scalar_dereference                                    { $$ = $1; }
     | '`' backticks_expr '`'                                { $$ = Expr_ShellExec[$2]; }
     | T_PRINT expr                                          { $$ = Expr_Print[$2]; }
     | T_YIELD                                               { $$ = Expr_Yield[null, null]; }
@@ -603,6 +603,19 @@ yield_expr:
     | T_YIELD expr T_DOUBLE_ARROW expr                      { $$ = Expr_Yield[$2, $4]; }
 ;
 
+array_expr:
+      T_ARRAY '(' array_pair_list ')'                       { $$ = Expr_Array[$3]; }
+    | '[' array_pair_list ']'                               { $$ = Expr_Array[$2]; }
+;
+
+scalar_dereference:
+      array_expr '[' dim_offset ']'                         { $$ = Expr_ArrayDimFetch[$1, $3]; }
+    | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']'
+          { $$ = Expr_ArrayDimFetch[Scalar_String::create($1, $attributes), $3]; }
+    | scalar_dereference '[' dim_offset ']'                 { $$ = Expr_ArrayDimFetch[$1, $3]; }
+    /* alternative array syntax missing intentionally */
+;
+
 new_expr:
       T_NEW class_name_reference ctor_arguments             { $$ = Expr_New[$2, $3]; }
 ;