Improvements to Make lexer #1285
Merged
Conversation
This file contains 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
\s matches newline characters which are syntacically distinct from whitespace in makefiles
Both are valid for both variable expansions and function invocations, wherever they occur.
…e, endif These can occur both inside and outside recipes (called block_body state here) without causing the recipe to end.
pyrmont
suggested changes
Jul 28, 2019
There was a problem hiding this comment.
@bavison Thanks for submitting a PR!
In addition to these comments, could you update the visual sample to include some of the syntax that should now work with this lexer? It would be good to visually confirm that's working as intended.
pyrmont
added
author-action
This is required in order to handle user-defined function definitions
This one is typically used for RISC OS makefiles. The comma is not a typo.
pyrmont
suggested changes
Jul 30, 2019
pyrmont
approved these changes
Jul 30, 2019
|
Thanks for the work on this one, too, @bavison! Writing that commit message really brought home how much this is an improvement on the previous version of the lexer O_O |
pyrmont
removed
the
author-action
bavison
added a commit
to bavison/rouge
that referenced
this pull request
Sep 9, 2019
This commit improves the Make lexer in the following ways:
- use`\t` in place of` \s`;
- support syntax variant `${}` as well as `$()`;
- support all built-in functions, not just `$(shell...)`;
- support include directive;
- support conditional directives `ifdef`, `ifndef`, `ifeq`, `ifneq`,
`else`, `endif`;
- support substitution references when expanding variables;
- permit macro names to start with digits; and
- register additional filename extensions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is still far from handling the full syntax of makefiles, but it handles far more of the examples I threw at it than the previous version.
If I have one main remaining observation, it's that variable expansions and function invocations (i.e.
$(thing)) is actually valid at any point in a makefile, but they are only being fully lexed when they occur within a recipe line. For example, in the following slightly contrived example,the only
$(shell...)function that is differentially coloured into its component parts is the one on the penultimate line (and in fact lexing fails if you try it on the left-hand side of an assignment). By contrast, I note that GitHub's colouring above treats them all the same.I'm not sure how consistency can be efficiently achieved.