allemang.d/vulkan-zig
1
0
Fork 0
forked from mirror/vulkan-zig
Code Pull Requests Activity

Make XmlUtf8Parser be in iterator-style again

Browse Source
This commit is contained in:
Robin Voetter
2019-10-21 23:52:34 +02:00
parent 721acad43f
commit 2d07783e37
1 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
generator/xml.zig
View File

@@ -17,36 +17,20 @@ const entities = [_]Entity{
fn XmlUtf8Parser(comptime ReadError: type) type { fn XmlUtf8Parser(comptime ReadError: type) type {
return struct { return struct {
pub const Self = @This(); const Self = @This();
pub const Stream = std.io.InStream(ReadError); pub const Stream = std.io.InStream(ReadError);
in: *Stream, in: *Stream,
current: ?u32,
pub fn init(in: *Stream) Self { pub fn init(in: *Stream) Self {
return Self{ return Self{
.in = in, .in = in
.current = null
}; };
} }
pub fn consume(self: *Self) void { pub fn next(self: *Self) !?u32 {
self.current = null;
}
pub fn peek(self: *Self) !?u32 {
if (self.current) |cp| {
return cp;
}
const cp = (try self.nextCodepoint()) orelse return null; const cp = (try self.nextCodepoint()) orelse return null;
self.current = if (cp == '&') try self.nextEntity() else cp; return if (cp == '&') try self.nextEntity() else cp;
return self.current.?;
}
pub fn consumeAndPeek(self: *Self) !?u32 {
self.consume();
return try self.peek();
} }
fn nextEntity(self: *Self) !u32 { fn nextEntity(self: *Self) !u32 {
@@ -92,12 +76,10 @@ fn testXmlUtf8Parser(text: []const u8, expected: []const u8) !void {
var i: usize = 0; var i: usize = 0;
defer testing.expect(i == expected.len); defer testing.expect(i == expected.len);
while (try p.consumeAndPeek()) |cp| { while (try p.next()) |cp| {
testing.expect(cp == expected[i]); testing.expect(cp == expected[i]);
i += 1; i += 1;
} }
testing.expect((try p.consumeAndPeek()) == null);
} }
test "XmlUtf8Parser" { test "XmlUtf8Parser" {
@@ -107,17 +89,4 @@ test "XmlUtf8Parser" {
testing.expectError(error.InvalidEntity, testXmlUtf8Parser("python&&", "python")); testing.expectError(error.InvalidEntity, testXmlUtf8Parser("python&&", "python"));
testing.expectError(error.InvalidEntity, testXmlUtf8Parser("python&test;", "python")); testing.expectError(error.InvalidEntity, testXmlUtf8Parser("python&test;", "python"));
testing.expectError(error.InvalidEntity, testXmlUtf8Parser("python&boa", "python")); testing.expectError(error.InvalidEntity, testXmlUtf8Parser("python&boa", "python"));
var slice_in = std.io.SliceInStream.init("test");
var p = XmlUtf8Parser(std.io.SliceInStream.Error).init(&slice_in.stream);
testing.expect((try p.peek()).? == 't');
testing.expect((try p.peek()).? == 't');
p.consume();
testing.expect((try p.peek()).? == 'e');
testing.expect((try p.peek()).? == 'e');
testing.expect((try p.consumeAndPeek()).? == 's');
testing.expect((try p.consumeAndPeek()).? == 't');
testing.expect((try p.consumeAndPeek()) == null);
testing.expect((try p.peek()) == null);
} }