[Merged by Bors] - Only execute #define if current scope is accepting lines
#7798
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
alice-i-cecile
added
C-Bug
|
Makes sense! Could you add a test for this case? |
|
I've added a test. |
mockersf
approved these changes
Feb 23, 2023
tim-blackbird
approved these changes
Feb 23, 2023
mockersf
added
the
S-Ready-For-Final-Review
alice-i-cecile
approved these changes
Feb 24, 2023
bors bot
pushed a commit
that referenced
this pull request
Feb 24, 2023
# Objective While working on #7784, I noticed that a `#define VAR` in a `.wgsl` file is always effective, even if it its scope is not accepting lines. Example: ```c #define A #ifndef A #define B #endif ``` Currently, `B` will be defined although it shouldn't. This PR fixes that. ## Solution Move the branch responsible for `#define` lines into the last else branch, which is only evaluated if the current scope is accepting lines.
|
Pull request successfully merged into main. Build succeeded:
|
bors
bot
changed the title
#define if current scope is accepting lines#define if current scope is accepting lines
Shfty
pushed a commit
to shfty-rust/bevy
that referenced
this pull request
Mar 19, 2023
…e#7798) # Objective While working on bevyengine#7784, I noticed that a `#define VAR` in a `.wgsl` file is always effective, even if it its scope is not accepting lines. Example: ```c #define A #ifndef A #define B #endif ``` Currently, `B` will be defined although it shouldn't. This PR fixes that. ## Solution Move the branch responsible for `#define` lines into the last else branch, which is only evaluated if the current scope is accepting lines.
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.
Objective
While working on #7784, I noticed that a
#define VARin a.wgslfile is always effective, even if it its scope is not accepting lines.Example:
Currently,
Bwill be defined although it shouldn't. This PR fixes that.Solution
Move the branch responsible for
#definelines into the last else branch, which is only evaluated if the current scope is accepting lines.