From: Jaskaran Singh <jaskaran.singh@collabora.com>
To: cocci@systeme.lip6.fr
Subject: [Cocci] [PATCH v2 RESEND 05/20] parsing_cocci: arity: Wrap SmPL Attributes
Date: Wed, 8 Jul 2020 18:30:20 +0530 [thread overview]
Message-ID: <20200708130035.26687-6-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
arity.ml.
Signed-off-by: Jaskaran Singh <jaskaran.singh@collabora.com>
---
parsing_cocci/arity.ml | 55 +++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 30 deletions(-)
diff --git a/parsing_cocci/arity.ml b/parsing_cocci/arity.ml
index 3bbecedf..23eb32f9 100644
--- a/parsing_cocci/arity.ml
+++ b/parsing_cocci/arity.ml
@@ -256,10 +256,10 @@ let rec top_expression opt_allowed tgt expr =
make_exp expr tgt arity (Ast0.RecordPtAccess(exp,ar,field))
| Ast0.Cast(lp,ty,attr,rp,exp) ->
let arity =
- exp_same (mcode2line lp) (List.map mcode2arity ([lp] @ attr @ [rp])) in
+ exp_same (mcode2line lp) (List.map mcode2arity ([lp;rp])) in
let lp = mcode lp in
let ty = typeC arity ty in
- let attr = List.map mcode attr in
+ let attr = List.map attribute attr in
let rp = mcode rp in
let exp = expression arity exp in
make_exp expr tgt arity (Ast0.Cast(lp,ty,attr,rp,exp))
@@ -564,7 +564,7 @@ and declaration tgt decl =
let stg = get_option mcode stg in
let ty = typeC arity ty in
let id = ident false arity id in
- let attr = List.map mcode attr in
+ let attr = List.map attribute attr in
let eq = mcode eq in
let exp = initialiser arity exp in
let sem = mcode sem in
@@ -577,7 +577,7 @@ and declaration tgt decl =
let stg = get_option mcode stg in
let ty = typeC arity ty in
let id = ident false arity id in
- let attr = List.map mcode attr in
+ let attr = List.map attribute attr in
let sem = mcode sem in
make_decl decl tgt arity (Ast0.UnInit(stg,ty,id,attr,sem))
| Ast0.FunProto(fi,name,lp1,params,va,rp1,sem) ->
@@ -601,13 +601,13 @@ and declaration tgt decl =
let arity =
all_same true tgt (mcode2line lp)
((match stg with None -> [] | Some x -> [mcode2arity x]) @
- (List.map mcode2arity ([lp;rp] @ attr @ [sem]))) in
+ (List.map mcode2arity ([lp;rp;sem]))) in
let stg = get_option mcode stg in
let name = ident false arity name in
let lp = mcode lp in
let args = dots (expression arity) args in
let rp = mcode rp in
- let attr = List.map mcode attr in
+ let attr = List.map attribute attr in
let sem = mcode sem in
make_decl decl tgt arity (Ast0.MacroDecl(stg,name,lp,args,rp,attr,sem))
| Ast0.MacroDeclInit(stg,name,lp,args,rp,eq,ini,sem) ->
@@ -626,10 +626,10 @@ and declaration tgt decl =
(Ast0.MacroDeclInit(stg,name,lp,args,rp,eq,ini,sem))
| Ast0.TyDecl(ty,attr,sem) ->
let arity =
- all_same true tgt
- (mcode2line sem) (List.map mcode2arity (attr @ [sem])) in
+ all_same true tgt
+ (mcode2line sem) [mcode2arity sem] in
let ty = typeC arity ty in
- let attr = List.map mcode attr in
+ let attr = List.map attribute attr in
let sem = mcode sem in
make_decl decl tgt arity (Ast0.TyDecl(ty,attr,sem))
| Ast0.Typedef(stg,ty,id,sem) ->
@@ -816,40 +816,30 @@ and make_param =
and parameterTypeDef tgt param =
let param_same = all_same true tgt in
- let make_param_attr param tgt ret = function
- [] -> Ast0.rewrap param ret
- | x::_ as xs ->
- let arity = param_same (mcode2line x) (List.map mcode2arity xs) in
- make_param param tgt arity ret in
match Ast0.unwrap param with
Ast0.VoidParam(ty,attr) ->
- let ty = top_typeC tgt true ty in
- let attr = List.map mcode attr in
- let ret = Ast0.VoidParam(ty,attr) in
- make_param_attr param tgt ret attr
+ Ast0.rewrap param (Ast0.VoidParam(typeC tgt ty,List.map attribute attr))
| Ast0.Param(ty,Some id,attr) ->
let ty = top_typeC tgt true ty in
let id = ident true tgt id in
- let attr = List.map mcode attr in
- let ret =
- match (Ast0.unwrap ty,Ast0.unwrap id) with
+ let attr = List.map attribute attr in
+ Ast0.rewrap param
+ (match (Ast0.unwrap ty,Ast0.unwrap id) with
(Ast0.OptType(ty),Ast0.OptIdent(id)) ->
Ast0.OptParam(Ast0.rewrap param (Ast0.Param(ty,Some id,attr)))
| (Ast0.OptType(ty),_) ->
fail param "arity mismatch in param declaration"
| (_,Ast0.OptIdent(id)) ->
fail param "arity mismatch in param declaration"
- | _ -> Ast0.Param(ty,Some id,attr) in
- make_param_attr param tgt ret attr
+ | _ -> Ast0.Param(ty,Some id,attr))
| Ast0.Param(ty,None,attr) ->
let ty = top_typeC tgt true ty in
- let attr = List.map mcode attr in
- let ret =
- match Ast0.unwrap ty with
+ let attr = List.map attribute attr in
+ Ast0.rewrap param
+ (match Ast0.unwrap ty with
Ast0.OptType(ty) ->
Ast0.OptParam(Ast0.rewrap param (Ast0.Param(ty,None,attr)))
- | _ -> Ast0.Param(ty,None,attr) in
- make_param_attr param tgt ret attr
+ | _ -> Ast0.Param(ty,None,attr))
| Ast0.MetaParam(name,cstr,pure) ->
let arity = param_same (mcode2line name) [mcode2arity name] in
let name = mcode name in
@@ -1272,7 +1262,7 @@ and fninfo arity = function
Ast0.FStorage(stg) -> Ast0.FStorage(mcode stg)
| Ast0.FType(ty) -> Ast0.FType(typeC arity ty)
| Ast0.FInline(inline) -> Ast0.FInline(mcode inline)
- | Ast0.FAttr(attr) -> Ast0.FAttr(mcode attr)
+ | Ast0.FAttr(attr) -> Ast0.FAttr(attribute attr)
and fninfo2arity fninfo =
List.concat
@@ -1281,9 +1271,14 @@ and fninfo2arity fninfo =
Ast0.FStorage(stg) -> [mcode2arity stg]
| Ast0.FType(ty) -> []
| Ast0.FInline(inline) -> [mcode2arity inline]
- | Ast0.FAttr(attr) -> [mcode2arity attr])
+ | Ast0.FAttr(attr) -> [])
fninfo)
+and attribute attr =
+ match Ast0.unwrap attr with
+ Ast0.Attribute(a) ->
+ Ast0.rewrap attr (Ast0.Attribute(mcode a))
+
and whencode notfn alwaysfn expression = function
Ast0.WhenNot (w,e,a) -> Ast0.WhenNot (w,e,notfn a)
| Ast0.WhenAlways (w,e,a) -> Ast0.WhenAlways (w,e,alwaysfn a)
--
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 ` Jaskaran Singh [this message]
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 ` [Cocci] [PATCH v2 RESEND 17/20] parsing_cocci: pretty_print_cocci: " Jaskaran Singh
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-6-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).