Update more tests to use ()'s around function types.

Author: lattner

test/IRGen/class_isa_pointers.sil

@@ -24,7 +24,7 @@ sil_vtable Purebred {}
 // CHECK:         getelementptr inbounds {{.*}} [[VTABLE]]
 sil @purebred_method : $@convention(thin) (@owned Purebred) -> () {
 entry(%0 : $Purebred):
-  %m = class_method %0 : $Purebred, #Purebred.method!1 : Purebred -> () -> (), $@convention(method) (@guaranteed Purebred) -> ()
+  %m = class_method %0 : $Purebred, #Purebred.method!1 : (Purebred) -> () -> (), $@convention(method) (@guaranteed Purebred) -> ()
   %z = apply %m(%0) : $@convention(method) (@guaranteed Purebred) -> ()
   return %z : $()
 }
@@ -48,7 +48,7 @@ sil_vtable Mongrel {}
 // CHECK:         getelementptr inbounds {{.*}} [[VTABLE]]
 sil @mongrel_method : $@convention(thin) (@owned Mongrel) -> () {
 entry(%0 : $Mongrel):
-  %m = class_method %0 : $Mongrel, #Mongrel.method!1 : Mongrel -> () -> (), $@convention(method) (@guaranteed Mongrel) -> ()
+  %m = class_method %0 : $Mongrel, #Mongrel.method!1 : (Mongrel) -> () -> (), $@convention(method) (@guaranteed Mongrel) -> ()
   %z = apply %m(%0) : $@convention(method) (@guaranteed Mongrel) -> ()
   return %z : $()
 }

test/IRGen/dynamic_init.sil

@@ -24,7 +24,7 @@ bb0(%0 : $@thick C.Type):
   // CHECK:   [[CTOR:%[0-9]+]] = load %C12dynamic_init1C* (%swift.type*)*, %C12dynamic_init1C* (%swift.type*)** [[VTABLE_OFFSET]], align 8
   // CHECK:   [[CTOR_I8:%[0-9]+]] = bitcast %C12dynamic_init1C* (%swift.type*)* [[CTOR]] to i8*
   // CHECK:   [[CTOR_FN:%[0-9]+]] = bitcast i8* [[CTOR_I8]] to %C12dynamic_init1C* (%swift.type*)*
-  %2 = class_method %0 : $@thick C.Type, #C.init!allocator.1 : C.Type -> () -> C , $@convention(method) (@thick C.Type) -> @owned C
+  %2 = class_method %0 : $@thick C.Type, #C.init!allocator.1 : (C.Type) -> () -> C , $@convention(method) (@thick C.Type) -> @owned C
   // CHECK:   [[RESULT:%[0-9]+]] = call %C12dynamic_init1C* [[CTOR_FN]](%swift.type* %0)
   %3 = apply %2(%0) : $@convention(method) (@thick C.Type) -> @owned C
   // CHECK:   call void bitcast (void (%swift.refcounted*)* @rt_swift_release to void (%C12dynamic_init1C*)*)(%C12dynamic_init1C* [[RESULT]])

test/IRGen/enum_function_payload.swift

@@ -1,16 +1,16 @@
 // RUN: %target-swift-frontend -emit-ir %s
 
 enum Singleton {
-  case F(Singleton -> ())
+  case F((Singleton) -> ())
 }
 
 enum Single {
-  case F(Single -> ())
+  case F((Single) -> ())
   case X
   case Y
 }
 
 enum Multi {
-  case F(Multi -> ())
-  case G(Multi -> ())
+  case F((Multi) -> ())
+  case G((Multi) -> ())
 }

test/IRGen/enum_resilience.swift

@@ -190,10 +190,10 @@ public func resilientSwitchTest(_ m: Medium) -> Int {
   }
 }
 
-public func reabstraction<T>(_ f: Medium -> T) {}
+public func reabstraction<T>(_ f: (Medium) -> T) {}
 
 // CHECK-LABEL: define{{( protected)?}} void @_TF15enum_resilience25resilientEnumPartialApplyFFO14resilient_enum6MediumSiT_(i8*, %swift.refcounted*)
