[apparmor] parser: [patch 1/3] parser: Merge QUOTED_ID and QUOTED_LIST_VALUE_ID

[Seth Arnold]

On Wed, Nov 05, 2014 at 05:19:41PM -0800, john.johansen at canonical.com wrote:
> QUOTED_ID and QUOTED_LIST_VALUE_ID are the same thing so merge them
> 
> Signed-off-by: John Johansen <john.johansen at canonical.com>

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks

> ---
>  parser/parser_lex.l |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> --- 3.0-diff.orig/parser/parser_lex.l
> +++ 3.0-diff/parser/parser_lex.l
> @@ -212,9 +212,7 @@
>  POST_VAR_ID_CHARS	[^ \t\n"!,]{-}[=\+]
>  POST_VAR_ID 	{POST_VAR_ID_CHARS}|(,{POST_VAR_ID_CHARS}|\\[ ]|\\\t|\\\"|\\!|\\,|\\\(|\\\))
>  LIST_VALUE_ID_CHARS	([^ \t\n"!,]{-}[()]|\\[ ]|\\\t|\\\"|\\!|\\,|\\\(|\\\))
> -LIST_VALUE_QUOTED_ID_CHARS [^\0"]|\\\"
>  LIST_VALUE_ID	{LIST_VALUE_ID_CHARS}+
> -QUOTED_LIST_VALUE_ID	\"{LIST_VALUE_QUOTED_ID_CHARS}+\"
>  ID_CHARS_NOEQ	[^ \t\n"!,]{-}[=]
>  LEADING_ID_CHARS_NOEQ [^ \t\n"!,]{-}[=()+&]
>  ID_NOEQ		{ID_CHARS_NOEQ}|(,{ID_CHARS_NOEQ})
> @@ -370,7 +368,7 @@
>  }
>  
>  <LIST_COND_VAL>{
> -	({LIST_VALUE_ID}|{QUOTED_LIST_VALUE_ID}) {
> +	({LIST_VALUE_ID}|{QUOTED_ID}) {
>  		yylval.id = processid(yytext, yyleng);
>  		POP_AND_RETURN(TOK_VALUE);
>  	}
> @@ -379,7 +377,7 @@
>  <LIST_COND_PAREN_VAL>{
>  	{CLOSE_PAREN}	{ POP(); }
>  
> -	({LIST_VALUE_ID}|{QUOTED_LIST_VALUE_ID}) {
> +	({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
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141105/a07ddcd9/attachment.pgp>