On Sun, Jan 09, 2022 at 01:18:32AM +0100, Roland Illig wrote: > If I were to extract the newly added code into a function call > cpp_skip_string(&p, varname), would that help? That function could be > used in var.c as well, for example in ModMatch and ModMatchEq. Yes, it should be a utility function IMO.