From: Jaskaran Singh <jaskaran.singh@collabora.com>
To: cocci@systeme.lip6.fr
Subject: [Cocci] [PATCH v2 RESEND 17/20] parsing_cocci: pretty_print_cocci: Wrap SmPL Attributes
Date: Wed, 8 Jul 2020 18:30:32 +0530 [thread overview]
Message-ID: <20200708130035.26687-18-jaskaran.singh@collabora.com> (raw)
In-Reply-To: <20200708130035.26687-1-jaskaran.singh@collabora.com>
Attributes are wrapped in the SmPL AST. Reflect these changes in
pretty_print_cocci.ml.
Signed-off-by: Jaskaran Singh <jaskaran.singh@collabora.com>
---
parsing_cocci/pretty_print_cocci.ml | 34 ++++++++++++++---------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/parsing_cocci/pretty_print_cocci.ml b/parsing_cocci/pretty_print_cocci.ml
index aaea3f9d..1ac6d743 100644
--- a/parsing_cocci/pretty_print_cocci.ml
+++ b/parsing_cocci/pretty_print_cocci.ml
@@ -251,8 +251,7 @@ let rec expression e =
expression exp; mcode print_string ar; ident field
| Ast.Cast(lp,ty,attr,rp,exp) ->
mcode print_string_box lp; fullType ty; close_box();
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr;
+ print_attribute_list attr;
mcode print_string rp; expression exp
| Ast.SizeOfExpr(sizeof,exp) ->
mcode print_string sizeof; expression exp
@@ -450,7 +449,15 @@ and print_fninfo = function
Ast.FStorage(stg) -> mcode storage stg
| Ast.FType(ty) -> fullType ty
| Ast.FInline(inline) -> mcode print_string inline; print_string " "
- | Ast.FAttr(attr) -> mcode print_string attr; print_string " "
+ | Ast.FAttr(attr) -> print_attribute attr; print_string " "
+
+and print_attribute_list attrs =
+ if not (attrs = []) then print_string " ";
+ print_between print_space print_attribute attrs
+
+and print_attribute attr =
+ match Ast.unwrap attr with
+ Ast.Attribute(a) -> mcode print_string a
and typeC ty =
match Ast.unwrap ty with
@@ -551,15 +558,13 @@ and declaration d =
| Ast.Init(stg,ty,id,attr,eq,ini,sem) ->
print_option (mcode storage) stg;
print_named_type ty (fun _ -> ident id);
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr;
+ print_attribute_list attr;
print_string " "; mcode print_string eq;
print_string " "; initialiser ini; mcode print_string sem
| Ast.UnInit(stg,ty,id,attr,sem) ->
print_option (mcode storage) stg;
print_named_type ty (fun _ -> ident id);
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr;
+ print_attribute_list attr;
mcode print_string sem
| Ast.FunProto (fninfo,name,lp1,params,va,rp1,sem) ->
List.iter print_fninfo fninfo;
@@ -571,8 +576,7 @@ and declaration d =
print_option (mcode storage) stg; ident name; mcode print_string_box lp;
dots (function _ -> ()) expression args;
close_box(); mcode print_string rp;
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr;
+ print_attribute_list attr;
mcode print_string sem
| Ast.MacroDeclInit(stg,name,lp,args,rp,eq,ini,sem) ->
print_option (mcode storage) stg; ident name; mcode print_string_box lp;
@@ -582,8 +586,7 @@ and declaration d =
print_string " "; initialiser ini; mcode print_string sem
| Ast.TyDecl(ty,attr,sem) ->
fullType ty;
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr;
+ print_attribute_list attr;
mcode print_string sem
| Ast.Typedef(stg,ty,id,sem) ->
mcode print_string stg; print_string " ";
@@ -699,16 +702,13 @@ and parameterTypeDef p =
match Ast.unwrap p with
Ast.VoidParam(ty,attr) ->
fullType ty;
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr
+ print_attribute_list attr
| Ast.Param(ty,Some id,attr) ->
print_named_type ty (fun _ -> ident id);
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr
+ print_attribute_list attr
| Ast.Param(ty,None,attr) ->
fullType ty;
- (if not (attr = []) then print_string " ");
- print_between print_space (mcode print_string) attr
+ print_attribute_list attr
| Ast.MetaParam(name,_,_,_) -> mcode print_meta name
| Ast.MetaParamList(name,_,_,_,_) -> mcode print_meta name
| Ast.PComma(cm) -> mcode print_string cm; print_space()
--
2.21.3
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
next prev parent reply other threads:[~2020-07-08 13:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 13:00 [Cocci] [PATCH v2 RESEND 00/20] parsing_cocci: Wrap SmPL Attributes Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 01/20] parsing_cocci: ast0_cocci: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 02/20] parsing_cocci: parser: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 03/20] parsing_cocci: visitor_ast0: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 04/20] parsing_cocci: adjust_pragmas: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 05/20] parsing_cocci: arity: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 06/20] parsing_cocci: compute_lines: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 07/20] parsing_cocci: context_neg: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 08/20] parsing_cocci: iso_pattern: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 09/20] parsing_cocci: index: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 10/20] parsing_cocci: unparse_ast0: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 11/20] parsing_cocci: ast0toast: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 12/20] parsing_cocci: ast_cocci: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 13/20] parsing_cocci: visitor_ast: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 14/20] parsing_cocci: get_constants2: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 15/20] parsing_cocci: safe_for_multi_decls: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 16/20] parsing_cocci: unify_ast: " Jaskaran Singh
2020-07-08 13:00 ` Jaskaran Singh [this message]
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 18/20] parsing_c: unparse_cocci: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 19/20] engine: cocci_vs_c: " Jaskaran Singh
2020-07-08 13:00 ` [Cocci] [PATCH v2 RESEND 20/20] ocaml: coccilib: " Jaskaran Singh
2020-07-08 18:22 ` [Cocci] [PATCH v2 RESEND 00/20] parsing_cocci: " 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=20200708130035.26687-18-jaskaran.singh@collabora.com \
--to=jaskaran.singh@collabora.com \
--cc=cocci@systeme.lip6.fr \
/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).