rename default initializer's ActorSystem parameter name to actorSystem

kavon · kavon · commit 01a5fafa7ce0 · 2022-03-24T16:18:49.000-07:00
Konrad, myself, and others feel the longer name would be better, rather than just "system"
diff --git a/lib/Sema/CodeSynthesis.cpp b/lib/Sema/CodeSynthesis.cpp
@@ -302,8 +302,8 @@ static ConstructorDecl *createImplicitConstructor(NominalTypeDecl *decl,
       accessLevel = decl->getEffectiveAccess();
       auto systemTy = getDistributedActorSystemType(classDecl);
 
-      // Create the parameter.
-      auto *arg = new (ctx) ParamDecl(SourceLoc(), Loc, ctx.Id_system, Loc,
+      // Create the parameter. API name is actorSystem, local name is system
+      auto *arg = new (ctx) ParamDecl(SourceLoc(), Loc, ctx.Id_actorSystem, Loc,
                                       ctx.Id_system, decl);
       arg->setSpecifier(ParamSpecifier::Default);
       arg->setInterfaceType(systemTy);
diff --git a/test/Distributed/Runtime/distributed_actor_decode.swift b/test/Distributed/Runtime/distributed_actor_decode.swift
@@ -262,7 +262,7 @@ func test() {
 
   // CHECK: assign type:DA, address:ActorAddress(address: "xxx")
   // CHECK: ready actor:DA(ActorAddress(address: "xxx"))
-  let da = DA(system: system)
+  let da = DA(actorSystem: system)
 
   // CHECK: encode: ActorAddress(address: "xxx")
   let encoder = TestEncoder(system: system)
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift
@@ -28,7 +28,7 @@ distributed actor Greeter {
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   let reply = try await ref.echo(name: "Caplin")
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift
@@ -27,7 +27,7 @@ distributed actor Greeter {
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   try await ref.empty()
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift
@@ -35,7 +35,7 @@ distributed actor Greeter {
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   let r1 = try await ref.generic("Caplin")
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift
@@ -28,7 +28,7 @@ distributed actor Greeter {
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   let response = try await ref.hello()
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift
@@ -28,7 +28,7 @@ distributed actor Greeter {
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   try await ref.take(name: "Caplin")
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift
@@ -30,7 +30,7 @@ struct SomeError: Error, Sendable, Codable {}
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   do {
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift
@@ -40,7 +40,7 @@ distributed actor Greeter {
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   try await ref.take(name: "Caplin", int: 1337)
diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift
@@ -30,7 +30,7 @@ struct SomeError: Error, Sendable, Codable {}
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   do {
diff --git a/test/Distributed/Runtime/distributed_actor_isRemote.swift b/test/Distributed/Runtime/distributed_actor_isRemote.swift
@@ -28,7 +28,7 @@ func test_remote() async {
   let address = ActorAddress(parse: "sact://127.0.0.1/example#1234")
   let system = DefaultDistributedActorSystem()
 
-  let local = SomeSpecificDistributedActor(system: system)
+  let local = SomeSpecificDistributedActor(actorSystem: system)
   assert(__isLocalActor(local) == true, "should be local")
   assert(__isRemoteActor(local) == false, "should be local")
   print("isRemote(local) = \(__isRemoteActor(local))") // CHECK: isRemote(local) = false
diff --git a/test/Distributed/Runtime/distributed_actor_local.swift b/test/Distributed/Runtime/distributed_actor_local.swift
@@ -33,27 +33,27 @@ func test_initializers() {
   let address = ActorAddress(parse: "")
   let system = DefaultDistributedActorSystem()
 
-  _ = SomeSpecificDistributedActor(system: system)
+  _ = SomeSpecificDistributedActor(actorSystem: system)
   _ = try! SomeSpecificDistributedActor.resolve(id: address, using: system)
 }
 
 func test_address() {
   let system = DefaultDistributedActorSystem()
 
-  let actor = SomeSpecificDistributedActor(system: system)
+  let actor = SomeSpecificDistributedActor(actorSystem: system)
   _ = actor.id
 }
 
 func test_run(system: FakeActorSystem) async {
-  let actor = SomeSpecificDistributedActor(system: system)
+  let actor = SomeSpecificDistributedActor(actorSystem: system)
 
   print("before") // CHECK: before
   try! await actor.hello()
   print("after") // CHECK: after
 }
 
 func test_echo(system: FakeActorSystem) async {
-  let actor = SomeSpecificDistributedActor(system: system)
+  let actor = SomeSpecificDistributedActor(actorSystem: system)
 
   let echo = try! await actor.echo(int: 42)
   print("echo: \(echo)") // CHECK: echo: 42
diff --git a/test/Distributed/Runtime/distributed_actor_remoteCall.swift b/test/Distributed/Runtime/distributed_actor_remoteCall.swift
@@ -297,7 +297,7 @@ let expectsDecodeErrorName = "$s4main7GreeterC18expectsDecodeError1vySiSgSgSg_tY
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
 
   // act as if we decoded an Invocation:
   var emptyInvocation = FakeInvocationDecoder(args: [])
diff --git a/test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip.swift b/test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip.swift
@@ -42,7 +42,7 @@ struct SomeError: Error {}
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Greeter(system: system)
+  let local = Greeter(actorSystem: system)
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   let reply = try await ref.echo(name: "Caplin")
diff --git a/test/Distributed/Runtime/distributed_actor_remote_functions.swift b/test/Distributed/Runtime/distributed_actor_remote_functions.swift
@@ -234,7 +234,7 @@ func test_remote_invoke(address: ActorAddress, system: FakeActorSystem) async {
   let remote = try! SomeSpecificDistributedActor.resolve(id: address, using: system)
   assert(__isRemoteActor(remote) == true, "should be remote")
 
-  let local = SomeSpecificDistributedActor(system: system)
+  let local = SomeSpecificDistributedActor(actorSystem: system)
   assert(__isRemoteActor(local) == false, "should be local")
 
   print("local isRemote: \(__isRemoteActor(local))")
diff --git a/test/Distributed/Runtime/distributed_actor_self_calls.swift b/test/Distributed/Runtime/distributed_actor_self_calls.swift
@@ -137,7 +137,7 @@ typealias DefaultDistributedActorSystem = FakeActorSystem
 // ==== Execute ----------------------------------------------------------------
 
 func test(system: FakeActorSystem) async {
-  _ = Philosopher(system: system)
+  _ = Philosopher(actorSystem: system)
 }
 
 @main struct Main {
diff --git a/test/Distributed/Runtime/distributed_actor_whenLocal.swift b/test/Distributed/Runtime/distributed_actor_whenLocal.swift
@@ -28,7 +28,7 @@ typealias DefaultDistributedActorSystem = FakeActorSystem
 func test() async throws {
   let system = DefaultDistributedActorSystem()
 
-  let local = Capybara(system: system)
+  let local = Capybara(actorSystem: system)
   // await local.eat() // SHOULD ERROR
   let valueWhenLocal: String? = await local.whenLocal { __secretlyKnownToBeLocal in
     __secretlyKnownToBeLocal.eat()
diff --git a/test/Distributed/distributed_actor_initialization.swift b/test/Distributed/distributed_actor_initialization.swift
@@ -56,15 +56,15 @@ distributed actor OK6 {
 distributed actor OKMulti {
 
   convenience init(y: Int, system: FakeActorSystem) { // ok
-    self.init(system: system)
+    self.init(actorSystem: system)
   }
 
 }
 
 distributed actor OKMultiDefaultValues {
 
   convenience init(y: Int, system: FakeActorSystem, x: Int = 1234) { // ok
-    self.init(system: system)
+    self.init(actorSystem: system)
   }
 
 }
