-
Notifications
You must be signed in to change notification settings - Fork 441
[SwiftSyntax] Add #_objectFileFormat compilation conditional #3027
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
025b60c
[SwiftSyntax] Add #_objectFileFormat compilation conditional
kubamracek 1861b8d
Reformat sources
kubamracek 96f7e24
Add default implementation, avoid revlock with the swift repo
kubamracek 069bc30
#_objectFileFormat: Use @_spi and throw an error to avoid relying on …
kubamracek fc75c9c
#_objectFileFormat: Remove unused objectFileFormatDoesNotMatch
kubamracek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,6 +36,7 @@ enum IfConfigDiagnostic: Error, CustomStringConvertible { | |
case likelySimulatorPlatform(syntax: ExprSyntax) | ||
case likelyTargetOS(syntax: ExprSyntax, replacement: ExprSyntax?) | ||
case endiannessDoesNotMatch(syntax: ExprSyntax, argument: String) | ||
case objectFileFormatDoesNotMatch(syntax: ExprSyntax, argument: String) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this used anywhere? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed |
||
case macabiIsMacCatalyst(syntax: ExprSyntax) | ||
case expectedModuleName(syntax: ExprSyntax) | ||
case badInfixOperator(syntax: ExprSyntax) | ||
|
@@ -102,6 +103,9 @@ enum IfConfigDiagnostic: Error, CustomStringConvertible { | |
case .endiannessDoesNotMatch: | ||
return "unknown endianness for build configuration '_endian' (must be 'big' or 'little')" | ||
|
||
case .objectFileFormatDoesNotMatch: | ||
return "unknown object file format for build configuration '_objectFileFormat'" | ||
|
||
case .expectedModuleName: | ||
return "expected module name" | ||
|
||
|
@@ -136,6 +140,7 @@ enum IfConfigDiagnostic: Error, CustomStringConvertible { | |
.likelySimulatorPlatform(syntax: let syntax), | ||
.likelyTargetOS(syntax: let syntax, replacement: _), | ||
.endiannessDoesNotMatch(syntax: let syntax, argument: _), | ||
.objectFileFormatDoesNotMatch(syntax: let syntax, argument: _), | ||
.macabiIsMacCatalyst(syntax: let syntax), | ||
.expectedModuleName(syntax: let syntax), | ||
.badInfixOperator(syntax: let syntax), | ||
|
@@ -159,7 +164,7 @@ extension IfConfigDiagnostic: DiagnosticMessage { | |
var severity: SwiftDiagnostics.DiagnosticSeverity { | ||
switch self { | ||
case .compilerVersionSecondComponentNotWildcard, .ignoredTrailingComponents, | ||
.likelySimulatorPlatform, .likelyTargetOS, .endiannessDoesNotMatch, .macabiIsMacCatalyst: | ||
.likelySimulatorPlatform, .likelyTargetOS, .endiannessDoesNotMatch, .objectFileFormatDoesNotMatch, .macabiIsMacCatalyst: | ||
return .warning | ||
default: return .error | ||
} | ||
|
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a default implementation returning
false
so that we can land thisswift-syntax
PR independently beforeswift
repo counterpart?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test failure is because the default implementation is not
public
🙏There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should also make this
@_spi(ExperimentalLanguageFeatures)
so that clients can’t call it as public API and start relying on it.