Implement %elif #710
Closed
Implement %elif #710
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
pmatilai
reviewed
May 21, 2019
build/parseSpec.c
Outdated
| after_classification: | ||
| if (match != -1) { | ||
| if (lineType->id & (LINE_IF | LINE_IFARCH | LINE_IFNARCH | LINE_IFOS | | ||
| LINE_IFNOS)) { |
There was a problem hiding this comment.
This calls for a bitmask, something like LINE_IFANY, which can be used to trap all the types with one symbol. Makes the line shorter and more readable. (fwiw no I'm not reviewing, just taking a look)
pmatilai
reviewed
May 21, 2019
pmatilai
reviewed
May 21, 2019
|
Panu's comments are incorporated. |
pmatilai
reviewed
May 22, 2019
build/parseSpec.c
Outdated
| rl->lastConditional = lineType; | ||
| spec->readStack = rl; | ||
| spec->line[0] = '\0'; | ||
| } else if (lineType->id & (LINE_ELIF | LINE_ELIFARCH | LINE_ELIFOS)) { |
There was a problem hiding this comment.
The various ELIF's are another candidate for a bit mask, this set is repeated at least twice in the patch (used earlier in the "dont expand in false branch" check). In general, when addressing something, it pays to look for similar cases/opportunities/bugs, they're quite often there.
There was a problem hiding this comment.
It is changed in the new version.
No functional change, preparation for %elif.
No functional change
informative The original message like e.g.: error: /data/rpmbuild/SPECS/iftest.spec:8: bad %if condition is changed to error: /data/rpmbuild/SPECS/iftest.spec:8: Bad %if condition: nonsense-3 Preparation for %elif.
There may be several %elifs within the same %if statement. They must be placed after %if and before %endif and %else (if %else is contained). The first %elif expression (if any) that evaluates to TRUE would be executed. In scope of %if you can use any of the new operators - %elif, %elifarch, %elifos. Similarly for %ifos, %ifnos, %ifarch and %ifnarch. The expression after %elif (resp. %elifos or %elifarch) is expandedd iff the expression can influence the execution of the %elif branch. E.g.: an %elif expression after the first %elif expression that evaluates to TRUE is not expanded.
|
Corrected the commit message of the first commit. |
|
Ok, Rebased and merged. |
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.
No description provided.