mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
f2ad545813
"make coccicheck" seems to work OK at GitHub CI using
$ spatch --version
spatch version 1.1.1 compiled with OCaml version 4.13.1
OCaml scripting support: yes
Python scripting support: yes
Syntax of regular expressions: PCRE
but not with
$ spatch --version
spatch version 1.3 compiled with OCaml version 5.3.0
OCaml scripting support: yes
Python scripting support: yes
Syntax of regular expressions: Str
Judging from https://ocaml.org/manual/5.3/api/Str.html, I suspect
that this probably is caused by the distinction between BRE vs PCRE.
As there is no reasonably clean way to write the multiple choice
matches portably between these two pattern languages, let's stop
using regexp_constraint and use compare_constraint instead when
listing the function names to exclude.
There are other uses of "!~" but they all want to match a single
simple token, that should work fine either with BRE or PCRE.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
1.0 KiB
Plaintext
54 lines
1.0 KiB
Plaintext
@@
|
|
expression c;
|
|
@@
|
|
- &c->maybe_tree->object.oid
|
|
+ get_commit_tree_oid(c)
|
|
|
|
@@
|
|
expression c;
|
|
@@
|
|
- c->maybe_tree->object.oid.hash
|
|
+ get_commit_tree_oid(c)->hash
|
|
|
|
@@
|
|
identifier f !~ "^set_commit_tree$";
|
|
expression c;
|
|
expression s;
|
|
@@
|
|
f(...) {<...
|
|
- c->maybe_tree = s
|
|
+ set_commit_tree(c, s)
|
|
...>}
|
|
|
|
// These excluded functions must access c->maybe_tree directly.
|
|
// Note that if c->maybe_tree is written somewhere outside of these
|
|
// functions, then the recommended transformation will be bogus with
|
|
// repo_get_commit_tree() on the LHS.
|
|
@@
|
|
identifier f != { repo_get_commit_tree, get_commit_tree_in_graph_one,
|
|
load_tree_for_commit, set_commit_tree };
|
|
expression c;
|
|
@@
|
|
f(...) {<...
|
|
- c->maybe_tree
|
|
+ repo_get_commit_tree(specify_the_right_repo_here, c)
|
|
...>}
|
|
|
|
@@
|
|
struct commit *c;
|
|
expression E;
|
|
@@
|
|
(
|
|
- c->generation = E;
|
|
+ commit_graph_data_at(c)->generation = E;
|
|
|
|
|
- c->graph_pos = E;
|
|
+ commit_graph_data_at(c)->graph_pos = E;
|
|
|
|
|
- c->generation
|
|
+ commit_graph_generation(c)
|
|
|
|
|
- c->graph_pos
|
|
+ commit_graph_position(c)
|
|
)
|