forked from swiftlang/swift-driver
-
Notifications
You must be signed in to change notification settings - Fork 0
[GSoC] SwiftDriver PR #1
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
Open
stevapple
wants to merge
5
commits into
main
Choose a base branch
from
gsoc-2021
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| //===-------- CheckScriptJob.swift - Swift Script Prechecking Job --------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2021 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See https://swift.org/LICENSE.txt for license information | ||
| // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| import TSCBasic | ||
|
|
||
| public enum ScriptingError: Error, DiagnosticData { | ||
| case tooManyInputFiles | ||
| case noSwiftScript | ||
|
|
||
| public var description: String { | ||
| switch self { | ||
| case .tooManyInputFiles: | ||
| return "Scripting mode expect exactly 1 input file" | ||
|
|
||
| case .noSwiftScript: | ||
| return "'swift-script' tool not found" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension Driver { | ||
| /// Check if the script requires scripting mode. | ||
| func checkScriptJob(inputs: [TypedVirtualPath]) throws -> Job { | ||
| var commandLine: [Job.ArgTemplate] = [] | ||
| commandLine.appendFlags("-frontend", "-print-package-declarations") | ||
|
|
||
| // Check and add the input file. | ||
| guard inputs.count == 1 else { | ||
| throw ScriptingError.tooManyInputFiles | ||
| } | ||
| for input in inputs { | ||
| commandLine.append(.path(input.file)) | ||
| } | ||
|
|
||
| return Job( | ||
| moduleName: moduleOutputInfo.name, | ||
| kind: .checkScript, | ||
| tool: .absolute(try toolchain.getToolPath(.swiftCompiler)), | ||
| commandLine: commandLine, | ||
| inputs: inputs, | ||
| primaryInputs: [], | ||
| outputs: [], | ||
| requiresInPlaceExecution: false, | ||
| supportsResponseFiles: true | ||
| ) | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| //===--------------- RunScriptJob.swift - Swift Scripting Mode ------------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2021 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See https://swift.org/LICENSE.txt for license information | ||
| // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| import TSCBasic | ||
|
|
||
| extension Driver { | ||
| /// Run a script with the `swift-script` tool. | ||
| mutating func runScriptJob(inputs allInputs: [TypedVirtualPath]) throws -> Job { | ||
| // Find and use `swift-script run`. | ||
| let swiftScriptTool = try toolchain.getToolPath(.swiftCompiler).parentDirectory.appending(component: "swift-script") | ||
| guard fileSystem.isExecutableFile(swiftScriptTool) else { | ||
| throw ScriptingError.noSwiftScript | ||
| } | ||
| var commandLine: [Job.ArgTemplate] = [.flag("run")] | ||
|
|
||
| // Add the inputs. | ||
| var inputs: [TypedVirtualPath] = [] | ||
| for input in allInputs { | ||
| commandLine.append(.path(input.file)) | ||
| inputs.append(input) | ||
| } | ||
|
|
||
| // Add frontend arguments. | ||
| var frontendArgs: [Job.ArgTemplate] = swiftCompilerPrefixArgs.map { Job.ArgTemplate.flag($0) } | ||
| try frontendArgs.appendAll(.l, .framework, from: &parsedOptions) | ||
| frontendArgs.forEach { | ||
| commandLine.appendFlag("-Xfrontend") | ||
| commandLine.append($0) | ||
| } | ||
|
|
||
| // Appending extra arguments | ||
| // FIXME: Is there a more elegant solution? | ||
| try commandLine.appendLast(.DASHDASH, from: &parsedOptions) | ||
| if let idx = commandLine.firstIndex(of: .flag("--")) { | ||
| commandLine.remove(at: idx) | ||
| } | ||
|
|
||
| // Explicitly handle -v flag | ||
| // FIXME: Is there a more elegant solution? | ||
| if let idx = commandLine.firstIndex(of: .flag("-v")) { | ||
| commandLine.remove(at: idx) | ||
| stderrStream <<< "\(swiftScriptTool.pathString) \(commandLine.joinedUnresolvedArguments)\n" | ||
| stderrStream.flush() | ||
| } else { | ||
| commandLine.insert(.flag("--quiet"), at: 1) | ||
| } | ||
|
|
||
| return Job( | ||
| moduleName: moduleOutputInfo.name, | ||
| kind: .runScript, | ||
| tool: .absolute(swiftScriptTool), | ||
| commandLine: commandLine, | ||
| inputs: inputs, | ||
| primaryInputs: [], | ||
| outputs: [], | ||
| requiresInPlaceExecution: true, | ||
| supportsResponseFiles: true | ||
| ) | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.