[apparmor] parser: [patch 2/3] parser: consolidate LIST_VALUE_ID processing

[Steve Beattie]

On Wed, Nov 05, 2014 at 05:19:42PM -0800, john.johansen at canonical.com wrote:
> Signed-off-by: John Johansen <john.johansen at canonical.com>

Acked-by: Steve Beattie <steve at nxnw.org>

Thanks.

> ---
>  parser/parser_lex.l |    7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> --- 3.0-diff.orig/parser/parser_lex.l
> +++ 3.0-diff/parser/parser_lex.l
> @@ -346,11 +346,6 @@
>  	{CLOSE_PAREN} { POP_AND_RETURN(TOK_CLOSEPAREN); }
>  
>  	{COMMA}	{ EAT_TOKEN("listval: ,\n"); }
> -
> -	({LIST_VALUE_ID}|{QUOTED_ID}) {
> -		yylval.id = processid(yytext, yyleng);
> -		RETURN_TOKEN(TOK_VALUE);
> -	}
>  }
>  
>  <EXTCOND_MODE>{
> @@ -376,7 +371,9 @@
>  
>  <LIST_COND_PAREN_VAL>{
>  	{CLOSE_PAREN}	{ POP(); }
> +}
>  
> +<LIST_VAL_MODE,LIST_COND_PAREN_VAL>{
>  	({LIST_VALUE_ID}|{QUOTED_ID}) {
>  		yylval.id = processid(yytext, yyleng);
>  		RETURN_TOKEN(TOK_VALUE);
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141107/7748a528/attachment-0001.pgp>