Fixed regression on defined() preprocessing #152
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
SpaceManiac
requested changes
Jan 17, 2020
src/dreammaker/preprocessor.rs
Outdated
| @@ -955,6 +955,18 @@ impl<'ctx> Preprocessor<'ctx> { | |||
| return Ok(()); | |||
| } | |||
|
|
|||
| // special case for inside a defined() call | |||
| if let Some(Token::Punct(Punctuation::LParen)) = self.output.back() { | |||
| if self.output.len().checked_sub(2).is_some() { | |||
There was a problem hiding this comment.
use the result of this rather than just .is_some() and repeating the calculation below
spookydonut
added a commit
that referenced
this pull request
Jan 24, 2020
Fixes #96. 0a650be changed the preprocessor to always substitute macros for their value if they were defined, as such `#if defined(FOO)` would cause a lint error if `FOO` was defined. There were two different errors with the exact same message, the first would happen if `#define FOO` because `defined()` would have no arguments. The second would happen if `#define FOO 1` because `1` isn't an ident. Because of those tangentially related things I discovered in my attempts to fix the bug, I've changed the error messages to be more specific. (cherry picked from commit bb70113)
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.
Fixes #96
0a650be changed the preprocessor to always substitute macros for their value if they were defined, as such
#if defined(FOO)would cause a lint error ifFOOwas defined.There were two different errors with the exact same message, the first would happen if
#define FOObecausedefined()would have no arguments. The second would happen if#define FOO 1because1isn't an ident.Because of those tangentially related things I discovered in my attempts to fix the bug, I've changed the error messages to be more specific.