From 73e719fde4fcbe05724f739774d4541c9809455c Mon Sep 17 00:00:00 2001 From: Xi Han Date: Fri, 12 Sep 2014 23:24:57 +0800 Subject: [PATCH 1/5] Update 02_a_swift_tour.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改了定义for循环上下界的关键词:`..` -> `..<` --- source/chapter1/02_a_swift_tour.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/chapter1/02_a_swift_tour.md b/source/chapter1/02_a_swift_tour.md index cdf4b961..1c6abeda 100755 --- a/source/chapter1/02_a_swift_tour.md +++ b/source/chapter1/02_a_swift_tour.md @@ -204,7 +204,7 @@ m ```swift var firstForLoop = 0 -for i in 0..3 { +for i in 0..<3 { firstForLoop += i } firstForLoop @@ -216,7 +216,7 @@ for var i = 0; i < 3; ++i { secondForLoop ``` -使用`..`创建的范围不包含上界,如果想包含的话需要使用`...`。 +使用`..<`创建的范围不包含上界,如果想包含的话需要使用`...`。 ## 函数和闭包 From 50a7cd58dd537148325de68d5f21afb133e21316 Mon Sep 17 00:00:00 2001 From: Xi Han Date: Fri, 12 Sep 2014 23:28:19 +0800 Subject: [PATCH 2/5] Update 04_Expressions.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改了Range表达式中半闭值域的关键字:`..` -> `..<` --- source/chapter3/04_Expressions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/chapter3/04_Expressions.md b/source/chapter3/04_Expressions.md index 30c2ec2e..6f413808 100755 --- a/source/chapter3/04_Expressions.md +++ b/source/chapter3/04_Expressions.md @@ -73,7 +73,7 @@ Swift 标准库提供了如下的二元运算符: - | 按位或(Bitwise OR ) - ^ 按位异或(Bitwise XOR) - Range (无结合,优先级 135) - - .. 半闭值域 Half-closed range + - ..< 半闭值域 Half-closed range - ... 全闭值域 Closed range - 类型转换 (无结合,优先级 132) - is 类型检查( type check) From 018d56386129b6810fbc2c190ef02191ee3c3c7a Mon Sep 17 00:00:00 2001 From: Xi Han Date: Fri, 12 Sep 2014 23:31:12 +0800 Subject: [PATCH 3/5] Update 02_a_swift_tour.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改了定义for循环上下界的关键词:`..` -> `..<` --- source-tw/chapter1/02_a_swift_tour.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source-tw/chapter1/02_a_swift_tour.md b/source-tw/chapter1/02_a_swift_tour.md index cb254464..c4333459 100644 --- a/source-tw/chapter1/02_a_swift_tour.md +++ b/source-tw/chapter1/02_a_swift_tour.md @@ -200,11 +200,11 @@ do { m ``` -你可以在循環中使用`..`來表示範圍,也可以使用傳統的寫法,兩者是等價的: +你可以在循環中使用`..<`來表示範圍,也可以使用傳統的寫法,兩者是等價的: ```swift var firstForLoop = 0 -for i in 0..3 { +for i in 0..<3 { firstForLoop += i } firstForLoop @@ -216,7 +216,7 @@ for var i = 0; i < 3; ++i { secondForLoop ``` -使用`..`創建的範圍不包含上界,如果想包含的話需要使用`...`。 +使用`..<`創建的範圍不包含上界,如果想包含的話需要使用`...`。 ## 函數和閉包 From 75bc378ebe60e85548919329c9453c3b7131d809 Mon Sep 17 00:00:00 2001 From: Xi Han Date: Fri, 12 Sep 2014 23:32:19 +0800 Subject: [PATCH 4/5] Update 04_Expressions.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改了Range表达式中半闭值域的关键字:`..` -> `..<` --- source-tw/chapter3/04_Expressions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source-tw/chapter3/04_Expressions.md b/source-tw/chapter3/04_Expressions.md index c368d9d4..73e86cd5 100644 --- a/source-tw/chapter3/04_Expressions.md +++ b/source-tw/chapter3/04_Expressions.md @@ -73,7 +73,7 @@ Swift 標準庫提供了如下的二元運算符: - | 按位或(Bitwise OR ) - ^ 按位異或(Bitwise XOR) - Range (無結合,優先級 135) - - .. 半閉值域 Half-closed range + - ..< 半閉值域 Half-closed range - ... 全閉值域 Closed range - 類型轉換 (無結合,優先級 132) - is 類型檢查( type check) From 19e57129df2cae71c4f50f00387aade58d1e1d80 Mon Sep 17 00:00:00 2001 From: Xi Han Date: Fri, 12 Sep 2014 23:34:51 +0800 Subject: [PATCH 5/5] Update 02_a_swift_tour.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改了定义for循环上下界的关键词:`..` -> `..<` (修复一处漏改) --- source/chapter1/02_a_swift_tour.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/chapter1/02_a_swift_tour.md b/source/chapter1/02_a_swift_tour.md index 1c6abeda..6aa0ce8f 100755 --- a/source/chapter1/02_a_swift_tour.md +++ b/source/chapter1/02_a_swift_tour.md @@ -200,7 +200,7 @@ do { m ``` -你可以在循环中使用`..`来表示范围,也可以使用传统的写法,两者是等价的: +你可以在循环中使用`..<`来表示范围,也可以使用传统的写法,两者是等价的: ```swift var firstForLoop = 0