Merge pull request #3598 from parkera/se86_rename_process

Rename Process to CommandLine

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!) {
@@ -1126,7 +1126,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()
@@ -1136,15 +1136,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
       }
@@ -1162,7 +1162,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 renamed to stdlib/public/core/CommandLine.swift

@@ -12,8 +12,11 @@
 
 import SwiftShims
 
+/// Temporary typealias to aid in migration
+public typealias Process = CommandLine
+
 /// 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 +34,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 +57,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);