Skip to content

Commit b502621

Browse files
committed
Migration to Swift 3
1 parent 6ee8119 commit b502621

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

Binary Search Tree/Solution 2/BinarySearchTree.playground/Contents.swift

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
// Each time you insert something, you get back a completely new tree.
44
var tree = BinarySearchTree.Leaf(7)
5-
tree = tree.insert(2)
6-
tree = tree.insert(5)
7-
tree = tree.insert(10)
8-
tree = tree.insert(9)
9-
tree = tree.insert(1)
5+
tree = tree.insert(newValue: 2)
6+
tree = tree.insert(newValue: 5)
7+
tree = tree.insert(newValue: 10)
8+
tree = tree.insert(newValue: 9)
9+
tree = tree.insert(newValue: 1)
1010
print(tree)
1111

12-
tree.search(10)
13-
tree.search(1)
14-
tree.search(11)
12+
tree.search(x: 10)
13+
tree.search(x: 1)
14+
tree.search(x: 11)
15+
16+

Binary Search Tree/Solution 2/BinarySearchTree.playground/Sources/BinarySearchTree.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public enum BinarySearchTree<T: Comparable> {
4444

4545
case .Node(let left, let value, let right):
4646
if newValue < value {
47-
return .Node(left.insert(newValue), value, right)
47+
return .Node(left.insert(newValue: newValue), value, right)
4848
} else {
49-
return .Node(left, value, right.insert(newValue))
49+
return .Node(left, value, right.insert(newValue: newValue))
5050
}
5151
}
5252
}
@@ -63,17 +63,17 @@ public enum BinarySearchTree<T: Comparable> {
6363
return (x == y) ? self : nil
6464
case let .Node(left, y, right):
6565
if x < y {
66-
return left.search(x)
66+
return left.search(x: x)
6767
} else if y < x {
68-
return right.search(x)
68+
return right.search(x: x)
6969
} else {
7070
return self
7171
}
7272
}
7373
}
7474

7575
public func contains(x: T) -> Bool {
76-
return search(x) != nil
76+
return search(x: x) != nil
7777
}
7878

7979
/*

0 commit comments

Comments
 (0)