Skip to content

Conversation

@demerphq
Copy link
Collaborator

This is a set of manual adjustments to WS in our headers and in a few cases to our code which parses headers to harden them against whitespace change. It consists primarily of WS changes to the headers, or minor adjustments to how we handle certain cases in our headers.

@demerphq
Copy link
Collaborator Author

Note this contains the manual changes from my other WS related PR, which is distinct from this. I wanted to get these in as they all improve legibility or functionality IMO.

@jkeenan
Copy link
Contributor

jkeenan commented Dec 30, 2022

@demerphq, the merged conflicts which GH flagged last week in intrpvar.h appear to have been resolved, but there are 5 conflicts remaining in regen/regcomp.pl. Could you take a look so that we can merge this p.r.?

Thank you very much.

The old code used a regex that would split on exactly one space, so if
the data was changed to have more than one then it would get absorbed
into the name that was parsed out of the header file, leading the code
to test for things like "FOO ", which of course don't exist. Likely this
could have caused other issues too, but the defines in practice are
single symbols.
and make sure they are shorter than 80 cols
None of these are used anymore. See c62fdeb
for more details.
Someone missed an '_' in the name in the comment, the correct
name is 'PL_in_eval' not 'PL in_eval'.
a later commit will resplit this again
The prevous verbiage ended the comment with the term "padnamelist *",
which put the "*" right next to the end comment marker, which was
a bit confusing. This wording put the * in the middle of the sentence
where it is clear it is not a mistake.

Also note that the previous text used tabs internally, and so this change
/looks/ like it is off indent, it is not, it is lined up with the surrounding
lines.
The old text was difficult to wrap and a little disjointed in terms of
readibility. This captures the same essence but in a more concise and
easier to wrap form.
Makes it a bit more clear that this is documenting two things.
this make the table layout of the defines more obvious.
@demerphq demerphq force-pushed the yves/ws_cleanup_headers_manually branch from e4f069c to efd8688 Compare December 30, 2022 17:01
@demerphq
Copy link
Collaborator Author

@jkeenan done. I was able to drop two of the patches as they are no longer necessary due to the use of regen/HeaderParser.pm. Thanks for the heads up.

@jkeenan jkeenan merged commit 3b3e6fa into blead Dec 30, 2022
@jkeenan jkeenan deleted the yves/ws_cleanup_headers_manually branch December 30, 2022 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants