MetaAttributeVal is added to the C AST. Reflect these changes in cocci_vs_c.ml.
Signed-off-by: Jaskaran Singh <[email protected]> --- engine/cocci_vs_c.ml | 8 ++++++-- parsing_c/lib_parsing_c.ml | 3 +++ parsing_c/lib_parsing_c.mli | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/engine/cocci_vs_c.ml b/engine/cocci_vs_c.ml index cba6c8d01..ed91a4785 100644 --- a/engine/cocci_vs_c.ml +++ b/engine/cocci_vs_c.ml @@ -229,6 +229,8 @@ let equal_metavarval valu valu' = | Ast_c.MetaFmtVal a, Ast_c.MetaFmtVal b -> Lib_parsing_c.al_string_format a = Lib_parsing_c.al_string_format b + | Ast_c.MetaAttributeVal a, Ast_c.MetaAttributeVal b -> + Lib_parsing_c.al_attribute a = Lib_parsing_c.al_attribute b | Ast_c.MetaFragListVal a, Ast_c.MetaFragListVal b -> Lib_parsing_c.al_string_fragments a = Lib_parsing_c.al_string_fragments b @@ -287,7 +289,7 @@ let equal_metavarval valu valu' = |B.MetaExprListVal _ |B.MetaExprVal _|B.MetaLocalFuncVal _|B.MetaFuncVal _|B.MetaIdVal _ |B.MetaAssignOpVal _ | B.MetaBinaryOpVal _ - |B.MetaFmtVal _|B.MetaFragListVal _ + |B.MetaFmtVal _|B.MetaFragListVal _|B.MetaAttributeVal _ ), _ -> raise (Impossible 16) @@ -322,6 +324,8 @@ let equal_inh_metavarval valu valu'= | Ast_c.MetaFmtVal a, Ast_c.MetaFmtVal b -> Lib_parsing_c.al_inh_string_format a = Lib_parsing_c.al_inh_string_format b + | Ast_c.MetaAttributeVal a, Ast_c.MetaAttributeVal b -> + Lib_parsing_c.al_inh_attribute a = Lib_parsing_c.al_inh_attribute b | Ast_c.MetaFragListVal a, Ast_c.MetaFragListVal b -> Lib_parsing_c.al_inh_string_fragments a = Lib_parsing_c.al_inh_string_fragments b @@ -388,7 +392,7 @@ let equal_inh_metavarval valu valu'= |B.MetaExprListVal _ |B.MetaExprVal _|B.MetaLocalFuncVal _|B.MetaFuncVal _|B.MetaIdVal _ |B.MetaAssignOpVal _ | B.MetaBinaryOpVal _ - |B.MetaFmtVal _|B.MetaFragListVal _ + |B.MetaFmtVal _|B.MetaFragListVal _|B.MetaAttributeVal _ ), _ -> raise (Impossible 17) diff --git a/parsing_c/lib_parsing_c.ml b/parsing_c/lib_parsing_c.ml index 99e43be3b..687833604 100644 --- a/parsing_c/lib_parsing_c.ml +++ b/parsing_c/lib_parsing_c.ml @@ -86,6 +86,7 @@ let al_name x = Visitor_c.vk_name_s (strip_info_visitor()) x let al_string_format x = Visitor_c.vk_string_format_s (strip_info_visitor()) x let al_string_fragments x = Visitor_c.vk_string_fragments_s (strip_info_visitor()) x +let al_attribute x = Visitor_c.vk_attribute_s (strip_info_visitor()) x let al_node x = Visitor_c.vk_node_s (strip_info_visitor()) x @@ -147,6 +148,7 @@ let al_inh_string_format x = Visitor_c.vk_string_format_s (strip_inh_info_visitor()) x let al_inh_string_fragments x = Visitor_c.vk_string_fragments_s (strip_inh_info_visitor()) x +let al_inh_attribute x = Visitor_c.vk_attribute_s (strip_inh_info_visitor()) x @@ -184,6 +186,7 @@ let semi_al_string_format = Visitor_c.vk_string_format_s semi_strip_info_visitor let semi_al_string_fragments = Visitor_c.vk_string_fragments_s semi_strip_info_visitor +let semi_al_attribute = Visitor_c.vk_attribute_s semi_strip_info_visitor let semi_al_program = List.map (Visitor_c.vk_toplevel_s semi_strip_info_visitor) diff --git a/parsing_c/lib_parsing_c.mli b/parsing_c/lib_parsing_c.mli index d9578f3ca..0e53f9060 100644 --- a/parsing_c/lib_parsing_c.mli +++ b/parsing_c/lib_parsing_c.mli @@ -22,6 +22,7 @@ val al_arguments : val al_fields : Ast_c.field list -> Ast_c.field list val al_name : Ast_c.name -> Ast_c.name val al_string_format : Ast_c.string_format -> Ast_c.string_format +val al_attribute : Ast_c.attribute -> Ast_c.attribute val al_string_fragments : Ast_c.string_fragment list -> Ast_c.string_fragment list val al_node : Control_flow_c.node -> Control_flow_c.node @@ -44,6 +45,7 @@ val al_inh_arguments : val al_inh_string_format : Ast_c.string_format -> Ast_c.string_format val al_inh_string_fragments : Ast_c.string_fragment list -> Ast_c.string_fragment list +val al_inh_attribute : Ast_c.attribute -> Ast_c.attribute val semi_strip_info_visitor : Visitor_c.visitor_c_s val semi_al_expr : Ast_c.expression -> Ast_c.expression val semi_al_declaration : Ast_c.declaration -> Ast_c.declaration @@ -67,6 +69,7 @@ val semi_al_arguments : val semi_al_string_format : Ast_c.string_format -> Ast_c.string_format val semi_al_string_fragments : Ast_c.string_fragment list -> Ast_c.string_fragment list +val semi_al_attribute : Ast_c.attribute -> Ast_c.attribute val semi_al_program : Ast_c.toplevel list -> Ast_c.toplevel list val real_strip_info_visitor : 'a -> Visitor_c.visitor_c_s val real_al_expr : Ast_c.expression -> Ast_c.expression -- 2.21.3 _______________________________________________ Cocci mailing list [email protected] https://systeme.lip6.fr/mailman/listinfo/cocci
