Updated lex emitter to respect escaped spaces when climbing out of the SConscript dir #4168
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…the SCosncript dir
mwichmann
changed the title
…cally what's fixed. Address a few lint issues in the lex.py file
Collaborator
|
It looks like this breaks the argument processing later in the emitter, because now we have a list-of-lists, not a list... these options are no longer recognized: file_gen_options = ["--header-file=", "--tables-file="]Update: it appears the problem is if both file-gen flags are supplied, it's fine with just one (as indicated by the testcase that was added here). Still investigating. |
mwichmann
added a commit
to mwichmann/scons
that referenced
this pull request
Jun 30, 2022
The mocked tools mylex.py and myyacc.py now understand the file-generation options, and generate a dummy file with predictable contents, for checking. This allows more testing of the path through the SCons support for these two without needing live commands. New tests added which invoke the file-generation options, and make sure the extra files are created, and that SCons detects and tracks the added targets. Work is done in a subdirectory, which exposes some existing known inconsistent behavior (the regular generated file goes in the subdir per the LEXCOM and YACCOM generated line, while the ones generated from commandline options go in the topdir) - but we're going to allow that behavior to continue for backwards compat. Same fix applied to yacc tool that PR SCons#4168 did for lex - do subst_list() instead of subst() to preserve spaces in paths. That fix left the lex tool unable to pass the new test, as it could not see the individual arguments in the FLAGS variable, which was solved by indexing into the subst'd list so we can iterate over the args again. Test and tool cleanup; add DefaultEnvironment calls, etc. Note this mentions, but does not address the problem described in issue 4154. Signed-off-by: Mats Wichmann <[email protected]>
3 tasks
Collaborator
|
Just to close the loop in case anyone is prospecting, a simple index into the subst_list result restores the functionality of being able to iterate through the components of the flag in case there are multiple flags in a single string in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
from discord chat: https://discord.com/channels/571796279483564041/971831743944491008/983467680201863329
It was found that if the root dir was under a spaced dir, the lex emitter would not respect the escaped spaces via the use of subst call followed by iterating the CLVar of the returned subst string. CLVar class documents that it must be passed a list to respect spaces.
Contributor Checklist:
CHANGES.txt(and read theREADME.rst)