On 07/09/2013 06:56 AM, Ivana Hutarova Varekova wrote:
> The old version has problem with name/value pairs parsing in template tag in
> parse.y.
> This patch fix it.
>
> Signed-off-by: Ivana Hutarova Varekova <varek...@redhat.com>
Acked-By: Jan Safranek <jsafr...@redhat.com>
> ---
>
> src/parse.y | 35 ++++++++++++++++++++++++++++++-----
> 1 files changed, 30 insertions(+), 5 deletions(-)
>
> diff --git a/src/parse.y b/src/parse.y
> index f51332c..9adbc0e 100644
> --- a/src/parse.y
> +++ b/src/parse.y
> @@ -52,7 +52,8 @@ int yywrap(void)
> %type <values> namevalue_conf
> %type <val> template template_conf
> %type <val> template_task_or_admin template_task_namevalue_conf
> -%type <val> template_admin_namevalue_conf
> +%type <val> template_admin_namevalue_conf template_task_conf
> +%type <val> template_admin_conf
> %start start
> %%
>
> @@ -210,7 +211,7 @@ template_conf
> ;
>
> template_task_or_admin
> - : TASK '{' template_task_namevalue_conf '}' admin_conf
> + : TASK '{' template_task_namevalue_conf '}' template_admin_conf
> {
> $$ = $3 && $5;
> if (!$$) {
> @@ -220,7 +221,7 @@ template_task_or_admin
> return $$;
> }
> }
> - | ADMIN '{' template_admin_namevalue_conf '}' task_conf
> + | ADMIN '{' template_admin_namevalue_conf '}' template_task_conf
> {
> $$ = $3 && $5;
> if (!$$) {
> @@ -325,7 +326,7 @@ template_task_namevalue_conf
> return $$;
> }
> }
> - | task_namevalue_conf ID '=' ID ';'
> + | template_task_namevalue_conf ID '=' ID ';'
> {
> $$ = $1 && template_config_group_task_perm($2, $4);
> if (!$$) {
> @@ -348,7 +349,7 @@ template_admin_namevalue_conf
> return $$;
> }
> }
> - | admin_namevalue_conf ID '=' ID ';'
> + | template_admin_namevalue_conf ID '=' ID ';'
> {
> $$ = $1 && template_config_group_admin_perm($2, $4);
> if (!$$) {
> @@ -408,6 +409,30 @@ task_conf: TASK '{' task_namevalue_conf '}'
> }
> ;
>
> +template_admin_conf: ADMIN '{' template_admin_namevalue_conf '}'
> + {
> + $$ = $3;
> + if (!$$) {
> + fprintf(stderr, "parsing failed at line number %d\n",
> + line_no);
> + $$ = ECGCONFIGPARSEFAIL;
> + return $$;
> + }
> + }
> + ;
> +
> +template_task_conf: TASK '{' template_task_namevalue_conf '}'
> + {
> + $$ = $3;
> + if (!$$) {
> + fprintf(stderr, "parsing failed at line number %d\n",
> + line_no);
> + $$ = ECGCONFIGPARSEFAIL;
> + return $$;
> + }
> + }
> + ;
> +
> mountvalue_conf
> : ID '=' ID ';'
> {
>
>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
> _______________________________________________
> Libcg-devel mailing list
> Libcg-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/libcg-devel
>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
