summaryrefslogtreecommitdiff
path: root/src/dump.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/dump.zig')
-rw-r--r--src/dump.zig32
1 files changed, 13 insertions, 19 deletions
diff --git a/src/dump.zig b/src/dump.zig
index 201f5bf2..76a6de85 100644
--- a/src/dump.zig
+++ b/src/dump.zig
@@ -56,7 +56,7 @@ pub fn outPath(buf: *[1024:0]u8, dir_setting: []const u8) ?[:0]const u8 {
const ds = es.getDaySeconds();
var stamp: [32]u8 = undefined;
const base = std.fmt.bufPrint(&stamp, "pardes-{d:0>4}{d:0>2}{d:0>2}-{d:0>2}{d:0>2}{d:0>2}", .{
- yd.year, md.month.numeric(), @as(u8, md.day_index) + 1,
+ yd.year, md.month.numeric(), @as(u8, md.day_index) + 1,
ds.getHoursIntoDay(), ds.getMinutesIntoHour(), ds.getSecondsIntoMinute(),
}) catch return null;
return uniqueIn(buf, dir, base);
@@ -194,6 +194,8 @@ pub const Terminal = struct {
};
pub const LocationRow = struct {
+ mark_occurrence: bool = true,
+ source_column: usize = 0,
kind: enum { match, context, preview },
declaration: bool = false,
path: []const u8,
@@ -419,9 +421,9 @@ pub const Parsed = struct {
pub fn check(gpa: std.mem.Allocator, bytes: []const u8, why: []u8) !void {
var arena: std.heap.ArenaAllocator = .init(gpa);
defer arena.deinit();
- const source = try arena.allocator().dupeZ(u8, bytes);
- var diag: std.zon.parse.Diagnostics = .{};
- const state = std.zon.parse.fromSliceAlloc(State, arena.allocator(), source, &diag, .{ .free_on_error = false }) catch |err| {
+ const source = try arena.allocator().dupeSentinel(u8, bytes, 0);
+ var diag: std.zon.parse.Diagnostics = undefined;
+ const state = std.zon.parse.fromSlice(State, .{ .gpa = gpa, .arena = arena.allocator(), .source = source, .diagnostics = &diag }) catch |err| {
const said = pardes.Messages.zonWhy(&diag, why[0 .. why.len - 1]);
if (said.ptr != why.ptr) @memcpy(why[0..said.len], said);
why[said.len] = 0;
@@ -434,21 +436,13 @@ pub fn readZon(gpa: std.mem.Allocator, bytes: []const u8, label: []const u8) !Pa
var parsed: Parsed = .{ .value = undefined, .arena = .init(gpa) };
errdefer parsed.deinit();
const arena = parsed.arena.allocator();
- const source = try gpa.dupeZ(u8, bytes);
+ const source = try gpa.dupeSentinel(u8, bytes, 0);
defer gpa.free(source);
- parsed.value = if (builtin.os.tag == .emscripten or builtin.os.tag == .freestanding)
- std.zon.parse.fromSliceAlloc(State, arena, source, null, .{ .free_on_error = false }) catch |err| {
- if (err == error.ParseZon) log.err("parse dump {s}: {s}", .{ label, @errorName(err) });
- return err;
- }
- else blk: {
- var diag: std.zon.parse.Diagnostics = .{};
- defer diag.deinit(arena);
- break :blk std.zon.parse.fromSliceAlloc(State, arena, source, &diag, .{ .free_on_error = false }) catch |err| {
- if (err == error.ParseZon) log.err("parse dump {s}: {f}", .{ label, diag });
- return err;
- };
+ var diag: std.zon.parse.Diagnostics = undefined;
+ parsed.value = std.zon.parse.fromSlice(State, .{ .gpa = gpa, .arena = arena, .source = source, .diagnostics = &diag }) catch |err| {
+ if (err == error.ParseZon) log.err("{f}", .{diag.fmt(label)});
+ return err;
};
try validate(parsed.value);
return parsed;
@@ -1106,7 +1100,7 @@ test "a restored session's column and workspace tags take more than one selectio
try std.testing.expect(restored.col_tags[0].reserveSels());
try std.testing.expect(restored.global_tag.reserveSels());
try std.testing.expect(restored.fs.started != 0);
- const stat = th.call(restored, .{ .tag = 1, .op = .getattr, .node = @intFromEnum(pardes.ctlfs.TopFile.index) });
+ const stat = th.call(restored, .{ .tag = 1, .op = .getattr, .node = @backingInt(pardes.ctlfs.TopFile.index) });
try std.testing.expect(stat.reply.attr.mtime != 0);
}
@@ -1152,7 +1146,7 @@ test "a pane restored with unsaved text is asked about by Exit, Restore, Del and
const node = if (std.mem.eql(u8, word, "Del") or std.mem.eql(u8, word, "get"))
ctlfs.Node.of(restored.panes[id].?.serial, .ctl)
else
- @intFromEnum(ctlfs.TopFile.ctl);
+ @backingInt(ctlfs.TopFile.ctl);
const line = if (std.mem.eql(u8, word, "Restore")) try std.fmt.bufPrint(&restore_line, "Restore {s}/d.zon\n", .{dir}) else if (std.mem.eql(u8, word, "Exit")) "Exit\n" else if (std.mem.eql(u8, word, "Del")) "Del\n" else "get\n";
const answer = th.wr(restored, node, line);
try std.testing.expectEqual(ctlfs.Status.err, answer.reply.status);