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

Unsafe[Mutable]Pointer.memory => .pointee

Browse Source
This commit is contained in:
Dmitri Gribenko
2015-11-05 15:45:35 -08:00
committed by Max Moiseev
parent f1dbe205a3
commit 3d0ad16094
44 changed files with 134 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/public/core/StringCore.swift
View File

@@ -121,7 +121,7 @@ public struct _StringCore {
var src = UnsafeMutablePointer<UTF8.CodeUnit>(srcStart)
let srcEnd = src + count
while (src != srcEnd) {
dest++.memory = UTF16.CodeUnit(src++.memory)
dest++.pointee = UTF16.CodeUnit(src++.pointee)
}
}
else {
@@ -130,7 +130,7 @@ public struct _StringCore {
var src = UnsafeMutablePointer<UTF16.CodeUnit>(srcStart)
let srcEnd = src + count
while (src != srcEnd) {
dest++.memory = UTF8.CodeUnit(src++.memory)
dest++.pointee = UTF8.CodeUnit(src++.pointee)
}
}
}
@@ -295,8 +295,8 @@ public struct _StringCore {
// Always dereference two bytes, but when elements are 8 bits we
// multiply the high byte by 0.
// FIXME(performance): use masking instead of multiplication.
return UTF16.CodeUnit(p.memory)
+ UTF16.CodeUnit((p + 1).memory) * _highByteMultiplier
return UTF16.CodeUnit(p.pointee)
+ UTF16.CodeUnit((p + 1).pointee) * _highByteMultiplier
}
/// Get the Nth UTF-16 Code Unit stored.
@@ -618,13 +618,13 @@ extension _StringCore : RangeReplaceableCollection {
if _fastPath(elementWidth == 1) {
var dst = rangeStart
for u in newElements {
dst++.memory = UInt8(u & 0xFF)
dst++.pointee = UInt8(u & 0xFF)
}
}
else {
var dst = UnsafeMutablePointer<UTF16.CodeUnit>(rangeStart)
for u in newElements {
dst++.memory = u
dst++.pointee = u
}
}