From: Julia Lawall <julia.lawall@inria.fr>
To: Jaskaran Singh <jaskaransingh7654321@gmail.com>
Cc: linux-kernel-mentees@lists.linuxfoundation.org, cocci@systeme.lip6.fr
Subject: Re: [Cocci] [PATCH 05/26] parsing_cocci: visitor_ast: Add cases for ParenType/FunctionType
Date: Tue, 17 Mar 2020 08:16:04 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.21.2003170815300.2482@hadrien> (raw)
In-Reply-To: <20200317055920.16708-1-jaskaransingh7654321@gmail.com>
On Tue, 17 Mar 2020, Jaskaran Singh wrote:
> The order of the terms in ParenType require implementing a special
> case for ParenType. This case handles only the following:
>
> <type> ( * id [ .* ] ) ( params )
>
> i.e., a function pointer or an array of function pointers, and will fail
> for any other cases. This is similar to the function used to print
> ParenType in Pretty_print_c.
Did you change this? It should be v2, and then the reason for the change
should be described under the ---
julia
>
> Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
> ---
> parsing_cocci/visitor_ast.ml | 75 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 75 insertions(+)
>
> diff --git a/parsing_cocci/visitor_ast.ml b/parsing_cocci/visitor_ast.ml
> index 3d5de794..99af7652 100644
> --- a/parsing_cocci/visitor_ast.ml
> +++ b/parsing_cocci/visitor_ast.ml
> @@ -318,6 +318,61 @@ let combiner bind option_default
> let lrb = string_mcode rb in
> multibind ([lty] @ lid @ [lb; lsize; lrb])
>
> + and parentype_type (lp, ty, (id : Ast.ident option), rp) =
> + match Ast.unwrap ty with
> + Ast.Type(_,_,fty1) ->
> + (match Ast.unwrap fty1 with
> + Ast.Pointer(ty1,star) ->
> + (match Ast.unwrap ty1 with
> + Ast.Type(_,_,fty2) ->
> + (match Ast.unwrap fty2 with
> + Ast.FunctionType(ty2,lp2,params,rp2) ->
> + let typ = fullType ty2 in
> + let lp = string_mcode lp in
> + let star = string_mcode star in
> + let idl = match id with
> + | Some idd -> [ident idd]
> + | None -> [] in
> + let rp = string_mcode rp in
> + let lp2 = string_mcode lp2 in
> + let params = parameter_dots params in
> + let rp2 = string_mcode rp2 in
> + multibind
> + ([typ;lp;star] @ idl @ [rp;lp2;params;rp2])
> + | _ -> failwith "ParenType Visitor_ast")
> + | _ -> failwith "ParenType Visitor_ast")
> + | Ast.Array(ty1,lb1,size1,rb1) ->
> + (match Ast.unwrap ty1 with
> + Ast.Type(_,_,fty2) ->
> + (match Ast.unwrap fty2 with
> + Ast.Pointer(ty2,star) ->
> + (match Ast.unwrap ty2 with
> + Ast.Type(_,_,fty3) ->
> + (match Ast.unwrap fty3 with
> + Ast.FunctionType(ty3,lp3,params,rp3) ->
> + let typ = fullType ty3 in
> + let lp = string_mcode lp in
> + let star = string_mcode star in
> + let idl = match id with
> + | Some idd -> [ident idd]
> + | None -> [] in
> + let lb1 = string_mcode lb1 in
> + let size1 = get_option expression size1 in
> + let rb1 = string_mcode rb1 in
> + let rp = string_mcode rp in
> + let lp3 = string_mcode lp3 in
> + let params = parameter_dots params in
> + let rp3 = string_mcode rp3 in
> + multibind
> + ([typ;lp;star] @ idl @
> + [lb1;size1;rb1;rp;lp3;params;rp3])
> + | _ -> failwith "ParenType Visitor_ast")
> + | _ -> failwith "ParenType Visitor_ast")
> + | _ -> failwith "ParenType Visitor_ast")
> + | _ -> failwith "ParenType Visitor_ast")
> + | _ -> failwith "ParenType Visitor_ast")
> + | _ -> failwith "ParenType Visitor_ast"
> +
> and typeC ty =
> let k ty =
> match Ast.unwrap ty with
> @@ -332,6 +387,14 @@ let combiner bind option_default
> bind lty lstar
> | Ast.FunctionPointer(ty,lp1,star,rp1,lp2,params,rp2) ->
> function_pointer (ty,lp1,star,None,rp1,lp2,params,rp2)
> + | Ast.ParenType(lp,ty,rp) ->
> + parentype_type (lp,ty,None,rp)
> + | Ast.FunctionType(ty,lp,params,rp) ->
> + let lty = fullType ty in
> + let llp = string_mcode lp in
> + let lparams = parameter_dots params in
> + let lrp = string_mcode rp in
> + multibind [lty; llp; lparams; lrp]
> | Ast.Array(ty,lb,size,rb) -> array_type (ty,None,lb,size,rb)
> | Ast.Decimal(dec,lp,length,comma,precision_opt,rp) ->
> let ldec = string_mcode dec in
> @@ -384,6 +447,7 @@ let combiner bind option_default
> Ast.FunctionPointer(ty,lp1,star,rp1,lp2,params,rp2) ->
> function_pointer (ty, lp1, star, Some id, rp1, lp2, params, rp2)
> | Ast.Array(ty,lb,size,rb) -> array_type (ty, Some id, lb, size, rb)
> + | Ast.ParenType(lp,ty,rp) -> parentype_type (lp, ty, Some id, rp)
> | _ -> let lty = fullType ty in
> let lid = ident id in
> bind lty lid)
> @@ -1253,6 +1317,17 @@ let rebuilder
> let lparams = parameter_dots params in
> let lrp2 = string_mcode rp2 in
> Ast.FunctionPointer(lty, llp1, lstar, lrp1, llp2, lparams, lrp2)
> + | Ast.ParenType(lp,ty,rp) ->
> + let llp = string_mcode lp in
> + let lty = fullType ty in
> + let lrp = string_mcode rp in
> + Ast.ParenType(llp,lty,lrp)
> + | Ast.FunctionType(ty,lp,params,rp) ->
> + let lty = fullType ty in
> + let llp = string_mcode lp in
> + let lparams = parameter_dots params in
> + let lrp = string_mcode rp in
> + Ast.FunctionType(lty,llp,lparams,lrp)
> | Ast.Array(ty,lb,size,rb) ->
> let lty = fullType ty in
> let llb = string_mcode lb in
> --
> 2.21.1
>
>
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
next prev parent reply other threads:[~2020-03-17 7:16 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 10:02 [Cocci] [PATCH 00/26] cocci: Add ParenType/FunctionType to SmPL ASTs Jaskaran Singh
2020-03-16 10:02 ` [Cocci] [PATCH 01/26] parsing_cocci: Add Function Prototype token Jaskaran Singh
2020-03-18 17:25 ` Julia Lawall
2020-03-19 13:58 ` Jaskaran Singh
2020-03-19 15:54 ` Julia Lawall
2020-03-19 16:25 ` Jaskaran Singh
2020-03-19 16:26 ` Jaskaran Singh
2020-03-19 16:37 ` Julia Lawall
2020-03-16 10:02 ` [Cocci] [PATCH 02/26] parsing_cocci: AST: Add ParenType and FunctionType to SmPL ASTs Jaskaran Singh
2020-03-18 17:27 ` Julia Lawall
2020-03-16 10:02 ` [Cocci] [PATCH 03/26] parsing_cocci: parser: Add direct_declarator/direct_abstract_d rules Jaskaran Singh
2020-03-18 17:31 ` Julia Lawall
2020-03-19 5:11 ` Jaskaran Singh
2020-03-19 7:02 ` Julia Lawall
2020-03-16 10:02 ` [Cocci] [PATCH 04/26] parsing_cocci: visitor_ast0: Add cases for ParenType/FunctionType Jaskaran Singh
2020-03-18 17:42 ` Julia Lawall
2020-03-16 10:02 ` [Cocci] [PATCH 05/26] " Jaskaran Singh
2020-03-17 5:59 ` [Cocci] [PATCH 05/26] parsing_cocci: visitor_ast: " Jaskaran Singh
2020-03-17 7:16 ` Julia Lawall [this message]
2020-03-17 8:43 ` [Cocci] [PATCH v2 " Jaskaran Singh
2020-03-18 17:45 ` Julia Lawall
2020-03-16 10:02 ` [Cocci] [PATCH 06/26] parsing_cocci: arity: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 07/26] parsing_cocci: index: " Jaskaran Singh
2020-03-18 18:35 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 08/26] parsing_cocci: context_neg: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 09/26] parsing_cocci: unparse_ast0: " Jaskaran Singh
2020-03-18 18:36 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 10/26] parsing_cocci: single_statement: " Jaskaran Singh
2020-03-18 18:37 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 11/26] parsing_cocci: function_prototypes: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 12/26] parsing_cocci: check_meta: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 13/26] parsing_cocci: iso_pattern: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 14/26] parsing_cocci: adjust_pragmas: " Jaskaran Singh
2020-03-18 18:42 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 15/26] parsing_cocci: compute_lines: " Jaskaran Singh
2020-03-18 18:43 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 16/26] parsing_cocci: ast0toast: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 17/26] parsing_cocci: type_cocci: Add ParenType/FunctionType to types Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 18/26] parsing_cocci: unify_ast: Add cases for ParenType/FunctionType Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 19/26] parsing_cocci: disjdistr: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 20/26] parsing_cocci: ast_cocci: " Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 21/26] parsing_cocci: pretty_print_cocci: Print ParenType/FunctionType Jaskaran Singh
2020-03-18 18:45 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 22/26] parsing_c: unparse_cocci: " Jaskaran Singh
2020-03-18 18:47 ` Julia Lawall
2020-03-16 10:03 ` [Cocci] [PATCH 23/26] engine: Match A.ParenType and A.FunctionType Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 24/26] tools: spgen: Add cases for ParenType/FunctionType Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 25/26] cocci: Remove Ast_cocci.FunctionPointer Jaskaran Singh
2020-03-16 10:03 ` [Cocci] [PATCH 26/26] tests: Add test case for array of function pointers Jaskaran Singh
2020-03-18 18:48 ` Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.2003170815300.2482@hadrien \
--to=julia.lawall@inria.fr \
--cc=cocci@systeme.lip6.fr \
--cc=jaskaransingh7654321@gmail.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).