diff options
| author | s-ol <s+removethis@s-ol.nu> | 2021-11-11 11:28:23 +0000 |
|---|---|---|
| committer | s-ol <s+removethis@s-ol.nu> | 2021-11-11 11:31:36 +0000 |
| commit | df051d67432895623c7f2478d67f7dc8c8577b24 (patch) | |
| tree | 1bebdb5ddc6348d6043af3b25134337e6209cb35 /src | |
| parent | update for zig 0.8.0 (diff) | |
| download | glsl-view-df051d67432895623c7f2478d67f7dc8c8577b24.tar.gz glsl-view-df051d67432895623c7f2478d67f7dc8c8577b24.zip | |
update for zig 0.9.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.zig | 62 | ||||
| -rw-r--r-- | src/control.zig | 2 | ||||
| -rw-r--r-- | src/main.zig | 2 |
3 files changed, 33 insertions, 33 deletions
diff --git a/src/config.zig b/src/config.zig index b5c29df..09008f1 100644 --- a/src/config.zig +++ b/src/config.zig @@ -71,9 +71,9 @@ pub const Config = struct { .osc = .{ .URL = "osc.udp://:9000" }, }; - try expectEvent(&parser, c.yaml_event_type_t.YAML_STREAM_START_EVENT); - try expectEvent(&parser, c.yaml_event_type_t.YAML_DOCUMENT_START_EVENT); - try expectEvent(&parser, c.yaml_event_type_t.YAML_MAPPING_START_EVENT); + try expectEvent(&parser, c.YAML_STREAM_START_EVENT); + try expectEvent(&parser, c.YAML_DOCUMENT_START_EVENT); + try expectEvent(&parser, c.YAML_MAPPING_START_EVENT); while (true) { var event: c.yaml_event_t = undefined; @@ -82,8 +82,8 @@ pub const Config = struct { defer c.yaml_event_delete(&event); switch (event.type) { - c.yaml_event_type_t.YAML_MAPPING_END_EVENT => break, - c.yaml_event_type_t.YAML_SCALAR_EVENT => { + c.YAML_MAPPING_END_EVENT => break, + c.YAML_SCALAR_EVENT => { const data = event.data.scalar; const key: []const u8 = data.value[0..data.length]; @@ -111,8 +111,8 @@ pub const Config = struct { } } - try expectEvent(&parser, c.yaml_event_type_t.YAML_DOCUMENT_END_EVENT); - try expectEvent(&parser, c.yaml_event_type_t.YAML_STREAM_END_EVENT); + try expectEvent(&parser, c.YAML_DOCUMENT_END_EVENT); + try expectEvent(&parser, c.YAML_STREAM_END_EVENT); return config; } @@ -132,7 +132,7 @@ fn expectEvent(parser: *c.yaml_parser_t, expectedType: c.yaml_event_type_t) !voi } fn parseStringEvent(event: *c.yaml_event_t, allocator: *std.mem.Allocator) ![]const u8 { - if (event.type != c.yaml_event_type_t.YAML_SCALAR_EVENT) + if (event.type != c.YAML_SCALAR_EVENT) return error.InvalidType; const data = event.data.scalar; @@ -155,7 +155,7 @@ fn parseInt(parser: *c.yaml_parser_t, comptime T: type) !T { return error.YAMLParserError; defer c.yaml_event_delete(&event); - if (event.type != c.yaml_event_type_t.YAML_SCALAR_EVENT) + if (event.type != c.YAML_SCALAR_EVENT) return error.InvalidType; const data = event.data.scalar; @@ -169,7 +169,7 @@ fn parseEnum(parser: *c.yaml_parser_t, comptime T: type) !T { return error.YAMLParserError; defer c.yaml_event_delete(&event); - if (event.type != c.yaml_event_type_t.YAML_SCALAR_EVENT) + if (event.type != c.YAML_SCALAR_EVENT) return error.InvalidType; const data = event.data.scalar; @@ -189,19 +189,19 @@ fn parseBool(parser: *c.yaml_parser_t) !bool { return error.YAMLParserError; defer c.yaml_event_delete(&event); - if (event.type != c.yaml_event_type_t.YAML_SCALAR_EVENT) + if (event.type != c.YAML_SCALAR_EVENT) return error.InvalidType; const data = event.data.scalar; const value: []const u8 = data.value[0..data.length]; - if (data.style != c.yaml_scalar_style_t.YAML_PLAIN_SCALAR_STYLE) + if (data.style != c.YAML_PLAIN_SCALAR_STYLE) return false; return std.mem.eql(u8, value, "true") or std.mem.eql(u8, value, "1"); } fn parseOutputs(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]OutputConfig { - try expectEvent(parser, c.yaml_event_type_t.YAML_SEQUENCE_START_EVENT); + try expectEvent(parser, c.YAML_SEQUENCE_START_EVENT); var outputs = try allocator.alloc(OutputConfig, 1024); var output_count: usize = 0; @@ -213,8 +213,8 @@ fn parseOutputs(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]Outp defer c.yaml_event_delete(&seqEvent); switch (seqEvent.type) { - c.yaml_event_type_t.YAML_SEQUENCE_END_EVENT => break, - c.yaml_event_type_t.YAML_MAPPING_START_EVENT => { + c.YAML_SEQUENCE_END_EVENT => break, + c.YAML_MAPPING_START_EVENT => { var output = &outputs[output_count]; output.* = defaultOutput; @@ -225,8 +225,8 @@ fn parseOutputs(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]Outp defer c.yaml_event_delete(&event); switch (event.type) { - c.yaml_event_type_t.YAML_MAPPING_END_EVENT => break, - c.yaml_event_type_t.YAML_SCALAR_EVENT => { + c.YAML_MAPPING_END_EVENT => break, + c.YAML_SCALAR_EVENT => { const data = event.data.scalar; const key: []const u8 = data.value[0..data.length]; @@ -266,7 +266,7 @@ fn parseOutputs(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]Outp } fn parseParameters(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]ParameterConfig { - try expectEvent(parser, c.yaml_event_type_t.YAML_SEQUENCE_START_EVENT); + try expectEvent(parser, c.YAML_SEQUENCE_START_EVENT); var parameters = try allocator.alloc(ParameterConfig, 1024); var param_count: usize = 0; @@ -278,8 +278,8 @@ fn parseParameters(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]P defer c.yaml_event_delete(&seqEvent); switch (seqEvent.type) { - c.yaml_event_type_t.YAML_SEQUENCE_END_EVENT => break, - c.yaml_event_type_t.YAML_MAPPING_START_EVENT => { + c.YAML_SEQUENCE_END_EVENT => break, + c.YAML_MAPPING_START_EVENT => { var param = ¶meters[param_count]; var have_name = false; var have_type = false; @@ -291,8 +291,8 @@ fn parseParameters(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) ![]P defer c.yaml_event_delete(&event); switch (event.type) { - c.yaml_event_type_t.YAML_MAPPING_END_EVENT => break, - c.yaml_event_type_t.YAML_SCALAR_EVENT => { + c.YAML_MAPPING_END_EVENT => break, + c.YAML_SCALAR_EVENT => { const data = event.data.scalar; const key: []const u8 = data.value[0..data.length]; @@ -338,10 +338,10 @@ fn parseOSC(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) !OSCConfig return error.YAMLParserError; defer c.yaml_event_delete(&event); - if (event.type == c.yaml_event_type_t.YAML_SCALAR_EVENT) { + if (event.type == c.YAML_SCALAR_EVENT) { const url = try parseStringEvent(&event, allocator); return OSCConfig{ .URL = url }; - } else if (event.type != c.yaml_event_type_t.YAML_MAPPING_START_EVENT) { + } else if (event.type != c.YAML_MAPPING_START_EVENT) { debug.warn("unexpected event: {}\n", .{event.type}); return error.InvalidConfiguration; } @@ -354,8 +354,8 @@ fn parseOSC(parser: *c.yaml_parser_t, allocator: *std.mem.Allocator) !OSCConfig defer c.yaml_event_delete(&event); switch (event.type) { - c.yaml_event_type_t.YAML_MAPPING_END_EVENT => break, - c.yaml_event_type_t.YAML_SCALAR_EVENT => { + c.YAML_MAPPING_END_EVENT => break, + c.YAML_SCALAR_EVENT => { const data = event.data.scalar; const key: []const u8 = data.value[0..data.length]; @@ -387,17 +387,17 @@ fn skipAny(parser: *c.yaml_parser_t) !void { defer c.yaml_event_delete(&event); switch (event.type) { - c.yaml_event_type_t.YAML_SCALAR_EVENT => { + c.YAML_SCALAR_EVENT => { if (depth == 0) break; }, - c.yaml_event_type_t.YAML_SEQUENCE_START_EVENT, - c.yaml_event_type_t.YAML_MAPPING_START_EVENT, + c.YAML_SEQUENCE_START_EVENT, + c.YAML_MAPPING_START_EVENT, => depth += 1, - c.yaml_event_type_t.YAML_SEQUENCE_END_EVENT, - c.yaml_event_type_t.YAML_MAPPING_END_EVENT, + c.YAML_SEQUENCE_END_EVENT, + c.YAML_MAPPING_END_EVENT, => { depth -= 1; diff --git a/src/control.zig b/src/control.zig index e490c7c..43c232e 100644 --- a/src/control.zig +++ b/src/control.zig @@ -66,7 +66,7 @@ pub const ControlServer = struct { switch (config) { .Manual => |conf| { var port = [_]u8{0} ** 6; - _ = std.fmt.formatIntBuf(port[0..], conf.port, 10, false, std.fmt.FormatOptions{}); + _ = std.fmt.formatIntBuf(port[0..], conf.port, 10, .lower, std.fmt.FormatOptions{}); const proto: c_int = switch (conf.protocol) { .udp => c.LO_UDP, .tcp => c.LO_TCP, diff --git a/src/main.zig b/src/main.zig index bfb42b0..1edb4d9 100644 --- a/src/main.zig +++ b/src/main.zig @@ -173,7 +173,7 @@ fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void { line_number += 1; if (std.mem.startsWith(u8, line, "#pragma ")) { - var parts = std.mem.split(line, " "); + var parts = std.mem.split(u8, line, " "); _ = parts.next(); const pragma = parts.next().?; |
