[Linux-kernel-mentees] [PATCH] parsing_c: Handle case of macro before typedef

Julia Lawall julia.lawall at inria.fr
Tue Jan 21 06:28:13 UTC 2020



On Sun, 19 Jan 2020, Jaskaran Singh wrote:

> For the following case:
>
> <macro> <typedef> <identifier>
>
> A case in parsing_hacks.ml sometimes mislabels <macro> as a
> typedef ident.
>
> If typedef is a known typedef (such as u8 or *_t), then label
> <macro> as a CppMacro. Subsequent cases will then label <typedef>
> correctly.

OK, I see that you are now using is_known_typdef in a more interesting
way.  Could you add a test case that shows what has improved?  I would
still know to know why the number of passed tokens increases.

julia


>
> Following are results of --parse-c on the Linux Kernel v5.5-rc4:
>
> Before:
>
>   nb good = 18956150,  nb passed = 134061 =========> 0.70% passed
>
> After:
>
>   nb good = 18956150,  nb passed = 134062 =========> 0.70% passed
>
> Signed-off-by: Jaskaran Singh <jaskaransingh7654321 at gmail.com>
> ---
>  parsing_c/parsing_hacks.ml | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml
> index 8374731b..23d675cf 100644
> --- a/parsing_c/parsing_hacks.ml
> +++ b/parsing_c/parsing_hacks.ml
> @@ -2184,6 +2184,41 @@ let lookahead2 ~pass next before =
>        && ok_typedef s && is_macro s2 && is_type type_
>          ->
>  	  TIdent (s, i1)
> +
> +  (* xx yy zz : xx is a macro *)
> +  | (TIdent (s, i1)::TIdent (s2, i2)::TIdent(_,_)::_ , _)
> +    when not_struct_enum before
> +	&& ok_typedef s2
> +	&& is_known_typdef s2
> +        ->
> +	  TCommentCpp(Token_c.CppMacro, i1)
> +
> +  (* xx yy zz : xx is a typedef ident *)
> +  | (TIdent (s, i1)::TIdent (s2, i2)::TIdent(_,_)::_ , _)
> +    when not_struct_enum before
> +	&& ok_typedef s
> +        ->
> +      msg_typedef s i1 2; LP.add_typedef_root s i1;
> +      TypedefIdent (s, i1)
> +
> +  (* xx yy * zz : xx is a macro *)
> +  | (TIdent (s, i1)::TIdent (s2, i2)::ptr , _)
> +    when pointer ~followed_by:(function TIdent _ -> true | _ -> false) ptr
> +	&& not_struct_enum before
> +	&& ok_typedef s2
> +	&& is_known_typdef s2
> +        ->
> +	  TCommentCpp(Token_c.CppMacro, i1)
> +
> +  (* xx yy * zz : xx is a typedef ident *)
> +  | (TIdent (s, i1)::TIdent (s2, i2)::ptr , _)
> +    when pointer ~followed_by:(function TIdent _ -> true | _ -> false) ptr
> +	&& not_struct_enum before
> +	&& ok_typedef s
> +        ->
> +      msg_typedef s i1 2; LP.add_typedef_root s i1;
> +      TypedefIdent (s, i1)
> +
>    (* xx yy *)
>    | (TIdent (s, i1)::TIdent (s2, i2)::rest  , _) when not_struct_enum before
>  	&& ok_typedef s && not (is_macro_paren s2 rest)
> --
> 2.21.1
>
>


More information about the Linux-kernel-mentees mailing list