authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-03-06 01:42:04-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2018-03-06 01:42:04-05:00
logd34d36619eae07d046d1bc20f849c2c398927992
tree41171c7f451a252f7d58b3d8b6a1cc5ff4e44b92
parentc787837ce5023fdef579bf92097216ce9dfacf34
parent8fd7e9115c95c78c7f0fdcf749c3109124c1605f
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #814 from jacobdufault/utf8-view

Make Utf8View public, add comments, and make iterator lowercase.

1 files changed, 14 insertions(+), 6 deletions(-)

std/unicode.zig+14-6
......@@ -96,7 +96,15 @@ pub fn utf8ValidateSlice(s: []const u8) bool {
9696 return true;
9797}
9898
99const Utf8View = struct {
99/// Utf8View makes it easy to iterate the code points of a utf-8 encoded string.
100///
101/// ```
102/// var utf8 = (try std.unicode.Utf8View.init("hi there")).iterator();
103/// while (utf8.nextCodepointSlice()) |codepoint| {
104/// std.debug.warn("got codepoint {}\n", codepoint);
105/// }
106/// ```
107pub const Utf8View = struct {
100108 bytes: []const u8,
101109
102110 pub fn init(s: []const u8) !Utf8View {
......@@ -124,7 +132,7 @@ const Utf8View = struct {
124132 }
125133 }
126134
127 pub fn Iterator(s: &const Utf8View) Utf8Iterator {
135 pub fn iterator(s: &const Utf8View) Utf8Iterator {
128136 return Utf8Iterator {
129137 .bytes = s.bytes,
130138 .i = 0,
......@@ -165,13 +173,13 @@ const Utf8Iterator = struct {
165173test "utf8 iterator on ascii" {
166174 const s = Utf8View.initComptime("abc");
167175
168 var it1 = s.Iterator();
176 var it1 = s.iterator();
169177 debug.assert(std.mem.eql(u8, "a", ??it1.nextCodepointSlice()));
170178 debug.assert(std.mem.eql(u8, "b", ??it1.nextCodepointSlice()));
171179 debug.assert(std.mem.eql(u8, "c", ??it1.nextCodepointSlice()));
172180 debug.assert(it1.nextCodepointSlice() == null);
173181
174 var it2 = s.Iterator();
182 var it2 = s.iterator();
175183 debug.assert(??it2.nextCodepoint() == 'a');
176184 debug.assert(??it2.nextCodepoint() == 'b');
177185 debug.assert(??it2.nextCodepoint() == 'c');
......@@ -189,13 +197,13 @@ test "utf8 view bad" {
189197test "utf8 view ok" {
190198 const s = Utf8View.initComptime("東京市");
191199
192 var it1 = s.Iterator();
200 var it1 = s.iterator();
193201 debug.assert(std.mem.eql(u8, "東", ??it1.nextCodepointSlice()));
194202 debug.assert(std.mem.eql(u8, "京", ??it1.nextCodepointSlice()));
195203 debug.assert(std.mem.eql(u8, "市", ??it1.nextCodepointSlice()));
196204 debug.assert(it1.nextCodepointSlice() == null);
197205
198 var it2 = s.Iterator();
206 var it2 = s.iterator();
199207 debug.assert(??it2.nextCodepoint() == 0x6771);
200208 debug.assert(??it2.nextCodepoint() == 0x4eac);
201209 debug.assert(??it2.nextCodepoint() == 0x5e02);