Module: wine Branch: master Commit: 6fbed51ef1eefc1f54d30f702a6fd179d0d56ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbed51ef1eefc1f54d30f702a... Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 11 17:27:50 2012 +0200 d3dcompiler: Make declaration_statement return a list. --- dlls/d3dcompiler_43/hlsl.y | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b4c9b25..03aa4eb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -251,6 +251,7 @@ static unsigned int components_count_expr_list(struct list *list) %type <boolval> boolean %type <type> base_type %type <type> type +%type <list> declaration_statement %type <list> complex_initializer %type <list> initializer_expr_list %type <instr> initializer_expr @@ -530,6 +531,8 @@ base_type: KW_VOID declaration_statement: declaration { + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); } declaration: var_modifiers type variables_def ';' @@ -713,8 +716,7 @@ statement_list: statement statement: declaration_statement { - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); + $$ = $1; } | expr_statement {