summaryrefslogtreecommitdiff
path: root/anim/src/source.zig
diff options
context:
space:
mode:
Diffstat (limited to 'anim/src/source.zig')
-rw-r--r--anim/src/source.zig22
1 files changed, 15 insertions, 7 deletions
diff --git a/anim/src/source.zig b/anim/src/source.zig
index aedbb3e..48b361f 100644
--- a/anim/src/source.zig
+++ b/anim/src/source.zig
@@ -279,10 +279,16 @@ fn whereIs(u: ui.Ui, rec: *const Recording, i: u64) []const u8 {
}
/// A source ready to draw: a class for each byte, and where each line is.
-const Text = struct {
+pub const Text = struct {
bytes: []const u8,
styles: []const u8,
lines: []const [2]usize,
+
+ /// `bytes` is borrowed; the caller keeps it alive for this prepared text.
+ pub fn deinit(text: Text) void {
+ gpa.free(text.styles);
+ gpa.free(text.lines);
+ }
};
/// Made once for each source and kept: a scene draws the same few.
@@ -294,9 +300,11 @@ fn prepared(source: []const u8, file: []const u8) ?*const Text {
return &texts.items[texts.items.len - 1];
}
-fn prepare(source: []const u8, file: []const u8) !Text {
+pub fn prepare(source: []const u8, file: []const u8) !Text {
var analysis = try pardes.analyzeSource(gpa, file, source, false, true);
+ errdefer analysis.deinit(gpa);
var lines: std.ArrayList([2]usize) = .empty;
+ defer lines.deinit(gpa);
var start: usize = 0;
while (start < source.len) {
const end = std.mem.indexOfScalarPos(u8, source, start, '\n') orelse source.len;
@@ -321,10 +329,10 @@ test "a source is cut into lines and classed byte by byte" {
try std.testing.expectEqual(@as(usize, 3), text.lines.len);
try std.testing.expectEqualStrings(" return 0; // done", source[text.lines[1][0]..text.lines[1][1]]);
const at = std.mem.indexOf(u8, source, "return").?;
- try std.testing.expectEqual(pardes.Syn.keyword, @as(pardes.Syn, @enumFromInt(text.styles[at])));
- try std.testing.expectEqual(pardes.Syn.number, @as(pardes.Syn, @enumFromInt(text.styles[at + 7])));
- try std.testing.expectEqual(pardes.Syn.comment, @as(pardes.Syn, @enumFromInt(text.styles[at + 10])));
+ try std.testing.expectEqual(pardes.Syn.keyword, @as(pardes.Syn, @fromBackingInt(@intCast(text.styles[at]))));
+ try std.testing.expectEqual(pardes.Syn.number, @as(pardes.Syn, @fromBackingInt(@intCast(text.styles[at + 7]))));
+ try std.testing.expectEqual(pardes.Syn.comment, @as(pardes.Syn, @fromBackingInt(@intCast(text.styles[at + 10]))));
// rows.line reads these classes by number.
- try std.testing.expectEqual(@as(u8, 1), @intFromEnum(pardes.Syn.keyword));
- try std.testing.expectEqual(@as(u8, 4), @intFromEnum(pardes.Syn.comment));
+ try std.testing.expectEqual(@as(u8, 1), @backingInt(pardes.Syn.keyword));
+ try std.testing.expectEqual(@as(u8, 4), @backingInt(pardes.Syn.comment));
}