Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RuleList: eliminate "self" naming convention

Browse Source
This commit is contained in:
Isaac Freund 2024-03-14 13:07:58 +01:00
parent 8764b82da5
commit 388c95d2e9
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
river/rule_list.zig
View File

@ -30,7 +30,7 @@ pub const MaxGlobLen = struct {
pub fn RuleList(comptime T: type) type { pub fn RuleList(comptime T: type) type {
return struct { return struct {
const Self = @This(); const List = @This();
const Rule = struct { const Rule = struct {
app_id_glob: []const u8, app_id_glob: []const u8,
@ -42,7 +42,7 @@ pub fn RuleList(comptime T: type) type {
/// Ordered first by app-id generality then by title generality. /// Ordered first by app-id generality then by title generality.
rules: std.ArrayListUnmanaged(Rule) = .{}, rules: std.ArrayListUnmanaged(Rule) = .{},
pub fn deinit(list: *Self) void { pub fn deinit(list: *List) void {
for (list.rules.items) |rule| { for (list.rules.items) |rule| {
util.gpa.free(rule.app_id_glob); util.gpa.free(rule.app_id_glob);
util.gpa.free(rule.title_glob); util.gpa.free(rule.title_glob);
@ -50,7 +50,7 @@ pub fn RuleList(comptime T: type) type {
list.rules.deinit(util.gpa); list.rules.deinit(util.gpa);
} }
pub fn add(list: *Self, rule: Rule) error{OutOfMemory}!void { pub fn add(list: *List, rule: Rule) error{OutOfMemory}!void {
const index = for (list.rules.items, 0..) |*existing, i| { const index = for (list.rules.items, 0..) |*existing, i| {
if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and
mem.eql(u8, rule.title_glob, existing.title_glob)) mem.eql(u8, rule.title_glob, existing.title_glob))
@ -83,7 +83,7 @@ pub fn RuleList(comptime T: type) type {
}); });
} }
pub fn del(list: *Self, rule: struct { app_id_glob: []const u8, title_glob: []const u8 }) ?T { pub fn del(list: *List, rule: struct { app_id_glob: []const u8, title_glob: []const u8 }) ?T {
for (list.rules.items, 0..) |existing, i| { for (list.rules.items, 0..) |existing, i| {
if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and
mem.eql(u8, rule.title_glob, existing.title_glob)) mem.eql(u8, rule.title_glob, existing.title_glob))
@ -98,7 +98,7 @@ pub fn RuleList(comptime T: type) type {
/// Returns the value of the most specific rule matching the view. /// Returns the value of the most specific rule matching the view.
/// Returns null if no rule matches. /// Returns null if no rule matches.
pub fn match(list: *Self, view: *View) ?T { pub fn match(list: *List, view: *View) ?T {
assert(!view.destroying); assert(!view.destroying);
const app_id = mem.sliceTo(view.getAppId(), 0) orelse ""; const app_id = mem.sliceTo(view.getAppId(), 0) orelse "";
const title = mem.sliceTo(view.getTitle(), 0) orelse ""; const title = mem.sliceTo(view.getTitle(), 0) orelse "";
@ -115,10 +115,10 @@ pub fn RuleList(comptime T: type) type {
} }
/// Returns the length of the longest globs. /// Returns the length of the longest globs.
pub fn getMaxGlobLen(self: *const Self) MaxGlobLen { pub fn getMaxGlobLen(list: *const List) MaxGlobLen {
var app_id_len: usize = 0; var app_id_len: usize = 0;
var title_len: usize = 0; var title_len: usize = 0;
for (self.rules.items) |rule| { for (list.rules.items) |rule| {
app_id_len = @max(app_id_len, rule.app_id_glob.len); app_id_len = @max(app_id_len, rule.app_id_glob.len);
title_len = @max(title_len, rule.title_glob.len); title_len = @max(title_len, rule.title_glob.len);
} }