Re: [cocci] Need some help with spatch

[Julia Lawall <julia.lawall@inria.fr>]

On Mon, 8 Nov 2021, Vlastimil Babka wrote:

> On 11/8/21 00:08, Vlastimil Babka wrote:
> > On 11/5/21 17:20, Luis Chamberlain wrote:
> >> On Fri, Nov 05, 2021 at 05:12:09PM +0100, Vlastimil Babka wrote:
> >>> 1) patching complex variable declarations;
> >>>
> >>> I need to perform changes such as:
> >>> -struct page *page;
> >>> +struct slab *slab;
> >>>
> >>> This I was able to somehow specify in the .cocci, but not for situations
> >>> where the original declarations looks like this:
> >>>
> >>> struct page *page, *page2;
> >>>
> >>> or
> >>>
> >>> struct page *page = NULL;
> >>
> >> For this, this seems to work well:
> >>
> >> @@
> >> @@
> >>
> >> -struct page
> >> +struct slab
> >
> > Written exactly like above it works, but then it affects code in all
> > functions, and I need some exceptions.
>
> Still not full success, but I was able to make work at least some
> combinations of declaration and initial assignement, such as
>
> struct page *page = NULL;
>
> by a rule like this:
>
> @@
> expression E;
> @@
> - struct page *page = E;
> + struct slab *slab = E;
>
> But still not luck for e.g.
> struct page *page, *page2;
>
> where rules such as
>
> - struct page *page, *page2;
> + struct slab *slab, *slab2;
>
> don't work. Also no luck for this case:
>
> struct page *page, *discard_page = NULL;
>
> And thanks to the hints from Julia I was able to split up the rules so that
> I no longer have unconverted expressions at places where two changes apply
> to a single line.
>
> I'll now try to build 1.1.1 to deal with the whitespace issues.

Sorry, I got interrupted on this.

@initialize:ocaml@
@@

let ok_function p =
  not (List.mem (List.hd p).current_element ["functions";"to";"ignore"])

@@
position p : script:ocaml() { ok_function p };
@@

- struct page@p
+ struct slub

julia