wellton/hhvm
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Fix shapes

Ver Código-Fonte 
The keys were dropped.
Esse commit está contido em:
Erling Ellingsen
2013-05-17 20:31:22 -07:00
commit de Sara Golemon
pai d5657a46cf
commit dcf471996e
3 arquivos alterados com 2025 adições e 2015 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
hphp/compiler/parser/hphp.tab.cpp
+2007 -1995
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
hphp/test/quick/typedef_shape.php.expect
+2 -2
Ver Arquivo
@@ -1,6 +1,6 @@
array(2) {
[0]=>
["x"]=>
int(12)
[1]=>
["y"]=>
int(12)
}
hphp/util/parser/hphp.y
+16 -18
Ver Arquivo
@@ -1636,28 +1636,28 @@ expr_no_variable:
| collection_literal { $$ = $1;}
;
shape_keyname:
T_CONSTANT_ENCAPSED_STRING { validate_shape_keyname($1, _p);
_p->onScalar($$, T_CONSTANT_ENCAPSED_STRING, $1); }
non_empty_shape_pair_list:
non_empty_shape_pair_list ','
T_CONSTANT_ENCAPSED_STRING
shape_keyname
T_DOUBLE_ARROW
expr { validate_shape_keyname($3, _p);
_p->onArrayPair($$,&$1,&$3,$5,0); }
| T_CONSTANT_ENCAPSED_STRING
expr { _p->onArrayPair($$,&$1,&$3,$5,0); }
| shape_keyname
T_DOUBLE_ARROW
expr { validate_shape_keyname($1, _p);
_p->onArrayPair($$, 0,&$1,$3,0); }
expr { _p->onArrayPair($$, 0,&$1,$3,0); }
;
non_empty_static_shape_pair_list:
non_empty_static_shape_pair_list ','
T_CONSTANT_ENCAPSED_STRING
shape_keyname
T_DOUBLE_ARROW
static_scalar { validate_shape_keyname($3, _p);
_p->onArrayPair($$,&$1,&$3,$5,0); }
| T_CONSTANT_ENCAPSED_STRING
static_scalar { _p->onArrayPair($$,&$1,&$3,$5,0); }
| shape_keyname
T_DOUBLE_ARROW
static_scalar { validate_shape_keyname($1, _p);
_p->onArrayPair($$, 0,&$1,$3,0); }
static_scalar { _p->onArrayPair($$, 0,&$1,$3,0); }
;
shape_pair_list:
@@ -2042,13 +2042,11 @@ static_shape_pair_list_ae:
;
non_empty_static_shape_pair_list_ae:
non_empty_static_shape_pair_list_ae
',' T_CONSTANT_ENCAPSED_STRING
T_DOUBLE_ARROW static_scalar_ae { validate_shape_keyname($3, _p);
_p->onArrayPair($$,&$1,&$3,$5,0); }
| T_CONSTANT_ENCAPSED_STRING
',' shape_keyname
T_DOUBLE_ARROW static_scalar_ae { _p->onArrayPair($$,&$1,&$3,$5,0); }
| shape_keyname
T_DOUBLE_ARROW
static_scalar_ae { validate_shape_keyname($1, _p);
_p->onArrayPair($$, 0,&$1,$3,0); }
static_scalar_ae { _p->onArrayPair($$, 0,&$1,$3,0); }
;
static_scalar_list_ae: