averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove most of the 'NS' types from the dictionary pattern matching example.

Browse Source 
This now makes use of bridging and IUO unwrapping in "switch".

Swift SVN r21020
This commit is contained in:
Doug Gregor
2014-08-04 17:21:44 +00:00
parent 0e7e26328c
commit 4ff01af85a
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/Interpreter/SDK/dictionary_pattern_matching.swift
View File

@@ -25,10 +25,10 @@ func stateFromPlistLame(plist: Dictionary<String, AnyObject>) -> State? {
func stateFromPlistCool(plist: Dictionary<String, AnyObject>) -> State? {
switch (plist["name"], plist["population"], plist["abbrev"]) {
case let (.Some(name as NSString), .Some(pop as NSNumber), .Some(abbr as NSString))
where abbr.length == 2:
case let (name as String, pop as Int, abbr as String)
where countElements(abbr) == 2:
return State(name: name,
population: pop.integerValue,
population: pop,
abbrev: abbr)
default:
return nil
@@ -125,20 +125,14 @@ struct StatMirror: MirrorType {
func statisticFromPlist(plist: Dictionary<String, AnyObject>) -> Statistic? {
switch (plist["kind"], plist["name"], plist["population"], plist["abbrev"]) {
case let (.Some("state" as NSString),
.Some(name as NSString),
.Some(population as NSNumber),
.Some(abbrev as NSString))
where abbrev.length == 2:
case let ("state" as String, name as String, population as Int, abbrev as String)
where countElements(abbrev) == 2:
return Statistic.ForState(State(name: name,
population: population.integerValue,
population: population,
abbrev: abbrev))
case let (.Some("country" as NSString),
.Some(name as NSString),
.Some(population as NSNumber),
.None):
case let ("country" as String, name as String, population as Int, .None):
return Statistic.ForCountry(Country(name: name,
population: population.integerValue))
population: population))
default:
return nil
}