From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Cocci] [PATCH 01/13] parsing_cocci: Align C AST and SmPL AST for enum
Date: Sun, 8 Mar 2020 14:13:44 +0530 [thread overview]
Message-ID: <20200308084356.14506-2-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200308084356.14506-1-jaskaransingh7654321@gmail.com>
The C AST and SmPL AST differs with respect to the enum type.
For an enumerator, the C AST is as follows:
Enum -> list of (name, (info, expression))
For the same, the SmPL AST is as follows:
EnumDef -> list of expression
While the SmPL parser does make sure that enumerators are
parsed as per C rules, the OCaml types for an enumerator themselves
mismatch, due to their organization. This causes bugs/mismatches for
cases where enums are in disjunctions.
Make the enumerator type of the SmPL AST closer to that of
the C AST.
Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
parsing_cocci/ast0_cocci.ml | 11 ++++++++++-
parsing_cocci/ast0_cocci.mli | 10 +++++++++-
parsing_cocci/ast_cocci.ml | 9 ++++++++-
parsing_cocci/ast_cocci.mli | 10 +++++++++-
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/parsing_cocci/ast0_cocci.ml b/parsing_cocci/ast0_cocci.ml
index 77dc46f0..b3d8b137 100644
--- a/parsing_cocci/ast0_cocci.ml
+++ b/parsing_cocci/ast0_cocci.ml
@@ -211,7 +211,7 @@ and base_typeC =
string mcode (* ) *) (* IBM C only *)
| EnumName of string mcode (*enum*) * ident option (* name *)
| EnumDef of typeC (* either StructUnionName or metavar *) *
- string mcode (* { *) * expression dots * string mcode (* } *)
+ string mcode (* { *) * enum_decl dots * string mcode (* } *)
| StructUnionName of Ast.structUnion mcode * ident option (* name *)
| StructUnionDef of typeC (* either StructUnionName or metavar *) *
string mcode (* { *) * field dots * string mcode (* } *)
@@ -288,6 +288,15 @@ and bitfield = string mcode (* : *) * expression
and field = base_field wrap
+and base_enum_decl =
+ Enum of ident * (string mcode (* = *) * expression) option
+ | EnumComma of string mcode (* , *)
+ | EnumDots of string mcode (* ... *) * (string mcode * string mcode *
+ enum_decl) option (* whencode *)
+
+and enum_decl = base_enum_decl wrap
+
+
(* --------------------------------------------------------------------- *)
(* Initializers *)
diff --git a/parsing_cocci/ast0_cocci.mli b/parsing_cocci/ast0_cocci.mli
index 274c6bc2..732a1345 100644
--- a/parsing_cocci/ast0_cocci.mli
+++ b/parsing_cocci/ast0_cocci.mli
@@ -202,7 +202,7 @@ and base_typeC =
string mcode (* ) *) (* IBM C only *)
| EnumName of string mcode (*enum*) * ident option (* name *)
| EnumDef of typeC (* either StructUnionName or metavar *) *
- string mcode (* { *) * expression dots * string mcode (* } *)
+ string mcode (* { *) * enum_decl dots * string mcode (* } *)
| StructUnionName of Ast_cocci.structUnion mcode * ident option (* name *)
| StructUnionDef of typeC (* either StructUnionName or metavar *) *
string mcode (* { *) * field dots * string mcode (* } *)
@@ -276,6 +276,14 @@ and bitfield = string mcode (* : *) * expression
and field = base_field wrap
+and base_enum_decl =
+ Enum of ident * (string mcode (* = *) * expression) option
+ | EnumComma of string mcode (* , *)
+ | EnumDots of string mcode (* ... *) * (string mcode * string mcode *
+ enum_decl) option (* whencode *)
+
+and enum_decl = base_enum_decl wrap
+
(* --------------------------------------------------------------------- *)
(* Initializers *)
diff --git a/parsing_cocci/ast_cocci.ml b/parsing_cocci/ast_cocci.ml
index ba6ec29e..8fa64dcc 100644
--- a/parsing_cocci/ast_cocci.ml
+++ b/parsing_cocci/ast_cocci.ml
@@ -351,7 +351,7 @@ and base_typeC =
string mcode (* ) *) (* IBM C only *)
| EnumName of string mcode (*enum*) * ident option (* name *)
| EnumDef of fullType (* either EnumName or metavar *) *
- string mcode (* { *) * expression dots * string mcode (* } *)
+ string mcode (* { *) * enum_decl dots * string mcode (* } *)
| StructUnionName of structUnion mcode * ident option (* name *)
| StructUnionDef of fullType (* either StructUnionName or metavar *) *
string mcode (* { *) * annotated_field dots * string mcode (* } *)
@@ -443,6 +443,13 @@ and base_annotated_field =
and annotated_field = base_annotated_field wrap
+and base_enum_decl =
+ Enum of ident * (string mcode (* = *) * expression) option
+ | EnumComma of string mcode (* , *)
+ | EnumDots of string mcode (* ... *) * enum_decl option (* whencode *)
+
+and enum_decl = base_enum_decl wrap
+
(* --------------------------------------------------------------------- *)
(* Initializers *)
diff --git a/parsing_cocci/ast_cocci.mli b/parsing_cocci/ast_cocci.mli
index 5f21664b..e921f917 100644
--- a/parsing_cocci/ast_cocci.mli
+++ b/parsing_cocci/ast_cocci.mli
@@ -333,7 +333,7 @@ and base_typeC =
string mcode (* ) *) (* IBM C only *)
| EnumName of string mcode (*enum*) * ident option (* name *)
| EnumDef of fullType (* either EnumName or metavar *) *
- string mcode (* { *) * expression dots * string mcode (* } *)
+ string mcode (* { *) * enum_decl dots * string mcode (* } *)
| StructUnionName of structUnion mcode * ident option (* name *)
| StructUnionDef of fullType (* either StructUnionName or metavar *) *
string mcode (* { *) * annotated_field dots * string mcode (* } *)
@@ -424,6 +424,14 @@ and base_annotated_field =
and annotated_field = base_annotated_field wrap
+and base_enum_decl =
+ Enum of ident * (string mcode (* = *) * expression) option
+ | EnumComma of string mcode (* , *)
+ | EnumDots of string mcode (* ... *) * enum_decl option (* whencode *)
+
+and enum_decl = base_enum_decl wrap
+
+
(* --------------------------------------------------------------------- *)
(* Initializers *)
--
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-08 8:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-08 8:43 [Cocci] [PATCH 00/13] cocci: Align the C AST and SmPL AST for enum Jaskaran Singh
2020-03-08 8:43 ` Jaskaran Singh [this message]
2020-03-08 8:43 ` [Cocci] [PATCH 02/13] ocaml: coccilib: Reflect changes in SmPL AST for EnumDef Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 03/13] parsing_cocci: parser: Parse enumerators correctly Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 04/13] parsing_cocci: Add EnumDeclTag and EnumDeclDotsTag to SmPL ASTs Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 05/13] ocaml: coccilib: Reflect EnumDeclTag and EnumDeclDotsTag Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 06/13] parsing_cocci: visitor_ast0: Add visitor functions for enum_decl Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 07/13] parsing_cocci: Reflect visitor_ast0 changes in parsing_cocci Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 08/13] parsing_cocci: Add visitor functions for enum_decl in visitor_ast Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 09/13] cocci: Reflect changes in SmPL visitor_ast in codebase Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 10/13] engine: cocci_vs_c: Match enumerators properly as per enum_decl Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 11/13] cocci: pretty print EnumDef as per enum_decl type Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 12/13] tests: Add test case for assigned enumerator Jaskaran Singh
2020-03-08 8:43 ` [Cocci] [PATCH 13/13] tools: spgen: Reflect visitor changes Jaskaran Singh
2020-03-09 14:15 ` [Cocci] [PATCH 00/13] cocci: Align the C AST and SmPL AST for enum Julia Lawall
2020-03-09 14:51 ` Jaskaran Singh
2020-03-09 10:12 [Cocci] [PATCH 01/13] parsing_cocci: Align " Markus Elfring
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=20200308084356.14506-2-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).