Rename Process to CommandLine

Rename Process to CommandLine [SE-0086].

Author: parkera

benchmark/utils/ArgParse.swift

@@ -24,7 +24,7 @@ public struct Arguments {
   }
 }
 
-/// Using Process.arguments, returns an Arguments struct describing
+/// Using CommandLine.arguments, returns an Arguments struct describing
 /// the arguments to this program. If we fail to parse arguments, we
 /// return nil.
 ///
@@ -37,13 +37,13 @@ public struct Arguments {
 /// other option passed in is assumed to be a positional argument.
 public func parseArgs(_ validOptions: [String]? = nil)
   -> Arguments? {
-  let progName = Process.arguments[0]
+  let progName = CommandLine.arguments[0]
   var positionalArgs = [String]()
   var optionalArgsMap = [String : String]()
 
   // For each argument we are passed...
   var passThroughArgs = false
-  for arg in Process.arguments[1..<Process.arguments.count] {
+  for arg in CommandLine.arguments[1..<CommandLine.arguments.count] {
     // If the argument doesn't match the optional argument pattern. Add
     // it to the positional argument list and continue...
     if passThroughArgs || !arg.characters.starts(with: "-".characters) {

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -584,7 +584,7 @@ func _stdlib_getline() -> String? {
 
 func _printDebuggingAdvice(_ fullTestName: String) {
   print("To debug, run:")
-  var invocation = [Process.arguments[0]]
+  var invocation = [CommandLine.arguments[0]]
   let interpreter = getenv("SWIFT_INTERPRETER")
   if interpreter != nil {
     if let interpreterCmd = String(validatingUTF8: interpreter!) {
@@ -1122,7 +1122,7 @@ public func runAllTests() {
 #endif
 
   let _isChildProcess: Bool =
-    Process.arguments.contains("--stdlib-unittest-run-child")
+    CommandLine.arguments.contains("--stdlib-unittest-run-child")
 
   if _isChildProcess {
     _childProcess()
@@ -1132,15 +1132,15 @@ public func runAllTests() {
     var args = [String]()
     var i = 0
     i += 1 // Skip the name of the executable.
-    while i < Process.arguments.count {
-      let arg = Process.arguments[i]
+    while i < CommandLine.arguments.count {
+      let arg = CommandLine.arguments[i]
       if arg == "--stdlib-unittest-in-process" {
         runTestsInProcess = true
         i += 1
         continue
       }
       if arg == "--stdlib-unittest-filter" {
-        filter = Process.arguments[i + 1]
+        filter = CommandLine.arguments[i + 1]
         i += 2
         continue
       }
@@ -1158,7 +1158,7 @@ public func runAllTests() {
       }
 
       // Pass through unparsed arguments to the child process.
-      args.append(Process.arguments[i])
+      args.append(CommandLine.arguments[i])
 
       i += 1
     }

stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift

@@ -110,8 +110,8 @@ public func spawnChild(_ args: [String])
     // Start the executable. If execve() does not encounter an error, the
     // code after this block will never be executed, and the parent write pipe
     // will be closed.
-    withArrayOfCStrings([Process.arguments[0]] + args) {
-      execve(Process.arguments[0], $0, _getEnviron())
+    withArrayOfCStrings([CommandLine.arguments[0]] + args) {
+      execve(CommandLine.arguments[0], $0, _getEnviron())
     }
 
     // If execve() encountered an error, we write the errno encountered to the
@@ -182,7 +182,7 @@ public func spawnChild(_ args: [String])
 
   var pid: pid_t = -1
   var childArgs = args
-  childArgs.insert(Process.arguments[0], at: 0)
+  childArgs.insert(CommandLine.arguments[0], at: 0)
   let interpreter = getenv("SWIFT_INTERPRETER")
   if interpreter != nil {
     if let invocation = String(validatingUTF8: interpreter!) {

stdlib/public/core/CMakeLists.txt

@@ -133,7 +133,7 @@ set(SWIFTLIB_SOURCES
   CollectionOfOne.swift
   ExistentialCollection.swift.gyb
   Mirror.swift
-  Process.swift
+  CommandLine.swift
   SliceBuffer.swift
   Tuple.swift.gyb
   UnfoldSequence.swift

stdlib/public/core/Process.swift stdlib/public/core/CommandLine.swift

@@ -13,7 +13,7 @@
 import SwiftShims
 
 /// Command-line arguments for the current process.
-public enum Process {
+public enum CommandLine {
   /// The backing static variable for argument count may come either from the
   /// entry point or it may need to be computed e.g. if we're in the REPL.
   @_versioned
@@ -31,7 +31,7 @@ public enum Process {
 
   /// Access to the raw argc value from C.
   public static var argc: Int32 {
-    _ = Process.unsafeArgv // Force evaluation of argv.
+    _ = CommandLine.unsafeArgv // Force evaluation of argv.
     return _argc
   }
 
@@ -54,10 +54,10 @@ public // COMPILER_INTRINSIC
 func _stdlib_didEnterMain(
   argc: Int32, argv: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>
 ) {
-  // Initialize the Process.argc and Process.unsafeArgv variables with the
+  // Initialize the CommandLine.argc and CommandLine.unsafeArgv variables with the
   // values that were passed in to main.
-  Process._argc = Int32(argc)
-  Process._unsafeArgv = argv
+  CommandLine._argc = Int32(argc)
+  CommandLine._unsafeArgv = argv
 }
 
 // FIXME: Move this to HashedCollections.swift.gyb

stdlib/public/core/GroupInfo.json

@@ -138,7 +138,7 @@
     "Shims.swift",
     "Unmanaged.swift",
     "Availability.swift",
-    "Process.swift",
+    "CommandLine.swift",
     "Tuple.swift",
     "NewtypeWrapper.swift",
     "UnsafeBitMap.swift",

stdlib/public/stubs/CommandLine.cpp

@@ -29,7 +29,7 @@
 #include "../SwiftShims/RuntimeStubs.h"
 #include "../SwiftShims/GlobalObjects.h"
 
-// Backing storage for overrides of `Swift.Process.arguments`.
+// Backing storage for overrides of `Swift.CommandLine.arguments`.
 static char **_swift_stdlib_ProcessOverrideUnsafeArgv = nullptr;
 static int _swift_stdlib_ProcessOverrideUnsafeArgc = 0;
 

test/1_stdlib/CommandLine.swift

@@ -0,0 +1,12 @@
+// RUN: rm -rf %t
+// RUN: mkdir -p %t
+//
+//
+// RUN: %target-build-swift %S/Inputs/CommandLineStressTest/CommandLineStressTest.swift -parse-as-library -force-single-frontend-invocation -module-name CommandLineStressTestSwift -emit-object -o %t/CommandLineStressTestSwift.o
+// RUN: %clang -arch %target-cpu -c -o %t/CommandLineStressTest.o -x c %S/Inputs/CommandLineStressTest/CommandLineStressTest.c
+// RUN: %target-build-swift %t/CommandLineStressTest.o %t/CommandLineStressTestSwift.o -o %t/CommandLineStressTest
+// RUN: %target-run %t/CommandLineStressTest foo bar baz qux quux corge grault garply waldo fred plugh xyzzy and thud
+// REQUIRES: executable_test
+
+// This file is an empty stub to call into the command line stress test which
+// houses `main`.

test/1_stdlib/Inputs/CommandLineStressTest/CommandLineStressTest.c

@@ -0,0 +1,6 @@
+#include "CommandLineStressTest.h"
+
+int main(int argc, char **argv) {
+  swift_commandline_test_getProcessArgs();
+  return 0;
+}

test/1_stdlib/Inputs/CommandLineStressTest/CommandLineStressTest.h

@@ -0,0 +1,2 @@
+// Declared in CommandLineStressTest.swift.
+extern void swift_commandline_test_getProcessArgs(void);

test/1_stdlib/Inputs/ProcessStressTest/ProcessStressTest.swift test/1_stdlib/Inputs/CommandLineStressTest/CommandLineStressTest.swift

@@ -1,37 +1,37 @@
-// Do not change the SIL name for this without also changing ProcessStressTest.c
-@_silgen_name("swift_process_test_getProcessArgs")
+// Do not change the SIL name for this without also changing CommandLineStressTest.c
+@_silgen_name("swift_commandline_test_getProcessArgs")
 public func runTest() {
-  let ProcessRaceTestSuite = TestSuite("Process Race")
+  let CommandLineRaceTestSuite = TestSuite("CommandLine Race")
 
-  ProcessRaceTestSuite.test("passes") {
-    runRaceTest(ProcessRace.self, trials: 1)
+  CommandLineRaceTestSuite.test("passes") {
+    runRaceTest(CommandLineRace.self, trials: 1)
   }
 
   runAllTests()
 }
 
 import StdlibUnittest
 
-struct ProcessRace : RaceTestWithPerTrialData {
-  class ProcessRaceData {
+struct CommandLineRace : RaceTestWithPerTrialData {
+  class CommandLineRaceData {
     init() {}
   }
 
   typealias ThreadLocalData = Void
   typealias Observation = Observation1UInt
 
-  func makeRaceData() -> ProcessRaceData {
-    return ProcessRaceData()
+  func makeRaceData() -> CommandLineRaceData {
+    return CommandLineRaceData()
   }
 
   func makeThreadLocalData() -> Void {
     return Void()
   }
 
   func thread1(
-    _ raceData: ProcessRaceData, _ threadLocalData: inout ThreadLocalData
+    _ raceData: CommandLineRaceData, _ threadLocalData: inout ThreadLocalData
   ) -> Observation {
-    let argptr = Process.unsafeArgv
+    let argptr = CommandLine.unsafeArgv
     return Observation(unsafeBitCast(argptr, to: UInt.self))
   }
 

test/1_stdlib/Inputs/ProcessStressTest/ProcessStressTest.c

@@ -17,8 +17,8 @@ import PrintTestTypes
 let PrintTests = TestSuite("PrintFloat")
 
 PrintTests.setUp {
-  if let localeArgIndex = Process.arguments.index(of: "--locale") {
-    let locale = Process.arguments[localeArgIndex + 1]
+  if let localeArgIndex = CommandLine.arguments.index(of: "--locale") {
+    let locale = CommandLine.arguments[localeArgIndex + 1]
     expectEqual("ru_RU.UTF-8", locale)
     setlocale(LC_ALL, locale)
   } else {

test/1_stdlib/Inputs/ProcessStressTest/ProcessStressTest.h

@@ -138,7 +138,7 @@ case _:
 // CHECK-NEXT: got the expected quick look color
 // CHECK-NEXT: got the expected quick look bezier path
 
-let image = OSImage(contentsOfFile:Process.arguments[1])!
+let image = OSImage(contentsOfFile:CommandLine.arguments[1])!
 switch PlaygroundQuickLook(reflecting: image) {
 case .image(let image2 as OSImage) where image === image2:
   print("got the expected quick look image")

test/1_stdlib/PrintFloat.swift

@@ -28,7 +28,7 @@ class View6Controller : UIViewController { }
 // no nib
 class MissingViewController : UIViewController { }
 
-let bundle = Bundle(path: Process.arguments[1])
+let bundle = Bundle(path: CommandLine.arguments[1])
 
 let v1 = View1Controller(nibName:nil, bundle:bundle)
 print("tag 1 0=\(v1.view.tag) you're it")

test/1_stdlib/Process.swift

@@ -3,4 +3,4 @@
 // REQUIRES: OS=macosx
 
 import AppKit
-NSApplicationMain(Process.argc, Process.unsafeArgv)
+NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)

test/1_stdlib/Reflection_objc.swift

@@ -71,11 +71,11 @@ func driver() {
 
     // Spawn the archiver process.
     let archiverArgv: [UnsafeMutablePointer<Int8>?] = [
-      Process.unsafeArgv[0],
+      CommandLine.unsafeArgv[0],
       UnsafeMutablePointer(("-archive" as StaticString).utf8Start),
       nil
     ]
-    guard posix_spawn(&archiver, Process.unsafeArgv[0],
+    guard posix_spawn(&archiver, CommandLine.unsafeArgv[0],
                       &archiverActions, nil,
                       archiverArgv, envp) == 0 else {
       fatalError("posix_spawn failed")
@@ -101,11 +101,11 @@ func driver() {
     // Spawn the unarchiver process.
     var unarchiver: pid_t = 0
     let unarchiverArgv: [UnsafeMutablePointer<Int8>?] = [
-      Process.unsafeArgv[0],
+      CommandLine.unsafeArgv[0],
       UnsafeMutablePointer(("-unarchive" as StaticString).utf8Start),
       nil
     ]
-    guard posix_spawn(&unarchiver, Process.unsafeArgv[0],
+    guard posix_spawn(&unarchiver, CommandLine.unsafeArgv[0],
                       &unarchiverActions, nil,
                       unarchiverArgv, envp) == 0 else {
       fatalError("posix_spawn failed")
@@ -201,11 +201,11 @@ func unarchive() {
 // Pick a mode based on the command-line arguments.
 // The test launches as a "driver" which then respawns itself into reader
 // and writer subprocesses.
-if Process.arguments.count < 2 {
+if CommandLine.arguments.count < 2 {
   driver()
-} else if Process.arguments[1] == "-archive" {
+} else if CommandLine.arguments[1] == "-archive" {
   archive()
-} else if Process.arguments[1] == "-unarchive" {
+} else if CommandLine.arguments[1] == "-unarchive" {
   unarchive()
 } else {
   fatalError("invalid commandline argument")

test/1_stdlib/UIViewControllerAdditions.swift

@@ -13,8 +13,8 @@
   import Glibc
 #endif
 
-let sourcePath = Process.arguments[1]
-let tempPath = Process.arguments[2] + "/libc.txt"
+let sourcePath = CommandLine.arguments[1]
+let tempPath = CommandLine.arguments[2] + "/libc.txt"
 
 // CHECK: Hello world
 fputs("Hello world", stdout)

test/Interpreter/SDK/NSApplicationMain.swift

@@ -6,7 +6,7 @@
 // REQUIRES: swift_interpreter
 
 print("Begin arguments")
-for arg in Process.arguments { print(arg) }
+for arg in CommandLine.arguments { print(arg) }
 print("End arguments")
 
 // CHECK-NONE: Begin arguments
@@ -21,8 +21,8 @@ print("End arguments")
 // CHECK-THREE-NEXT: End arguments
 
 print("Begin unsafeArgv")
-for i in 0...Int(Process.argc) {
-  print(Process.unsafeArgv[i].map { String(cString: $0) } ?? "(null)")
+for i in 0...Int(CommandLine.argc) {
+  print(CommandLine.unsafeArgv[i].map { String(cString: $0) } ?? "(null)")
 }
 print("End unsafeArgv")
 

test/Interpreter/SDK/archiving_generic_swift_class.swift

@@ -10,7 +10,7 @@
 // REQUIRES: swift_interpreter
 
 print("Begin")
-for arg in Process.arguments {
+for arg in CommandLine.arguments {
   print(arg)
 }
 print("End")

test/Interpreter/SDK/libc.swift

@@ -21,7 +21,7 @@ func f(crash crash: Bool) -> Int {
   }
 }
 
-if Process.arguments.last == "--crash" {
+if CommandLine.arguments.last == "--crash" {
   print("the value is \(f(crash: true))")
 } else {
   print("the value is \(f(crash: false))")

test/Interpreter/process_arguments.swift

@@ -21,6 +21,6 @@ class MyDelegate: NSApplicationDelegate {}
 // Ensure that we coexist with normal references to the functions we
 // implicitly reference in the synthesized main.
 func bar() {
-  NSApplicationMain(Process.argc, Process.unsafeArgv)
+  NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)
 }
 #endif

test/Interpreter/shebang-env.swift

@@ -151,13 +151,13 @@ def process_source(self, name):
 func main() {
   var N = 1
   var name = ""
-  if Process.arguments.count > 1 {
-    N = Process.arguments[1].toInt()!
+  if CommandLine.arguments.count > 1 {
+    N = CommandLine.arguments[1].toInt()!
   }
 """
         main_body = """
   name = "%s"
-  if Process.arguments.count <= 2 || Process.arguments[2] == name {
+  if CommandLine.arguments.count <= 2 || CommandLine.arguments[2] == name {
     let start = __mach_absolute_time__()
     for _ in 1...N {
       bench_%s()