From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Cocci] [PATCH 04/13] parsing_cocci: Add EnumDeclTag and EnumDeclDotsTag to SmPL ASTs
Date: Sun, 8 Mar 2020 14:13:47 +0530 [thread overview]
Message-ID: <20200308084356.14506-5-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200308084356.14506-1-jaskaransingh7654321@gmail.com>
These constructors are needed by the visitor and various other
functions in the codebase. Maintain consistency and add these
constructs w/r/t changes in the SmPL AST.
Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
parsing_cocci/ast0_cocci.ml | 4 ++++
parsing_cocci/ast0_cocci.mli | 4 ++++
parsing_cocci/ast_cocci.ml | 4 ++++
parsing_cocci/ast_cocci.mli | 2 ++
4 files changed, 14 insertions(+)
diff --git a/parsing_cocci/ast0_cocci.ml b/parsing_cocci/ast0_cocci.ml
index b3d8b137..70486e4c 100644
--- a/parsing_cocci/ast0_cocci.ml
+++ b/parsing_cocci/ast0_cocci.ml
@@ -553,6 +553,7 @@ and anything =
| DotsStmtTag of statement dots
| DotsDeclTag of declaration dots
| DotsFieldTag of field dots
+ | DotsEnumDeclTag of enum_decl dots
| DotsCaseTag of case_line dots
| DotsDefParamTag of define_param dots
| IdentTag of ident
@@ -566,6 +567,7 @@ and anything =
| InitTag of initialiser
| DeclTag of declaration
| FieldTag of field
+ | EnumDeclTag of enum_decl
| StmtTag of statement
| ForInfoTag of forinfo
| CaseLineTag of case_line
@@ -585,6 +587,7 @@ let dotsInit x = DotsInitTag x
let dotsStmt x = DotsStmtTag x
let dotsDecl x = DotsDeclTag x
let dotsField x = DotsFieldTag x
+let dotsEnumDecl x = DotsEnumDeclTag x
let dotsCase x = DotsCaseTag x
let dotsDefParam x = DotsDefParamTag x
let ident x = IdentTag x
@@ -601,6 +604,7 @@ let forinfo x = ForInfoTag x
let case_line x = CaseLineTag x
let string_fragment x = StringFragmentTag x
let top x = TopTag x
+let enum_decl x = EnumDeclTag x
(* --------------------------------------------------------------------- *)
(* Avoid cluttering the parser. Calculated in compute_lines.ml. *)
diff --git a/parsing_cocci/ast0_cocci.mli b/parsing_cocci/ast0_cocci.mli
index 732a1345..7b2a87c4 100644
--- a/parsing_cocci/ast0_cocci.mli
+++ b/parsing_cocci/ast0_cocci.mli
@@ -542,6 +542,7 @@ and anything =
| DotsStmtTag of statement dots
| DotsDeclTag of declaration dots
| DotsFieldTag of field dots
+ | DotsEnumDeclTag of enum_decl dots
| DotsCaseTag of case_line dots
| DotsDefParamTag of define_param dots
| IdentTag of ident
@@ -555,6 +556,7 @@ and anything =
| InitTag of initialiser
| DeclTag of declaration
| FieldTag of field
+ | EnumDeclTag of enum_decl
| StmtTag of statement
| ForInfoTag of forinfo
| CaseLineTag of case_line
@@ -574,6 +576,7 @@ val dotsParam : parameterTypeDef dots -> anything
val dotsStmt : statement dots -> anything
val dotsDecl : declaration dots -> anything
val dotsField : field dots -> anything
+val dotsEnumDecl : enum_decl dots -> anything
val dotsCase : case_line dots -> anything
val dotsDefParam : define_param dots -> anything
val ident : ident -> anything
@@ -585,6 +588,7 @@ val param : parameterTypeDef -> anything
val ini : initialiser -> anything
val decl : declaration -> anything
val field : field -> anything
+val enum_decl : enum_decl -> anything
val stmt : statement -> anything
val forinfo : forinfo -> anything
val case_line : case_line -> anything
diff --git a/parsing_cocci/ast_cocci.ml b/parsing_cocci/ast_cocci.ml
index 8fa64dcc..27942992 100644
--- a/parsing_cocci/ast_cocci.ml
+++ b/parsing_cocci/ast_cocci.ml
@@ -790,6 +790,7 @@ and anything =
| LogicalOpTag of logicalOp
| DeclarationTag of declaration
| FieldTag of field
+ | EnumDeclTag of enum_decl
| InitTag of initialiser
| StorageTag of storage
| IncFileTag of inc_file
@@ -807,6 +808,7 @@ and anything =
| StmtDotsTag of statement dots
| AnnDeclDotsTag of annotated_decl dots
| AnnFieldDotsTag of annotated_field dots
+ | EnumDeclDotsTag of enum_decl dots
| DefParDotsTag of define_param dots
| TypeCTag of typeC
| ParamTag of parameterTypeDef
@@ -932,6 +934,7 @@ and tag2c = function
| LogicalOpTag _ -> "LogicalOpTag"
| DeclarationTag _ -> "DeclarationTag"
| FieldTag _ -> "FieldTag"
+ | EnumDeclTag _ -> "EnumDeclTag"
| InitTag _ -> "InitTag"
| StorageTag _ -> "StorageTag"
| IncFileTag _ -> "IncFileTag"
@@ -949,6 +952,7 @@ and tag2c = function
| StmtDotsTag _ -> "StmtDotsTag"
| AnnDeclDotsTag _ -> "AnnDeclDotsTag"
| AnnFieldDotsTag _ -> "AnnFieldDotsTag"
+ | EnumDeclDotsTag _ -> "EnumDeclDotsTag"
| DefParDotsTag _ -> "DefParDotsTag"
| TypeCTag _ -> "TypeCTag"
| ParamTag _ -> "ParamTag"
diff --git a/parsing_cocci/ast_cocci.mli b/parsing_cocci/ast_cocci.mli
index e921f917..8316a427 100644
--- a/parsing_cocci/ast_cocci.mli
+++ b/parsing_cocci/ast_cocci.mli
@@ -759,6 +759,7 @@ and anything =
| LogicalOpTag of logicalOp
| DeclarationTag of declaration
| FieldTag of field
+ | EnumDeclTag of enum_decl
| InitTag of initialiser
| StorageTag of storage
| IncFileTag of inc_file
@@ -776,6 +777,7 @@ and anything =
| StmtDotsTag of statement dots
| AnnDeclDotsTag of annotated_decl dots
| AnnFieldDotsTag of annotated_field dots
+ | EnumDeclDotsTag of enum_decl dots
| DefParDotsTag of define_param dots
| TypeCTag of typeC
| ParamTag of parameterTypeDef
--
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 ` [Cocci] [PATCH 01/13] parsing_cocci: Align " Jaskaran Singh
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 ` Jaskaran Singh [this message]
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 11:41 [Cocci] [PATCH 04/13] parsing_cocci: Add EnumDeclTag and EnumDeclDotsTag to SmPL ASTs 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-5-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).