-public func resilientEnumPartialApply(_ f: Medium -> Int) {
+public func resilientEnumPartialApply(_ f: (Medium) -> Int) {
 
 // CHECK:     [[CONTEXT:%.*]] = call noalias %swift.refcounted* @rt_swift_allocObject
 // CHECK:     call void @_TF15enum_resilience13reabstractionurFFO14resilient_enum6MediumxT_(i8* bitcast (void (%Si*, %swift.opaque*, %swift.refcounted*)* @_TPA__TTRXFo_iO14resilient_enum6Medium_dSi_XFo_iS0__iSi_ to i8*), %swift.refcounted* [[CONTEXT:%.*]], %swift.type* @_TMSi)

test/IRGen/exactcast2.sil

@@ -26,7 +26,7 @@ sil @_TFC4main4HashCfMS0_FT_S0_ : $@convention(thin) (@thick Hash.Type) -> @owne
 
 sil @_TFC4main4Hash6updatefS0_FT_T_ : $@convention(method) (@guaranteed Hash) -> () {
 bb0(%0 : $Hash):
-  %1 = class_method %0 : $Hash, #Hash.hash!1 : Hash -> () -> () , $@convention(method) (@guaranteed Hash) -> () // user: %9
+  %1 = class_method %0 : $Hash, #Hash.hash!1 : (Hash) -> () -> () , $@convention(method) (@guaranteed Hash) -> () // user: %9
   checked_cast_br [exact] %0 : $Hash to $MD5, bb2, bb3 // id: %2
 
 bb1:                                              // Preds: bb2 bb3

test/IRGen/objc_bridge.swift

@@ -199,5 +199,5 @@ class Bas : NSObject {
 func ==(lhs: Bas, rhs: Bas) -> Bool { return true }
 
 class OptionalBlockProperty: NSObject {
-  var x: ([AnyObject] -> [AnyObject])?
+  var x: (([AnyObject]) -> [AnyObject])?
 }

test/IRGen/objc_dealloc.sil

@@ -101,7 +101,7 @@ bb0(%0 : $SwiftGizmo):
   // CHECK-NEXT: store %objc_class* [[T1]], %objc_class** [[OBJC_SUPER_CLASS]], align 8
   // CHECK-NEXT: [[DEALLOC_SEL:%[a-zA-Z0-9]+]] = load i8*, i8** @"\01L_selector(dealloc)", align 8
   // CHECK-NEXT: call void bitcast (void ()* @objc_msgSendSuper2 to void (%objc_super*, i8*)*)(%objc_super* [[OBJC_SUPER]], i8* [[DEALLOC_SEL]])
-  %5 = super_method %0 : $SwiftGizmo, #Gizmo.deinit!deallocator.foreign : Gizmo -> () , $@convention(objc_method) (Gizmo) -> () // user: %7
+  %5 = super_method %0 : $SwiftGizmo, #Gizmo.deinit!deallocator.foreign : (Gizmo) -> () , $@convention(objc_method) (Gizmo) -> () // user: %7
   %6 = upcast %0 : $SwiftGizmo to $Gizmo          // user: %7
   %7 = apply %5(%6) : $@convention(objc_method) (Gizmo) -> ()
 

test/IRGen/objc_factory_method.sil

@@ -22,7 +22,7 @@ sil @_TFCSo4HiveCfMS_FT5queenGSQCSo3Bee__S_ : $@convention(thin) (@owned Implici
 bb0(%0 : $ImplicitlyUnwrappedOptional<Bee>, %1 : $@thick Hive.Type):
   %2 = thick_to_objc_metatype %1 : $@thick Hive.Type to $@objc_metatype Hive.Type // users: %3, %4
   // CHECK: load i8*, i8** @"\01L_selector(hiveWithQueen:)"
-  %3 = class_method %2 : $@objc_metatype Hive.Type, #Hive.init!allocator.1.foreign : Hive.Type -> (queen: ImplicitlyUnwrappedOptional<Bee>) -> Hive! , $@convention(objc_method) (ImplicitlyUnwrappedOptional<Bee>, @objc_metatype Hive.Type) -> @autoreleased ImplicitlyUnwrappedOptional<Hive> // user: %4
+  %3 = class_method %2 : $@objc_metatype Hive.Type, #Hive.init!allocator.1.foreign : (Hive.Type) -> (queen: ImplicitlyUnwrappedOptional<Bee>) -> Hive! , $@convention(objc_method) (ImplicitlyUnwrappedOptional<Bee>, @objc_metatype Hive.Type) -> @autoreleased ImplicitlyUnwrappedOptional<Hive> // user: %4
   // CHECK: call {{.*}} @objc_msgSend 
   %4 = apply %3(%0, %2) : $@convention(objc_method) (ImplicitlyUnwrappedOptional<Bee>, @objc_metatype Hive.Type) -> @autoreleased ImplicitlyUnwrappedOptional<Hive> // users: %5, %6
   // CHECK: call {{.*}} @objc_autorelease

test/IRGen/objc_methods.swift

@@ -10,7 +10,7 @@ import Foundation
 // Protocol methods require extended method type encodings to capture block
 // signatures and parameter object types.
 @objc protocol Fooable {
-  func block(_: Int -> Int)
+  func block(_: (Int) -> Int)
   func block2(_: (Int,Int) -> Int)
 
   func takesString(_: String) -> String
@@ -23,7 +23,7 @@ class Foo: Fooable {
   func bar() {}
   @objc func baz() {}
   @IBAction func garply(_: AnyObject?) {}
-  @objc func block(_: Int -> Int) {}
+  @objc func block(_: (Int) -> Int) {}
   @objc func block2(_: (Int,Int) -> Int) {}
 
   @objc func takesString(_ x: String) -> String { return x }

test/IRGen/objc_type_encoding.swift

@@ -117,7 +117,7 @@ func testArchetype(_ work: P3) {
 // CHECK-ios: private unnamed_addr constant [11 x i8] c"v24@0:8@16\00"
 // CHECK-tvos: private unnamed_addr constant [11 x i8] c"v24@0:8@16\00"
 
-@objc func foo(_ x: Int -> Int) -> Int {
+@objc func foo(_ x: (Int) -> Int) -> Int {
   return 1
 }
 // CHECK-macosx: private unnamed_addr constant [12 x i8] c"q24@0:8@?16\00"

test/IRGen/partial_apply.sil

@@ -102,7 +102,7 @@ entry(%f : $@callee_owned (Builtin.Word) -> (), %x : $Builtin.Word):
 
 sil @objc_partial_apply : $@convention(thin) ObjCClass -> @callee_owned Int -> () {
 entry(%c : $ObjCClass):
-  %m = class_method [volatile] %c : $ObjCClass, #ObjCClass.method!1.foreign : ObjCClass -> (x: Int) -> () , $@convention(objc_method) (Int, ObjCClass) -> ()
+  %m = class_method [volatile] %c : $ObjCClass, #ObjCClass.method!1.foreign : (ObjCClass) -> (x: Int) -> () , $@convention(objc_method) (Int, ObjCClass) -> ()
   %p = partial_apply %m(%c) : $@convention(objc_method) (Int, ObjCClass) -> ()
   return %p : $@callee_owned Int -> ()
 }
@@ -123,7 +123,7 @@ entry(%c : $ObjCClass):
 
 sil @objc_partial_apply_consumes_self : $@convention(thin) ObjCClass -> @callee_owned () -> @owned ObjCClass {
 entry(%c : $ObjCClass):
-  %m = class_method [volatile] %c : $ObjCClass, #ObjCClass.initFamily!1.foreign : ObjCClass -> () -> ObjCClass , $@convention(objc_method) (@owned ObjCClass) -> @owned ObjCClass
+  %m = class_method [volatile] %c : $ObjCClass, #ObjCClass.initFamily!1.foreign : (ObjCClass) -> () -> ObjCClass , $@convention(objc_method) (@owned ObjCClass) -> @owned ObjCClass
   %p = partial_apply %m(%c) : $@convention(objc_method) (@owned ObjCClass) -> @owned ObjCClass
   return %p : $@callee_owned () -> @owned ObjCClass
 }

test/IRGen/partial_apply_generic.swift

@@ -9,8 +9,8 @@ infix operator ~> { precedence 255 }
 
 func ~> <Target, Args, Result> (
   target: Target,
-  method: Target -> Args -> Result)
-  -> Args -> Result
+  method: (Target) -> (Args) -> Result)
+  -> (Args) -> Result
 {
   return method(target)
 }
@@ -25,8 +25,8 @@ struct Spoon: Runcible {
   typealias Element = Mince
 }
 
-func split<Seq: Runcible>(_ seq: Seq) -> (Seq.Element -> Bool) -> () {
-  return {(isSeparator: Seq.Element -> Bool) in
+func split<Seq: Runcible>(_ seq: Seq) -> ((Seq.Element) -> Bool) -> () {
+  return {(isSeparator: (Seq.Element) -> Bool) in
     return ()
   }
 }

test/IRGen/struct_resilience.swift

@@ -13,7 +13,7 @@ import resilient_enum
 
 // CHECK-LABEL: define{{( protected)?}} void @_TF17struct_resilience26functionWithResilientTypesFTV16resilient_struct4Size1fFS1_S1__S1_(%swift.opaque* noalias nocapture sret, %swift.opaque* noalias nocapture, i8*, %swift.refcounted*)
 
-public func functionWithResilientTypes(_ s: Size, f: Size -> Size) -> Size {
+public func functionWithResilientTypes(_ s: Size, f: (Size) -> Size) -> Size {
 
 // CHECK: [[RESULT:%.*]] = alloca [[BUFFER_TYPE:\[.* x i8\]]]
 
@@ -82,7 +82,7 @@ public struct MySize {
 }
 
 // CHECK-LABEL: define{{( protected)?}} void @_TF17struct_resilience28functionWithMyResilientTypesFTVS_6MySize1fFS0_S0__S0_(%V17struct_resilience6MySize* {{.*}}, %V17struct_resilience6MySize* {{.*}}, i8*, %swift.refcounted*)
-public func functionWithMyResilientTypes(_ s: MySize, f: MySize -> MySize) -> MySize {
+public func functionWithMyResilientTypes(_ s: MySize, f: (MySize) -> MySize) -> MySize {
 
 // CHECK: [[TEMP:%.*]] = alloca %V17struct_resilience6MySize
 // CHECK: bitcast

test/IRGen/super.sil

@@ -43,7 +43,7 @@ bb0(%0 : $ChildToResilientParent):
   debug_value %0 : $ChildToResilientParent, let, name "self", argno 1
   strong_retain %0 : $ChildToResilientParent
   %3 = upcast %0 : $ChildToResilientParent to $ResilientOutsideParent
-  %4 = super_method %0 : $ChildToResilientParent, #ResilientOutsideParent.method!1 : ResilientOutsideParent -> () -> () , $@convention(method) (@guaranteed ResilientOutsideParent) -> ()
+  %4 = super_method %0 : $ChildToResilientParent, #ResilientOutsideParent.method!1 : (ResilientOutsideParent) -> () -> () , $@convention(method) (@guaranteed ResilientOutsideParent) -> ()
   %5 = apply %4(%3) : $@convention(method) (@guaranteed ResilientOutsideParent) -> ()
   strong_release %3 : $ResilientOutsideParent
   %7 = tuple ()
@@ -63,7 +63,7 @@ sil @_TZFC5super22ChildToResilientParent11classMethodfT_T_ : $@convention(method
 bb0(%0 : $@thick ChildToResilientParent.Type):
   debug_value %0 : $@thick ChildToResilientParent.Type, let, name "self", argno 1
   %2 = upcast %0 : $@thick ChildToResilientParent.Type to $@thick ResilientOutsideParent.Type
-  %3 = super_method %0 : $@thick ChildToResilientParent.Type, #ResilientOutsideParent.classMethod!1 : ResilientOutsideParent.Type -> () -> () , $@convention(method) (@thick ResilientOutsideParent.Type) -> ()
+  %3 = super_method %0 : $@thick ChildToResilientParent.Type, #ResilientOutsideParent.classMethod!1 : (ResilientOutsideParent.Type) -> () -> () , $@convention(method) (@thick ResilientOutsideParent.Type) -> ()
   %4 = apply %3(%2) : $@convention(method) (@thick ResilientOutsideParent.Type) -> ()
   %5 = tuple ()
   return %5 : $()
@@ -90,7 +90,7 @@ bb0(%0 : $ChildToFixedParent):
   debug_value %0 : $ChildToFixedParent, let, name "self", argno 1
   strong_retain %0 : $ChildToFixedParent
   %3 = upcast %0 : $ChildToFixedParent to $OutsideParent
-  %4 = super_method %0 : $ChildToFixedParent, #OutsideParent.method!1 : OutsideParent -> () -> () , $@convention(method) (@guaranteed OutsideParent) -> ()
+  %4 = super_method %0 : $ChildToFixedParent, #OutsideParent.method!1 : (OutsideParent) -> () -> () , $@convention(method) (@guaranteed OutsideParent) -> ()
   %5 = apply %4(%3) : $@convention(method) (@guaranteed OutsideParent) -> ()
   strong_release %3 : $OutsideParent
   %7 = tuple ()
@@ -110,7 +110,7 @@ sil @_TZFC5super18ChildToFixedParent11classMethodfT_T_ : $@convention(method) (@
 bb0(%0 : $@thick ChildToFixedParent.Type):
   debug_value %0 : $@thick ChildToFixedParent.Type, let, name "self", argno 1
   %2 = upcast %0 : $@thick ChildToFixedParent.Type to $@thick OutsideParent.Type
-  %3 = super_method %0 : $@thick ChildToFixedParent.Type, #OutsideParent.classMethod!1 : OutsideParent.Type -> () -> () , $@convention(method) (@thick OutsideParent.Type) -> ()
+  %3 = super_method %0 : $@thick ChildToFixedParent.Type, #OutsideParent.classMethod!1 : (OutsideParent.Type) -> () -> () , $@convention(method) (@thick OutsideParent.Type) -> ()
   %4 = apply %3(%2) : $@convention(method) (@thick OutsideParent.Type) -> ()
   %5 = tuple ()
   return %5 : $()
@@ -131,7 +131,7 @@ bb0(%0 : $ResilientOutsideChild):
   debug_value %0 : $ResilientOutsideChild, let, name "self", argno 1
   strong_retain %0 : $ResilientOutsideChild
   %3 = upcast %0 : $ResilientOutsideChild to $ResilientOutsideParent
-  %4 = super_method %0 : $ResilientOutsideChild, #ResilientOutsideParent.method!1 : ResilientOutsideParent -> () -> () , $@convention(method) (@guaranteed ResilientOutsideParent) -> ()
+  %4 = super_method %0 : $ResilientOutsideChild, #ResilientOutsideParent.method!1 : (ResilientOutsideParent) -> () -> () , $@convention(method) (@guaranteed ResilientOutsideParent) -> ()
   %5 = apply %4(%3) : $@convention(method) (@guaranteed ResilientOutsideParent) -> ()
   strong_release %3 : $ResilientOutsideParent
   %7 = tuple ()
@@ -155,7 +155,7 @@ sil @_TZFE5superC15resilient_class21ResilientOutsideChild20callSuperClassMethodf
 bb0(%0 : $@thick ResilientOutsideChild.Type):
   debug_value %0 : $@thick ResilientOutsideChild.Type, let, name "self", argno 1
   %2 = upcast %0 : $@thick ResilientOutsideChild.Type to $@thick ResilientOutsideParent.Type
-  %3 = super_method %0 : $@thick ResilientOutsideChild.Type, #ResilientOutsideParent.classMethod!1 : ResilientOutsideParent.Type -> () -> () , $@convention(method) (@thick ResilientOutsideParent.Type) -> ()
+  %3 = super_method %0 : $@thick ResilientOutsideChild.Type, #ResilientOutsideParent.classMethod!1 : (ResilientOutsideParent.Type) -> () -> () , $@convention(method) (@thick ResilientOutsideParent.Type) -> ()
   %4 = apply %3(%2) : $@convention(method) (@thick ResilientOutsideParent.Type) -> ()
   %5 = tuple ()
   return %5 : $()

test/Interpreter/SDK/block_calls.swift

@@ -13,12 +13,12 @@ class Foo : NSObject {
     super.init()
   }
 
-  @objc func applyBlock(_ f: Int -> (), withInt x: Int) {
+  @objc func applyBlock(_ f: (Int) -> (), withInt x: Int) {
     f(foo)
     f(x)
   }
 
-  @objc func applyBlock(_ f: Int -> (), withFoo x: Foo) {
+  @objc func applyBlock(_ f: (Int) -> (), withFoo x: Foo) {
     f(foo)
     f(x.foo)
   }

test/Interpreter/SDK/objc_block_generic.swift

@@ -6,10 +6,10 @@
 import Foundation
 
 autoreleasepool {
-  let f: @convention(block) Int -> Int = { $0 }
+  let f: @convention(block) (Int) -> Int = { $0 }
   // In an -Onone build this instantiates the generic metadata for
   // @convention(block) Int -> Int
-  let ff: (@convention(block) Int -> Int)? = f
+  let ff: (@convention(block) (Int) -> Int)? = f
   let gg = ff
 
   // CHECK: 219

test/Interpreter/closures.swift

@@ -35,11 +35,11 @@ func test() {
 test()
 
 // <rdar://problem/19776288>
-func map<T>(_ fn: T -> ()) {
+func map<T>(_ fn: (T) -> ()) {
     print("Void overload")
 }
 
-func map<T,U>(_ fn: T -> U) {
+func map<T,U>(_ fn: (T) -> U) {
     print("Non-void overload")
 }
 

test/Interpreter/currying_generics.swift

@@ -101,7 +101,7 @@ print(clampFoo2(n: 3.0)) // CHECK-NEXT: 10.0
 
 // rdar://problem/19195470
 
-func pair<T,U> (_ a: T) -> U -> (T,U) {
+func pair<T,U> (_ a: T) -> (U) -> (T,U) {
 	return { b in (a,b)	}
 }
 
@@ -110,7 +110,7 @@ func pair_<T,U> (_ a: T) -> (b: U) -> (T,U) {
 }
 
 infix operator <+> { }
-func <+><T,U,V> (lhs: T?, rhs: T -> U -> V) -> U -> V? {
+func <+><T,U,V> (lhs: T?, rhs: (T) -> (U) -> V) -> (U) -> V? {
 	if let x = lhs {
 		return { y in .some(rhs(x)(y)) }
 	} else {
@@ -130,11 +130,11 @@ print((b <+> pair_)(a!)) // CHECK-NEXT: (42, 23)
 struct Identity<A> { let value: A }
 struct Const<A, B> { let value: A }
 
-func fmap<A, B>(_ f: A -> B) -> (Identity<A>) -> Identity<B> {
+func fmap<A, B>(_ f: (A) -> B) -> (Identity<A>) -> Identity<B> {
 	return { identity in Identity(value: f(identity.value)) }
 }
 
-func fmap<A, B>(_ f: A -> B) -> (Const<A, B>) -> Const<A, B> {
+func fmap<A, B>(_ f: (A) -> B) -> (Const<A, B>) -> Const<A, B> {
 	return { const in const }
 }
 
@@ -160,32 +160,32 @@ func runIdentity<A>(_ i: Identity<A>) -> A {
 }
 
 
-func view<S, A>(_ lens: (A -> Const<A, S>) -> S -> ((A -> S) -> Const<A, S> -> Const<A, S>) -> Const<A, S>) -> (S) -> A {
+func view<S, A>(_ lens: ((A) -> Const<A, S>) -> (S) -> (((A) -> S) -> (Const<A, S>) -> Const<A, S>) -> Const<A, S>) -> (S) -> A {
 	return { s in getConst(lens(_Const)(s)(fmap)) }
 }
 
-func over<S, A>(_ lens: (A -> Identity<A>) -> S -> ((A -> S) -> Identity<A> -> Identity<S>) -> Identity<S>) -> (A -> A) -> (S) -> S {
+func over<S, A>(_ lens: ((A) -> Identity<A>) -> (S) -> (((A) -> S) -> (Identity<A>) -> Identity<S>) -> Identity<S>) -> ((A) -> A) -> (S) -> S {
 	return { f in { s in runIdentity(lens({ _Identity(f($0)) })(s)(fmap)) } }
 }
 
-func set<S, A>(_ lens: (A -> Identity<A>) -> S -> ((A -> S) -> Identity<A> -> Identity<S>) -> Identity<S>) -> (A) -> (S) -> S {
+func set<S, A>(_ lens: ((A) -> Identity<A>) -> (S) -> (((A) -> S) -> (Identity<A>) -> Identity<S>) -> Identity<S>) -> (A) -> (S) -> S {
 	return { x in { y in over(lens)(const(x))(y) } }
 }
 
-func _1<A, B, C, D>(_ f: A -> C) -> (A, B) -> ((A -> (A, B)) -> C -> D) -> D {
+func _1<A, B, C, D>(_ f: (A) -> C) -> (A, B) -> (((A) -> (A, B)) -> (C) -> D) -> D {
 	return { (x, y) in { fmap in fmap({ ($0, y) })(f(x)) } }
 }
 
-func _2<A, B, C, D>(_ f: B -> C) -> (A, B) -> ((B -> (A, B)) -> C -> D) -> D {
+func _2<A, B, C, D>(_ f: (B) -> C) -> (A, B) -> (((B) -> (A, B)) -> (C) -> D) -> D {
     return { (x, y) in { fmap in fmap({ (x, $0) })(f(y)) } }
 }
 
 
-public func >>> <T, U, V> (f: T -> U, g: U -> V) -> T -> V {
+public func >>> <T, U, V> (f: (T) -> U, g: (U) -> V) -> (T) -> V {
 	return { g(f($0)) }
 }
 
-public func <<< <T, U, V> (f: U -> V, g: T -> U) -> T -> V {
+public func <<< <T, U, V> (f: (U) -> V, g: (T) -> U) -> (T) -> V {
 	return { f(g($0)) }
 }