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

stdlib/comments: UTF-8 and UTF-16 are spelled with a dash

Browse Source 
Swift SVN r19466
This commit is contained in:
Dmitri Hrybenko
2014-07-02 15:45:38 +00:00
parent 99f9f721f2
commit 57df21cefe
12 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/objc/Foundation/NSStringAPI.swift
View File

@@ -65,20 +65,20 @@ extension String {
return self as NSString
}
/// Return an `Index` corresponding to the given offset in our UTF16
/// Return an `Index` corresponding to the given offset in our UTF-16
/// representation.
func _index(utf16Index: Int) -> Index {
return Index(String.UnicodeScalarView.IndexType(utf16Index, core))
}
/// Return a `Range<Index>` corresponding to the given `NSRange` of
/// our UTF16 representation.
/// our UTF-16 representation.
func _range(r: NSRange) -> Range<Index> {
return _index(r.location)..<_index(r.location + r.length)
}
/// Return a `Range<Index>?` corresponding to the given `NSRange` of
/// our UTF16 representation.
/// our UTF-16 representation.
func _optionalRange(r: NSRange) -> Range<Index>? {
if r.location == NSNotFound {
return .None
@@ -265,7 +265,7 @@ extension String {
// + (instancetype)stringWithUTF8String:(const char *)bytes
/// Returns a string created by copying the data from a given
/// C array of UTF8-encoded bytes.
/// C array of UTF-8-encoded bytes.
@public static func stringWithUTF8String(bytes: CString) -> String? {
return NSString.stringWithUTF8String(bytes)
}
@@ -314,7 +314,7 @@ extension String {
// - (unichar)characterAtIndex:(NSUInteger)index
//
// We have a different meaning for "Character" in Swift, and we are
// trying not to expose error-prone UTF16 integer indexes
// trying not to expose error-prone UTF-16 integer indexes
// - (NSString *)
// commonPrefixWithString:(NSString *)aString
@@ -776,7 +776,7 @@ extension String {
// freeWhenDone:(BOOL)flag
/// Returns an initialized `String` object that contains a given
/// number of characters from a given array of UTF16 Code Units
/// number of characters from a given array of UTF-16 Code Units
@public init(
utf16CodeUnitsNoCopy: ConstUnsafePointer<unichar>,
count: Int,