From 20c08fea6a9506efdcc7519ec9492f1b3ed10234 Mon Sep 17 00:00:00 2001 From: Xwoder Date: Fri, 22 May 2015 21:52:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/chapter2/06_Functions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/chapter2/06_Functions.md b/source/chapter2/06_Functions.md index 87d22485..cb6ce392 100755 --- a/source/chapter2/06_Functions.md +++ b/source/chapter2/06_Functions.md @@ -36,7 +36,7 @@ func sayHello(personName: String) -> String { 所有的这些信息汇总起来成为函数的定义，并以 `func` 作为前缀。指定函数返回类型时，用返回箭头 `->`（一个连字符后跟一个右尖括号）后跟返回类型的名称的方式来表示。 -该定义描述了函数做什么，它期望接收什么和执行结束时它返回的结果是什么。这样的定义使的函数可以在别的地方以一种清晰的方式被调用： +该定义描述了函数做什么，它期望接收什么和执行结束时它返回的结果是什么。这样的定义使得函数可以在别的地方以一种清晰的方式被调用： ```swift println(sayHello("Anna")) From da23e9a3373c18c859794e6e641027deb2e6fc84 Mon Sep 17 00:00:00 2001 From: Xwoder Date: Fri, 22 May 2015 22:17:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=BF=87=E6=97=B6=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/chapter2/03_Strings_and_Characters.md | 4 ++-- source/chapter2/06_Functions.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/chapter2/03_Strings_and_Characters.md b/source/chapter2/03_Strings_and_Characters.md index 3983d10a..0a3edf6c 100755 --- a/source/chapter2/03_Strings_and_Characters.md +++ b/source/chapter2/03_Strings_and_Characters.md @@ -150,11 +150,11 @@ let yenSign: Character = "¥" ## 计算字符数量 (Counting Characters) -通过调用全局`countElements`函数，并将字符串作为参数进行传递，可以获取该字符串的字符数量。 +通过调用全局`count(_:)`函数，并将字符串作为参数进行传递，可以获取该字符串的字符数量。 ```swift let unusualMenagerie = "Koala 🐨, Snail 🐌, Penguin 🐧, Dromedary 🐪" -println("unusualMenagerie has \(countElements(unusualMenagerie)) characters") +println("unusualMenagerie has \(count(unusualMenagerie)) characters") // 打印输出："unusualMenagerie has 40 characters" ``` diff --git a/source/chapter2/06_Functions.md b/source/chapter2/06_Functions.md index cb6ce392..6cea6bbc 100755 --- a/source/chapter2/06_Functions.md +++ b/source/chapter2/06_Functions.md @@ -116,7 +116,7 @@ sayGoodbye("Dave") ```swift func printAndCount(stringToPrint: String) -> Int { println(stringToPrint) - return countElements(stringToPrint) + return count(stringToPrint) } func printWithoutCounting(stringToPrint: String) { printAndCount(stringToPrint) @@ -348,7 +348,7 @@ arithmeticMean(3, 8, 19) ```swift func alignRight(var string: String, count: Int, pad: Character) -> String { - let amountToPad = count - countElements(string) + let amountToPad = count - count(string) if amountToPad < 1 { return string }