On Wed, 8 Jan 2020, Jaskaran Singh wrote:
> For the following case:
>
> [const_vol] <type> [ptr] <annotation> <identifier> <open_par>
>
> The lookahead function in Parsing_hacks would mislabel <annotation> as a
> CppDirective, causing pretty printing errors.
>
> Add a case in the lookahead function for handling this case.
Applied. Thanks!
julia
>
> Signed-off-by: Jaskaran Singh <[email protected]>
> ---
> parsing_c/parsing_hacks.ml | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml
> index 43421647..3f031f21 100644
> --- a/parsing_c/parsing_hacks.ml
> +++ b/parsing_c/parsing_hacks.ml
> @@ -2066,6 +2066,20 @@ let lookahead2 ~pass next before =
> && is_type type_ ->
> TCommentCpp (Token_c.CppDirective, i1)
>
> + (* tt xx yy ( : xx is an annot *)
> + | (TIdent (s, i1)::TIdent (s2, i2)::TOPar _::_, seen::_)
> + when LP.current_context () = LP.InTopLevel
> + && (is_struct_enum before || is_type seen)
> + && s ==~ regexp_annot ->
> + TCommentCpp (Token_c.CppMacro, i1)
> +
> + (* tt * xx yy ( : xx is an annot *)
> + | (TIdent (s, i1)::TIdent (s2, i2)::TOPar _::_, ptr)
> + when LP.current_context () = LP.InTopLevel
> + && pointer ptr
> + && s ==~ regexp_annot ->
> + TCommentCpp (Token_c.CppMacro, i1)
> +
> (* tt xx yy; : yy is an annot *)
> | (TIdent (s, i1)::(TPtVirg _|TEq _)::_, TIdent (s2, i2)::type_::rest)
> when (is_struct_enum (type_::rest)
> --
> 2.21.1
>
>
_______________________________________________
Cocci mailing list
[email protected]
https://systeme.lip6.fr/mailman/listinfo/cocci
