From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Cocci] [PATCH v3 22/26] parsing_c: unparse_cocci: Print ParenType/FunctionType
Date: Fri, 20 Mar 2020 12:31:53 +0530 [thread overview]
Message-ID: <20200320070157.4206-23-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200320070157.4206-1-jaskaransingh7654321@gmail.com>
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.
Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
parsing_c/unparse_cocci.ml | 58 ++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/parsing_c/unparse_cocci.ml b/parsing_c/unparse_cocci.ml
index 30e755e9..1fa3115a 100644
--- a/parsing_c/unparse_cocci.ml
+++ b/parsing_c/unparse_cocci.ml
@@ -722,6 +722,13 @@ and typeC ty =
| Ast.FunctionPointer(ty,lp1,star,rp1,lp2,params,rp2) ->
print_function_pointer (ty,lp1,star,rp1,lp2,params,rp2)
(function _ -> ())
+ | Ast.ParenType(lp,ty,rp) ->
+ print_parentype (lp,ty,rp) (function _ -> ())
+ | Ast.FunctionType(ty,lp,params,rp) ->
+ fullType ty;
+ mcode print_string lp;
+ parameter_list params;
+ mcode print_string rp
| Ast.Array(ty,lb,size,rb) ->
fullType ty; mcode print_string lb; print_option expression size;
mcode print_string rb
@@ -786,6 +793,49 @@ and storage = function
| Ast.Register -> print_string "register"
| Ast.Extern -> print_string "extern"
+(* --------------------------------------------------------------------- *)
+(* ParenType *)
+
+and print_parentype (lp,ty,rp) fn =
+ let function_pointer ty1 array_dec =
+ match Ast.unwrap ty1 with
+ Ast.Type(_,_,fty1) ->
+ (match Ast.unwrap fty1 with
+ Ast.Pointer(ty2,star) ->
+ (match Ast.unwrap ty2 with
+ Ast.Type(_,_,fty3) ->
+ (match Ast.unwrap fty3 with
+ Ast.FunctionType(ty3,lp3,params,rp3) ->
+ fullType ty3;
+ pr_space();
+ mcode print_string lp;
+ mcode print_string star;
+ fn();
+ let _ =
+ match array_dec with
+ Some(lb1,size,rb1) ->
+ mcode print_string lb1;
+ print_option expression size;
+ mcode print_string rb1
+ | None -> () in
+ mcode print_string rp;
+ mcode print_string lp3;
+ parameter_list params;
+ mcode print_string rp3
+ | _ -> failwith "ParenType Unparse_cocci")
+ | _ -> failwith "ParenType Unparse_cocci")
+ | _ -> failwith "ParenType Unparse_cocci")
+ | _ -> failwith "ParenType Unparse_cocci" in
+ match Ast.unwrap ty with
+ Ast.Type(_,_,fty1) ->
+ (match Ast.unwrap fty1 with
+ Ast.Array(ty1,lb1,size,rb1) ->
+ function_pointer ty1 (Some(lb1,size,rb1))
+ | Ast.Pointer(ty1,star) ->
+ function_pointer ty None
+ | _ -> failwith "ParenType Unparse_cocci")
+ | _ -> failwith "ParenType Unparse_cocci"
+
(* --------------------------------------------------------------------- *)
(* Variable declaration *)
@@ -818,6 +868,14 @@ and print_named_type ty id =
pretty_print_c.Pretty_print_c.type_with_ident ty
(function _ -> id())
| _ -> error name ty "type value expected")
+ | Ast.ParenType(lp,ty,rp) ->
+ print_parentype (lp,ty,rp) (function _ -> id())
+ | Ast.FunctionType(ty,lp,params,rp) ->
+ fullType ty;
+ id();
+ mcode print_string lp;
+ parameter_list params;
+ mcode print_string rp
(*| should have a case here for pointer to array or function type
that would put ( * ) around the variable. This makes one wonder
why we really need a special case for function pointer *)
--
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-20 7:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 7:01 [Cocci] [PATCH v3 00/26] cocci: Add ParenType/FunctionType to SmPL ASTs Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 01/26] parsing_cocci: Add Function Prototype token Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 02/26] parsing_cocci: AST: Add ParenType and FunctionType to SmPL ASTs Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 03/26] parsing_cocci: parser: Add direct_declarator/direct_abstract_d rules Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 04/26] parsing_cocci: visitor_ast0: Add cases for ParenType/FunctionType Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 05/26] parsing_cocci: visitor_ast: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 06/26] parsing_cocci: arity: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 07/26] parsing_cocci: index: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 08/26] parsing_cocci: context_neg: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 09/26] parsing_cocci: unparse_ast0: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 10/26] parsing_cocci: single_statement: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 11/26] parsing_cocci: function_prototypes: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 12/26] parsing_cocci: check_meta: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 13/26] parsing_cocci: iso_pattern: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 14/26] parsing_cocci: adjust_pragmas: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 15/26] parsing_cocci: compute_lines: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 16/26] parsing_cocci: ast0toast: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 17/26] parsing_cocci: type_cocci: Add ParenType/FunctionType to types Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 18/26] parsing_cocci: unify_ast: Add cases for ParenType/FunctionType Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 19/26] parsing_cocci: disjdistr: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 20/26] parsing_cocci: ast_cocci: " Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 21/26] parsing_cocci: pretty_print_cocci: Print ParenType/FunctionType Jaskaran Singh
2020-03-20 7:01 ` Jaskaran Singh [this message]
2020-03-20 7:01 ` [Cocci] [PATCH v3 23/26] engine: Match A.ParenType and A.FunctionType Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 24/26] tools: spgen: Add cases for ParenType/FunctionType Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 25/26] cocci: Remove Ast_cocci.FunctionPointer Jaskaran Singh
2020-03-20 7:01 ` [Cocci] [PATCH v3 26/26] tests: Add test case for array of function pointers Jaskaran Singh
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=20200320070157.4206-23-jaskaransingh7654321@gmail.com \
--to=jaskaransingh7654321@gmail.com \
--cc=cocci@systeme.lip6.fr \
--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).