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 <[email protected]>
---
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
[email protected]
https://systeme.lip6.fr/mailman/listinfo/cocci
