diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGELOG.md | 15 | ||||
| -rw-r--r-- | src/Core.zig | 9 | ||||
| -rw-r--r-- | src/Plumb.zig | 1241 | ||||
| -rw-r--r-- | src/config.zig | 1 | ||||
| -rw-r--r-- | src/exec.zig | 4 | ||||
| -rw-r--r-- | src/fs-help.txt | 2 | ||||
| -rw-r--r-- | src/ninep/tree.zig | 130 | ||||
| -rw-r--r-- | src/pardes.zig | 1 | ||||
| -rw-r--r-- | src/plumbing | 23 | ||||
| -rw-r--r-- | src/regexp.zig | 8 |
10 files changed, 1412 insertions, 22 deletions
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 979e566a..f367774e 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -2,6 +2,21 @@ ## Unreleased +- A search with a class whose range ends at `\xff` (`[\x80-\xff]`, in an + address, `s`, a plumbing rule) no longer takes the editor down: mvzr + counted the range past a byte's end. + +- The plumber, Plan 9's, is in the session: `plumb/rules` holds its + rules in plumb(6)'s language (rule sets of `object verb arg` lines, + variables, `include`, `matches` over the whole text or around a click, + `isfile` and `isdir` finding a name as a look does), and `plumb/send` + takes a message and sends it where they say, to a port pardes reads + (`edit`, `web`, a loaded kind) or to a word or command started, with + Plan 9's words when it cannot. A session starts with `include basic`, + pardes's rules (`src/plumbing`). Kept in a dump. `$1`-`$9` are refused, + the regular expressions having no submatches. A look does not ask it + yet. + - A query pane's row looked at on its address (its gutter) opens the row's place however the look arrives, as a click there always did: an empty look written back to the pane's `event` file, and the whole row diff --git a/src/Core.zig b/src/Core.zig index c5187616..9a6e80d4 100644 --- a/src/Core.zig +++ b/src/Core.zig @@ -39,6 +39,7 @@ const Rect = pardes.Rect; const Registers = pardes.Registers; const RowMetrics = pardes.RowMetrics; const Store = @import("Store.zig"); +const Plumb = @import("Plumb.zig"); const Db = pardes.Db; const Stream = pardes.Stream; const Surface = pardes.Surface; @@ -211,6 +212,9 @@ incl: std.ArrayList([]u8) = .empty, /// Plumb's rules, the user's, tried in order before the built-in ones /// (look.resolve), the first to match taking the look. Kept in a dump. plumb: std.ArrayList([]u8) = .empty, +/// The plumber's rules (Plumb.zig): plumb/rules and plumb/send's, the +/// defaults (`include basic`) until something writes others. Kept in a dump. +plumber: Plumb = .{}, /// Zerox's groups of panes on one buffer (File.syncTwins), and the id /// the next takes. twin_groups: std.ArrayList(pardes.panes.File.TwinGroup) = .empty, @@ -227,6 +231,9 @@ next_serial: u32 = 0, /// The column whose tag the running command came from, while it runs: /// the column acme's commands take from their Text's col. exec_column: ?usize = null, +/// The directory a `plumb start`'s command runs in, while it runs +/// (Plumb.run): the message's wdir, which no pane need have. +exec_dir: ?[]const u8 = null, /// Panes made this step that found no room in their column /// (layout.placeNew): closed at the step's end, once whatever made them /// is done with them. @@ -759,6 +766,7 @@ pub fn deinit(p: *Pardes) void { p.incl.deinit(p.gpa); for (p.plumb.items) |rule| p.gpa.free(rule); p.plumb.deinit(p.gpa); + p.plumber.deinit(p.gpa); for (p.twin_groups.items) |group| p.gpa.free(group.path); p.twin_groups.deinit(p.gpa); p.fs.batch.bytes.deinit(p.gpa); @@ -1703,6 +1711,7 @@ fn processDir(buf: *[limits.host_path_cap]u8) ?[]const u8 { /// The directory a word run from pane `id`'s text or tag runs in, or, /// from a header, the session's. pub fn execDir(p: *Pardes, id: usize) []const u8 { + if (p.exec_dir) |dir| return dir; if (p.exec_header) return p.sessionDir(); return paneDir(p.panes[id] orelse return p.sessionDir()); } diff --git a/src/Plumb.zig b/src/Plumb.zig new file mode 100644 index 00000000..57a19b14 --- /dev/null +++ b/src/Plumb.zig @@ -0,0 +1,1241 @@ +//! The plumber (Plan 9's plumber(4), windows/plumb/): the rules, and a +//! message matched against them and sent where they say. The language is +//! plumb(6)'s as rules.c and match.c read it, and its refusals are their +//! words; docs/next-plumber.md is the design. The rules are kept as their +//! text, a step's state as any other (digested, dumped, replicated), and +//! parsed again for each message: a send reads no file, and asks the disk +//! only at `isfile` and `isdir`, through the taped resolve sites Look uses. +const Plumb = @This(); +const std = @import("std"); +const pardes = @import("pardes.zig"); +const fs = @import("fs.zig"); +const look = @import("look.zig"); +const exec = @import("exec.zig"); +const layout = @import("layout.zig"); +const Kind = @import("Kind.zig"); +const Regex = @import("regexp.zig").Regex; +const Pardes = pardes.Pardes; + +/// The rules in force once any were written, as plumb/rules reads them: +/// what `print` makes of them, an include's text in its place, in the +/// order they were written. +text: std.ArrayList(u8) = .empty, +/// Whether rules were written (or cleared): until then the rules in force +/// are `include basic`'s, so a session starts with the defaults, and so +/// does a dump made before the plumber. +written: bool = false, + +/// The default rules, which `include basic` names, as Plan 9's names +/// /lib/plumb/basic. +pub const basic = @embedFile("plumbing"); + +/// The most rule text kept (Plan 9's whole basic is about 4 KiB), variables +/// and ports, as Plan 9's NDIR less its fixed files; deeper includes, as +/// rules.c's pushinput. +pub const max_text = 64 * 1024; +const max_vars = 32; +const max_ports = 32; +const max_depth = 10; + +/// fsys.c's and match.c's words for a message that went nowhere. +pub const e_bad_msg = "bad plumb message format"; +pub const e_no_port = "couldn't find destination for message"; +pub const e_no_start = "no start action for plumb message"; +pub const e_client = "no port for \"client\" rule"; +pub const e_empty = "empty argument list"; + +pub fn deinit(pl: *Plumb, gpa: std.mem.Allocator) void { + pl.text.deinit(gpa); +} + +// ---- the message ---- + +/// A plumb message (plumb.h, plumb(6)): six lines of header, then `data`. +pub const Msg = struct { + src: []const u8 = "", + dst: []const u8 = "", + wdir: []const u8 = "", + type: []const u8 = "", + /// `name=value` pairs, blank-separated, as they are packed: a value + /// holding a blank, a quote, `=` or a tab quoted rc's way. + attr: []const u8 = "", + data: []const u8 = "", + + /// plumbpack: the header lines, the data's length, the data. + pub fn pack(m: Msg, w: *std.Io.Writer) std.Io.Writer.Error!void { + try w.print("{s}\n{s}\n{s}\n{s}\n{s}\n{d}\n{s}", .{ m.src, m.dst, m.wdir, m.type, m.attr, m.data.len, m.data }); + } +}; + +/// plumbunpackpartial: a whole message, `more` bytes of its data still to +/// come, or one malformed (a header line short, a count the data passes). +pub const Unpacked = union(enum) { msg: Msg, more: usize, bad }; + +pub fn unpack(bytes: []const u8) Unpacked { + var lines: [6][]const u8 = undefined; + var at: usize = 0; + for (&lines) |*line| { + const nl = std.mem.indexOfScalarPos(u8, bytes, at, '\n') orelse return .bad; + line.* = bytes[at..nl]; + at = nl + 1; + } + // atoi's: digits after blanks, else 0. + const count = std.mem.trimStart(u8, lines[5], " \t"); + var n: usize = 0; + for (count) |c| { + if (c < '0' or c > '9') break; + n = std.math.mul(usize, n, 10) catch return .bad; + n = std.math.add(usize, n, c - '0') catch return .bad; + } + const rest = bytes.len - at; + if (n > rest) return .{ .more = n - rest }; + if (n < rest) return .bad; + return .{ .msg = .{ .src = lines[0], .dst = lines[1], .wdir = lines[2], .type = lines[3], .attr = lines[4], .data = bytes[at..] } }; +} + +/// One `name=value` of packed attributes, its value unquoted. +const Attr = struct { name: []const u8, value: []const u8 }; + +/// The attribute at `at.*` in `attr`, read as plumbunpackattr reads it, +/// its value unquoted into `buf`; null at their end, or at one with no +/// `=`, where Plan 9 stops. +fn nextAttr(attr: []const u8, at: *usize, buf: *[4096]u8) ?Attr { + var i = at.*; + while (i < attr.len and (attr[i] == ' ' or attr[i] == '\t')) i += 1; + if (i >= attr.len or attr[i] == '\n') return null; + const start = i; + while (i < attr.len and attr[i] != '=' and attr[i] != ' ' and attr[i] != '\t' and attr[i] != '\n') i += 1; + if (i >= attr.len or attr[i] != '=') return null; + const name = attr[start..i]; + i += 1; + var n: usize = 0; + var quoting = false; + while (i < attr.len and attr[i] != '\n' and n < buf.len) { + const c = attr[i]; + i += 1; + if (c == '\'') { + if (!quoting) { + quoting = true; + continue; + } + if (i < attr.len and attr[i] == '\'') { + i += 1; + } else { + quoting = false; + continue; + } + } else if (!quoting and (c == ' ' or c == '\t')) break; + buf[n] = c; + n += 1; + } + at.* = i; + return .{ .name = name, .value = buf[0..n] }; +} + +/// plumblookup: the first attribute named `name`'s value. +fn attrValue(attr: []const u8, name: []const u8, buf: *[4096]u8) ?[]const u8 { + var at: usize = 0; + while (nextAttr(attr, &at, buf)) |a| if (std.mem.eql(u8, a.name, name)) return a.value; + return null; +} + +/// `attr` packed again (plumbpackattr): the first attribute named `drop` +/// left out (plumbdelattr), those of `add` after it (plumbaddattr). +fn repack(arena: std.mem.Allocator, attr: []const u8, drop: ?[]const u8, add: []const u8) error{OutOfMemory}![]const u8 { + var out: std.Io.Writer.Allocating = .init(arena); + var dropped = drop == null; + var buf: [4096]u8 = undefined; + for ([2][]const u8{ attr, add }) |from| { + var at: usize = 0; + while (nextAttr(from, &at, &buf)) |a| { + if (!dropped and std.mem.eql(u8, a.name, drop.?)) { + dropped = true; + continue; + } + const w = &out.writer; + if (out.written().len > 0) w.writeByte(' ') catch return error.OutOfMemory; + w.print("{s}=", .{a.name}) catch return error.OutOfMemory; + // mesg.c's quote: a value with a blank, a quote, `=` or a tab. + if (std.mem.indexOfAny(u8, a.value, " '=\t") == null) { + w.writeAll(a.value) catch return error.OutOfMemory; + continue; + } + w.writeByte('\'') catch return error.OutOfMemory; + for (a.value) |c| { + if (c == '\'') w.writeByte('\'') catch return error.OutOfMemory; + w.writeByte(c) catch return error.OutOfMemory; + } + w.writeByte('\'') catch return error.OutOfMemory; + } + } + return out.written(); +} + +// ---- the rules ---- + +/// rules.c's objects and verbs, in its order (`kind` is an old `type`). +const Obj = enum { arg, attr, data, dst, plumb, src, type, wdir }; +const Verb = enum { add, client, delete, is, isdir, isfile, matches, set, start, to }; + +/// A line `object verb arg`: `qarg` is `arg` expanded with the variables +/// alone, its first word, as rules.c's parserule keeps it. +const Rule = struct { obj: Obj, verb: Verb, arg: []const u8, qarg: []const u8 }; +const Set = struct { pats: []const Rule, acts: []const Rule, port: ?[]const u8 }; +const Var = struct { name: []const u8, value: []const u8, qvalue: []const u8 }; + +/// The rules as read, each item where it was written: printed back in +/// that order, a variable given again later means what it meant to the +/// rules between (Plan 9's printrules puts every variable first). +const Rules = struct { + items: std.ArrayList(union(enum) { variable: Var, ports: []const Rule, set: Set }) = .empty, + vars: std.ArrayList(Var) = .empty, + /// Every port a rule set or a declaration names, once, in order. + ports: std.ArrayList([]const u8) = .empty, + + fn print(r: *const Rules, w: *std.Io.Writer) std.Io.Writer.Error!void { + for (r.items.items) |item| switch (item) { + .variable => |v| try w.print("{s}={s}\n\n", .{ v.name, v.value }), + .ports => |acts| { + for (acts) |a| try printRule(w, a); + try w.writeByte('\n'); + }, + .set => |set| { + for (set.pats) |a| try printRule(w, a); + for (set.acts) |a| try printRule(w, a); + try w.writeByte('\n'); + }, + }; + } + + fn printRule(w: *std.Io.Writer, r: Rule) std.Io.Writer.Error!void { + try w.print("{s}\t{s}\t{s}\n", .{ @tagName(r.obj), @tagName(r.verb), r.arg }); + } + + fn named(r: *const Rules, port: []const u8) bool { + for (r.ports.items) |n| if (std.mem.eql(u8, n, port)) return true; + return false; + } +}; + +/// What a message is matched with, beside the rules: the message, and what +/// the rule set's patterns found so far (match.c's Exec). +const Exec = struct { + m: *Msg, + /// The last `data matches`'s match, `$0`. + match0: []const u8 = "", + /// The span a click match took, which every other `data matches` of + /// the set must take too. + span: ?[2]usize = null, + clearclick: bool = false, + setdata: bool = false, + /// What `isfile` and `isdir` found: `$file`, `$dir`. + file: ?[]const u8 = null, + dir: ?[]const u8 = null, +}; + +/// rules.c's expand: the first word of `s` (a blank outside quotes ends +/// it), quotes rc's (`'...'`, `''` a quote), `$name` a variable's value, +/// with a message the message's (`$data`, `$0`, `$file`, ...); a `$` that +/// names nothing stays. Past `out` (Plan 9's 4 KiB ebuf), `TooLong`. +/// Answers the word and how much of `s` it took. +fn expand(r: *const Rules, e: ?*const Exec, s: []const u8, out: *[4096]u8) error{TooLong}!struct { []const u8, usize } { + var w = std.Io.Writer.fixed(out); + var i: usize = 0; + var quoting = false; + while (i < s.len and (quoting or (s[i] != ' ' and s[i] != '\t'))) { + if (s[i] == '\'') { + i += 1; + if (!quoting) { + quoting = true; + } else if (i < s.len and s[i] == '\'') { + w.writeByte('\'') catch return error.TooLong; + i += 1; + } else quoting = false; + continue; + } + if (quoting or s[i] != '$') { + w.writeByte(s[i]) catch return error.TooLong; + i += 1; + continue; + } + i += 1; + const took = dollar(r, e, s[i..], &w) catch return error.TooLong; + if (took) |n| i += n else w.writeByte('$') catch return error.TooLong; + } + return .{ w.buffered(), i }; +} + +/// rules.c's dollar: the value `$` then `s` names, written to `w`; how +/// much of `s` its name took, or null when it names nothing. +fn dollar(r: *const Rules, e: ?*const Exec, s: []const u8, w: *std.Io.Writer) std.Io.Writer.Error!?usize { + if (e) |x| if (s.len > 0 and std.ascii.isDigit(s[0])) { + // `$1`-`$9` were refused at parse (no submatches): `$0` alone. + if (s[0] == '0') try w.writeAll(x.match0); + return 1; + }; + var n: usize = 0; + while (n < s.len and std.ascii.isAlphanumeric(s[n])) n += 1; + const name = s[0..n]; + if (e) |x| { + const m = x.m; + const field: ?[]const u8 = if (std.mem.eql(u8, name, "src")) m.src else if (std.mem.eql(u8, name, "dst")) m.dst else if (std.mem.eql(u8, name, "attr")) m.attr else if (std.mem.eql(u8, name, "data")) m.data else if (std.mem.eql(u8, name, "type")) m.type else if (std.mem.eql(u8, name, "wdir")) m.wdir else null; + if (field) |f| { + try w.writeAll(f); + return n; + } + // rules.c's filename: what isfile or isdir found, else the data + // made absolute in wdir. + const found = if (std.mem.eql(u8, name, "file")) x.file else if (std.mem.eql(u8, name, "dir")) x.dir else null; + if (found != null or std.mem.eql(u8, name, "file") or std.mem.eql(u8, name, "dir")) { + if (found) |f| { + try w.writeAll(f); + } else if ((m.data.len > 0 and m.data[0] == '/') or m.wdir.len == 0) { + try w.writeAll(m.data); + } else try w.print("{s}/{s}", .{ m.wdir, m.data }); + return n; + } + } + for (r.vars.items) |v| if (std.mem.eql(u8, v.name, name)) { + try w.writeAll(v.qvalue); + return n; + }; + return null; +} + +/// Reads rule text into `rules` (rules.c's readrules): line by line, a +/// blank line (or a comment, or a variable) ending a rule set, an include +/// read in its place. A refusal is `why`: `<file>:<line>: <rules.c's words>`. +const Parser = struct { + arena: std.mem.Allocator, + /// Where an include is read from: none, only `basic`. + p: ?*Pardes, + /// Rules written, not the ones in force read again: their patterns + /// compiled and their bounds counted. + check: bool, + rules: Rules = .{}, + pats: std.ArrayList(Rule) = .empty, + acts: std.ArrayList(Rule) = .empty, + port: ?[]const u8 = null, + commands: usize = 0, + file: []const u8 = "", + line: usize = 0, + depth: usize = 0, + why: []const u8 = "", + + const Error = error{ Parse, OutOfMemory }; + + fn fail(ps: *Parser, comptime fmt: []const u8, args: anytype) Error { + ps.why = try std.fmt.allocPrint(ps.arena, "{s}:{d}: " ++ fmt, .{ ps.file, ps.line } ++ args); + return error.Parse; + } + + fn feed(ps: *Parser, name: []const u8, text: []const u8) Error!void { + ps.file = name; + ps.line = 0; + const whole = if (std.mem.endsWith(u8, text, "\n")) text[0 .. text.len - 1] else text; + var lines = std.mem.splitScalar(u8, whole, '\n'); + while (lines.next()) |line| { + ps.line += 1; + try ps.take(line); + } + } + + /// The text read, ended as its end ends a rule set. + fn finish(ps: *Parser) Error!void { + try ps.endSet(); + } + + /// rules.c's readrule, for one line. + fn take(ps: *Parser, raw: []const u8) Error!void { + const l = std.mem.trimStart(u8, raw, " \t"); + if (l.len == 0 or l[0] == '#') return ps.endSet(); + if (std.mem.startsWith(u8, l, "include")) return ps.include(l); + if (try ps.assignment(l)) return; + const obj_end = std.mem.indexOfAny(u8, l, " \t") orelse return ps.fail("malformed rule", .{}); + const obj_word = l[0..obj_end]; + const obj = std.meta.stringToEnum(Obj, obj_word) orelse + if (std.mem.eql(u8, obj_word, "kind")) .type else return ps.fail("unknown object {s}", .{obj_word}); + const rest = std.mem.trimStart(u8, l[obj_end..], " \t"); + const verb_end = std.mem.indexOfAny(u8, rest, " \t") orelse return ps.fail("malformed rule", .{}); + const verb = std.meta.stringToEnum(Verb, rest[0..verb_end]) orelse return ps.fail("unknown verb {s}", .{rest[0..verb_end]}); + const arg = std.mem.trimStart(u8, rest[verb_end..], " \t"); + if (arg.len == 0) return ps.fail("malformed rule", .{}); + // parserule. + const action = verb == .client or verb == .start or verb == .to; + if ((obj == .plumb) != action or (obj != .attr and (verb == .add or verb == .delete))) + return ps.fail("{s} not valid verb for object {s}", .{ @tagName(verb), @tagName(obj) }); + // pardes's regular expressions have no capture groups (regexp.zig, + // mvzr), and the user chose never to have an engine of pardes's + // own: a submatch is refused, never silently empty. + var quoting = false; + for (arg, 0..) |c, i| { + if (c == '\'') quoting = !quoting; + if (!quoting and c == '$' and i + 1 < arg.len and arg[i + 1] >= '1' and arg[i + 1] <= '9') + return ps.fail("${c}: no submatches (the regular expressions have no capture groups): use $0 and several matches", .{arg[i + 1]}); + } + const r: Rule = .{ .obj = obj, .verb = verb, .arg = arg, .qarg = try ps.word(arg) }; + if (verb == .matches and ps.check) { + var pat: [4096 + 4]u8 = undefined; + _ = Regex.compile(anchored(r.qarg, &pat)) catch |err| return ps.fail("{s}", .{Regex.message(err)}); + } + if (obj != .plumb) return ps.pats.append(ps.arena, r); + try ps.acts.append(ps.arena, r); + if (verb != .to) { + ps.commands += 1; + return; + } + // readruleset's: a declaration names many, a rule set one. + if (ps.pats.items.len > 0 and ps.port != null) return ps.fail("too many ports", .{}); + for ([_][]const u8{ ".", "..", "send", "rules" }) |bad| if (std.mem.eql(u8, r.qarg, bad)) + return ps.fail("illegal port name {s}", .{r.qarg}); + ps.port = r.qarg; + } + + /// readruleset's end: a rule set kept, ports declared, or a refusal. + fn endSet(ps: *Parser) Error!void { + const pats = ps.pats.items; + const acts = ps.acts.items; + const port = ps.port; + const commands = ps.commands; + ps.pats = .empty; + ps.acts = .empty; + ps.port = null; + ps.commands = 0; + if (commands > 1) return ps.fail("ruleset has more than one client or start action", .{}); + if (pats.len == 0 and acts.len == 0) return; + if (pats.len > 0 and acts.len > 0) { + try ps.rules.items.append(ps.arena, .{ .set = .{ .pats = pats, .acts = acts, .port = port } }); + } else { + if (acts.len == 0 or port == null) return ps.fail("ruleset must have patterns and actions", .{}); + for (acts) |a| if (a.verb != .to) return ps.fail("ruleset must have actions", .{}); + try ps.rules.items.append(ps.arena, .{ .ports = acts }); + } + for (acts) |a| if (a.verb == .to and !ps.rules.named(a.qarg)) { + if (ps.check and ps.rules.ports.items.len >= max_ports) return ps.fail("too many ports; max {d}", .{max_ports}); + try ps.rules.ports.append(ps.arena, a.qarg); + }; + } + + /// `s`'s first word expanded with the variables: a slice of `s` when + /// that changes nothing (no quote, no `$`), as in most rules. What a + /// parse keeps slices the text it read, which outlives it (the rules in + /// force, a write's, an include read into the arena, src/plumbing). + fn word(ps: *Parser, s: []const u8) Error![]const u8 { + var buf: [4096]u8 = undefined; + const w, const took = expand(&ps.rules, null, s, &buf) catch return ps.fail("string-too-long", .{}); + return if (std.mem.eql(u8, w, s[0..took])) s[0..took] else ps.arena.dupe(u8, w); + } + + /// rules.c's assignment: `name=value`, its value expanded once, now; + /// it ends a rule set as a blank line does. + fn assignment(ps: *Parser, l: []const u8) Error!bool { + if (!std.ascii.isAlphabetic(l[0])) return false; + var i: usize = 0; + while (i < l.len and std.ascii.isAlphanumeric(l[i])) i += 1; + const name = l[0..i]; + while (i < l.len and (l[i] == ' ' or l[i] == '\t')) i += 1; + if (i >= l.len or l[i] != '=') return false; + try ps.endSet(); + const value = std.mem.trimStart(u8, l[i + 1 ..], " \t"); + const v: Var = .{ .name = name, .value = value, .qvalue = try ps.word(value) }; + try ps.rules.items.append(ps.arena, .{ .variable = v }); + for (ps.rules.vars.items) |*old| if (std.mem.eql(u8, old.name, name)) { + old.* = v; + return true; + }; + if (ps.check and ps.rules.vars.items.len >= max_vars) return ps.fail("too many variables; max {d}", .{max_vars}); + try ps.rules.vars.append(ps.arena, v); + return true; + } + + /// rules.c's include: `include basic` is src/plumbing; another name + /// the configuration directory's file, an absolute one where it says. + fn include(ps: *Parser, l: []const u8) Error!void { + var words = std.mem.tokenizeAny(u8, l, " \t"); + const first = words.next().?; + const name = words.next() orelse ""; + const third = words.next(); + if (!std.mem.eql(u8, first, "include") or name.len == 0 or name[0] == '#' or (third != null and third.?[0] != '#')) + return ps.fail("malformed include statement", .{}); + if (ps.depth >= max_depth) return ps.fail("include stack too deep; max {d}", .{max_depth}); + const text = if (std.mem.eql(u8, name, "basic")) basic else text: { + var buf: [4096]u8 = undefined; + const p = ps.p orelse return ps.fail("can't open {s} for inclusion", .{name}); + const path = if (name[0] == '/') name else std.fmt.bufPrint(&buf, "{s}/{s}", .{ p.configDir() orelse "", name }) catch name; + break :text fs.readFile(ps.arena, path) catch return ps.fail("can't open {s} for inclusion", .{path}); + }; + const file = ps.file; + const line = ps.line; + ps.depth += 1; + try ps.feed(name, text); + ps.depth -= 1; + ps.file = file; + ps.line = line; + } +}; + +/// `pat` matching only the whole of what it is run over: `^(pat)$` (its +/// own anchors dropped, mvzr taking `^` only first), in `out`. +fn anchored(pat: []const u8, out: *[4096 + 4]u8) []const u8 { + var core = pat; + if (core.len > 0 and core[0] == '^') core = core[1..]; + if (core.len > 1 and core[core.len - 1] == '$' and core[core.len - 2] != '\\') core = core[0 .. core.len - 1]; + return std.fmt.bufPrint(out, "^({s})$", .{core}) catch pat; +} + +/// The rules in force as text to read again. +fn source(p: *Pardes) []const u8 { + return if (p.plumber.written) p.plumber.text.items else "include basic\n"; +} + +/// The rules in force read, for a send. +fn rulesOf(p: *Pardes, arena: std.mem.Allocator) Parser.Error!Rules { + var ps: Parser = .{ .arena = arena, .p = p, .check = false }; + try ps.feed("plumb/rules", source(p)); + try ps.finish(); + return ps.rules; +} + +/// The rules in force as plumb/rules reads them, the defaults printed +/// (in the step's scratch) while none were written. +pub fn inForce(p: *Pardes) []const u8 { + if (p.plumber.written) return p.plumber.text.items; + const arena = p.scratch.allocator(); + const rules = rulesOf(p, arena) catch return ""; + var out: std.Io.Writer.Allocating = .init(arena); + rules.print(&out.writer) catch return ""; + return out.written(); +} + +/// No rules at all: a `>` to plumb/rules, before what it writes. +pub fn clear(p: *Pardes) void { + p.plumber.text.clearRetainingCapacity(); + p.plumber.written = true; +} + +/// `more` read after the rules in force (`keep`) or in their place, and +/// what that makes kept as the rules: plumb/rules' write and its close's +/// rest. Null when taken, else why not, in the step's scratch, the rules +/// as they were. +pub fn apply(p: *Pardes, keep: bool, more: []const u8) ?[]const u8 { + const arena = p.scratch.allocator(); + var ps: Parser = .{ .arena = arena, .p = p, .check = true }; + const said = said: { + if (keep) { + ps.feed("plumb/rules", source(p)) catch break :said ps.why; + ps.finish() catch break :said ps.why; + } + ps.feed("plumb/rules", more) catch break :said ps.why; + ps.finish() catch break :said ps.why; + var out: std.Io.Writer.Allocating = .init(arena); + ps.rules.print(&out.writer) catch break :said "out of memory"; + if (out.written().len > max_text) break :said std.fmt.comptimePrint("rules too long; max {d} KiB", .{max_text / 1024}); + p.plumber.text.clearRetainingCapacity(); + p.plumber.text.appendSlice(p.gpa, out.written()) catch break :said "out of memory"; + p.plumber.written = true; + return null; + }; + return if (said.len > 0) said else "out of memory"; +} + +// ---- matching ---- + +/// One message's match (fsys.c's write of `send` through dispose): the +/// rules, and what the disk said of a name, asked once however many rules +/// ask it. +const Send = struct { + p: *Pardes, + /// The pane a look sent from, whose jump list's directories a name is + /// looked for in too; none from plumb/send. + from: ?usize, + arena: std.mem.Allocator, + rules: Rules, + memo_name: ?[]const u8 = null, + memo_wdir: []const u8 = "", + memo: ?fs.Resolved = null, + memo_buf: [4096]u8 = undefined, + + /// Where a name is, as Look finds it: the place written after it + /// (`:12`, `:12:5`) no part of it, then the message's directory, the + /// jump list's panes' (from a look), then Incl's (look.zig's + /// resolveLookTarget). Each stat is a taped resolve site; a name is + /// asked once a send. + fn resolve(s: *Send, wdir: []const u8, raw: []const u8) ?fs.Resolved { + const name = look.parsePathLine(std.mem.trim(u8, raw, " \t\r\n")).path; + if (s.memo_name) |n| if (std.mem.eql(u8, n, name) and std.mem.eql(u8, s.memo_wdir, wdir)) return s.memo; + s.memo_name = s.arena.dupe(u8, name) catch return null; + s.memo_wdir = s.arena.dupe(u8, wdir) catch return null; + s.memo = s.search(wdir, name); + return s.memo; + } + + fn search(s: *Send, wdir: []const u8, name: []const u8) ?fs.Resolved { + if (name.len == 0) return null; + if (fs.resolve(s.p, name, wdir, &s.memo_buf)) |found| return found; + if (name[0] == '/' or fs.dotRelative(name)) return null; + if (s.from) |id| { + const v = s.p.view(); + var seen: [pardes.MAX_PANES][]const u8 = undefined; + var nseen: usize = 0; + var n: usize = 1; + cand: while (n <= v.jumps.n) : (n += 1) { + const k = v.jumps.list[v.jumps.n - n].pane; + if (k == id) continue; + const dir = Pardes.paneDir(s.p.panes[k] orelse continue); + if (std.mem.eql(u8, dir, wdir)) continue; + for (seen[0..nseen]) |d| if (std.mem.eql(u8, d, dir)) continue :cand; + seen[nseen] = dir; + nseen += 1; + if (fs.resolve(s.p, name, dir, &s.memo_buf)) |found| return found; + } + } + for (s.p.incl.items) |dir| if (fs.resolve(s.p, name, dir, &s.memo_buf)) |found| return found; + return null; + } + + /// match.c's matchruleset: the message tried against `set`, rewritten + /// in place by its patterns (a `set` stays though a later one fails). + fn matchSet(s: *Send, set: Set, e: *Exec) error{OutOfMemory}!bool { + const m = e.m; + if (m.dst.len > 0 and set.port != null and !std.mem.eql(u8, m.dst, set.port.?)) return false; + for (set.pats) |r| if (!try s.pattern(e, r)) return false; + if (set.port) |port| if (m.dst.len == 0) { + m.dst = port; + }; + // match.c's rewrite: a click match's span is the data now. + if (e.clearclick) { + m.attr = try repack(s.arena, m.attr, "click", ""); + if (e.setdata) m.data = e.match0; + } + return true; + } + + /// match.c's matchpat. + fn pattern(s: *Send, e: *Exec, r: Rule) error{OutOfMemory}!bool { + const m = e.m; + const field: ?*[]const u8 = switch (r.obj) { + .data => &m.data, + .dst => &m.dst, + .type => &m.type, + .wdir => &m.wdir, + .src => &m.src, + .arg, .attr, .plumb => null, + }; + var buf: [4096]u8 = undefined; + switch (r.verb) { + .is => return if (field) |f| std.mem.eql(u8, f.*, r.qarg) else false, + .set => { + const f = field orelse return true; + const value = (expand(&s.rules, e, r.arg, &buf) catch return false)[0]; + f.* = try s.arena.dupe(u8, value); + if (r.obj == .data) { + e.span = null; + e.setdata = false; + } + return true; + }, + .add, .delete => { + if (r.obj != .attr) return false; + const value = (expand(&s.rules, e, r.arg, &buf) catch return false)[0]; + if (r.verb == .add) { + m.attr = try repack(s.arena, m.attr, null, value); + return true; + } + // The code's, not the man page's: an absent one fails. + var vbuf: [4096]u8 = undefined; + if (attrValue(m.attr, value, &vbuf) == null) return false; + m.attr = try repack(s.arena, m.attr, value, ""); + return true; + }, + .isfile, .isdir => { + const name = switch (r.obj) { + .arg => (expand(&s.rules, e, r.arg, &buf) catch return false)[0], + .data => m.data, + .wdir => m.wdir, + else => return false, + }; + const found = s.resolve(m.wdir, name) orelse return false; + if (found.dir != (r.verb == .isdir)) return false; + const path = try s.arena.dupe(u8, found.path); + if (r.verb == .isdir) e.dir = path else e.file = path; + return true; + }, + .matches => { + const text = (field orelse return false).*; + var pat: [4096 + 4]u8 = undefined; + var click_buf: [4096]u8 = undefined; + const click = if (r.obj == .data) attrValue(m.attr, "click", &click_buf) else null; + if (click == null) { + // The whole of it, as match.c asks of regexec's answer. + var rx = Regex.compile(anchored(r.qarg, &pat)) catch return false; + const hit = (rx.find(text, 0, 0, text.len) catch return false) orelse return false; + if (hit.start != 0 or hit.end != text.len) return false; + e.match0 = text; + return true; + } + // clickmatch: the first match from each start up to the + // click that holds it, the click counted in runes. + const runes = std.fmt.parseInt(usize, std.mem.trim(u8, click.?, " \t"), 10) catch 0; + var at: usize = 0; + var n: usize = 0; + while (n < runes and at < text.len) : (n += 1) at += std.unicode.utf8ByteSequenceLength(text[at]) catch 1; + at = @min(at, text.len); + var rx = Regex.compile(r.qarg) catch return false; + var from: usize = 0; + const hit = while (from <= at) { + const h = (rx.find(text, from, at, text.len) catch return false) orelse return false; + if (h.start <= at and at <= h.end) break h; + // Every start before the next match finds this one. + from = h.start + 1; + while (from < text.len and text[from] & 0xC0 == 0x80) from += 1; + } else return false; + if (e.span) |sp| if (sp[0] != hit.start or sp[1] != hit.end) return false; + e.span = .{ hit.start, hit.end }; + e.clearclick = true; + e.setdata = true; + e.match0 = text[hit.start..hit.end]; + return true; + }, + .client, .start, .to => return false, + } + } +}; + +/// The ports pardes reads itself, as acme reads `edit`; and every loaded +/// kind by its name. +const Port = enum { + /// A file or directory opened as Look opens one, at the place written + /// after its name or given as `addr=`. + edit, + /// A URL given to the host's browser (xdg-open, open on macOS). + web, +}; + +/// A message matched against the rules and sent where they say (fsys.c's +/// write of `send`, then dispose), from pane `from` (a look's) or from +/// plumb/send (null: the pane with the keyboard runs what it starts). +/// Null when it went somewhere, else why not, in Plan 9's words, in the +/// step's scratch. +pub fn send(p: *Pardes, from: ?usize, msg: Msg) ?[]const u8 { + const arena = p.scratch.allocator(); + var s: Send = .{ .p = p, .from = from, .arena = arena, .rules = rulesOf(p, arena) catch return "plumb/rules: the rules in force do not read" }; + var m = msg; + var e: Exec = .{ .m = &m }; + const set: ?Set = for (s.rules.items.items) |item| { + const candidate = switch (item) { + .set => |x| x, + else => continue, + }; + e = .{ .m = &m }; + if (s.matchSet(candidate, &e) catch return "out of memory") break candidate; + } else null; + const id = from orelse p.view().active; + // dispose. + if (m.dst.len == 0) return startup(&s, id, set orelse return e_no_port, &e); + if (std.meta.stringToEnum(Port, m.dst)) |port| { + deliver(&s, id, port, &m); + return null; + } + if (p.kinds.byName(m.dst)) |k| { + openInKind(&s, id, k, &m); + return null; + } + // A port nobody reads: what the rule set starts, if it is one a rule + // names; one no rule names is no port, and the message goes nowhere, + // as fsys.c's dispose finds no Dirtab for it. + if (!s.rules.named(m.dst)) return null; + return startup(&s, id, set orelse return e_no_start, &e); +} + +/// match.c's startup: the rule set's `start` or `client`, its words +/// expanded, run. +fn startup(s: *Send, id: usize, set: Set, e: *const Exec) ?[]const u8 { + const act = for (set.acts) |a| { + if (a.verb == .start) break a; + if (a.verb == .client) { + if (e.m.dst.len == 0) return e_client; + break a; + } + } else return e_no_start; + // buildargv: one expansion a word. + var argv: std.ArrayList([]const u8) = .empty; + var rest = act.arg; + while (true) { + rest = std.mem.trimStart(u8, rest, " \t"); + if (rest.len == 0) break; + var buf: [4096]u8 = undefined; + const word, const took = expand(&s.rules, e, rest, &buf) catch return "string-too-long"; + argv.append(s.arena, s.arena.dupe(u8, word) catch return "out of memory") catch return "out of memory"; + rest = rest[took..]; + } + if (argv.items.len == 0) return e_empty; + run(s.p, id, e.m.wdir, argv.items); + return null; +} + +/// What a `plumb start` (and, until ports are read, a `plumb client`) runs: +/// the one place that decides it (question 4 of docs/next-plumber.md). +/// Its words as pardes's exec runs a line from the message's pane: a +/// builtin or a kind's word in place, any other line a command pane in +/// `wdir`, each word one argument to $SHELL -c however it is spelled. +/// Plan 9's runs detached, with no window. +fn run(p: *Pardes, id: usize, wdir: []const u8, argv: []const []const u8) void { + const arena = p.scratch.allocator(); + const line = std.mem.join(arena, " ", argv) catch return p.reportError(id, "plumb", error.OutOfMemory); + if (p.executeBuiltinLine(id, line)) return; + var quoted: std.Io.Writer.Allocating = .init(arena); + for (argv, 0..) |a, i| { + if (i > 0) quoted.writer.writeByte(' ') catch return; + quoted.writer.writeByte('\'') catch return; + for (a) |c| { + if (c == '\'') { + quoted.writer.writeAll("'\\''") catch return; + } else quoted.writer.writeByte(c) catch return; + } + quoted.writer.writeByte('\'') catch return; + } + p.exec_dir = if (wdir.len > 0) wdir else null; + defer p.exec_dir = null; + _ = exec.runCommand(p, id, quoted.written()); +} + +/// What pardes does with a message to a port it reads. Like a message +/// queued to a reader in Plan 9, the send is done: what goes wrong after +/// is said as a look's failure is. +fn deliver(s: *Send, id: usize, port: Port, m: *const Msg) void { + const p = s.p; + switch (port) { + .web => { + if (m.data.len > 256) return p.reportFailure(id, "plumb: web: a URL is at most 256 bytes"); + p.emit(.{ .open_link = .from(m.data) }); + }, + .edit => { + // acme's plumblook: the data a name in wdir, at its addr. + var buf: [4096]u8 = undefined; + const addr = attrValue(m.attr, "addr", &buf) orelse ""; + const relative = m.data.len > 0 and m.data[0] != '/' and m.data[0] != '~' and m.wdir.len > 0; + const text = std.fmt.allocPrint(s.arena, "{s}{s}{s}{s}{s}", .{ + if (relative) m.wdir else "", if (relative) "/" else "", m.data, + if (addr.len > 0) ":" else "", addr, + }) catch return p.reportError(id, "plumb", error.OutOfMemory); + look.lookAt(p, id, text); + }, + } +} + +/// A message to a loaded kind's port: its data, a file, opened in that kind +/// (or its pane given the keyboard, when one shows it). +fn openInKind(s: *Send, id: usize, k: u8, m: *const Msg) void { + const p = s.p; + const found = s.resolve(m.wdir, m.data) orelse return p.reportFailure(id, "plumb: no such file"); + if (found.dir) return p.reportFailure(id, "plumb: a directory is no kind's"); + const path = s.arena.dupe(u8, found.path) catch return; + for (p.panes, 0..) |slot, i| if (slot) |pn| if (pn.addon) |a| if (std.mem.eql(u8, a.path, path)) { + p.view().active = i; + return; + }; + const free = p.freeSlot() orelse return p.reportError(id, "plumb", error.NoPaneSlots); + const made = Kind.openFile(p, free, k, path) catch |err| return p.reportError(id, path, err); + if (made.addon.?.refused.len > 0) { + made.vweight = 0; + p.unplaced.set(free); + return p.reportFailure(id, s.arena.dupe(u8, made.addon.?.refused.slice()) catch "plumb: refused"); + } + layout.placeNew(p, id, id, free, .doc); +} + +/// Where rule text written in pieces is whole: through its last blank line +/// (rules.c's morerules), 0 when none is. +pub fn wholeSets(text: []const u8) usize { + return if (std.mem.lastIndexOf(u8, text, "\n\n")) |at| at + 2 else 0; +} + +// ---- tests ---- + +const testing = std.testing; + +/// The rules `text` read as written ones are, printed; or the refusal. +fn reread(arena: std.mem.Allocator, text: []const u8) ![]const u8 { + var ps: Parser = .{ .arena = arena, .p = null, .check = true }; + ps.feed("t", text) catch return ps.why; + ps.finish() catch return ps.why; + var out: std.Io.Writer.Allocating = .init(arena); + try ps.rules.print(&out.writer); + return out.written(); +} + +test "plumb: a message packs as plumb(6)'s six lines and its data, and unpacks whole, short of its data, or malformed" { + var buf: [256]u8 = undefined; + var w = std.Io.Writer.fixed(&buf); + const m: Msg = .{ .src = "pardes", .wdir = "/tmp", .type = "text", .attr = "click=3 addr=12", .data = "a b\nc" }; + try m.pack(&w); + try testing.expectEqualStrings("pardes\n\n/tmp\ntext\nclick=3 addr=12\n5\na b\nc", w.buffered()); + const back = unpack(w.buffered()).msg; + inline for (.{ "src", "dst", "wdir", "type", "attr", "data" }) |f| try testing.expectEqualStrings(@field(m, f), @field(back, f)); + try testing.expectEqual(@as(usize, 2), unpack(w.buffered()[0 .. w.buffered().len - 2]).more); + // A header line short is no message at all, as is data past its count. + try testing.expect(unpack("pardes\n\n/tmp\ntext\n") == .bad); + try testing.expect(unpack("a\nb\nc\nd\ne\n1\nxy") == .bad); + try testing.expect(unpack("a\nb\nc\nd\ne\nzz\n") == .msg); +} + +test "plumb: attributes read rc's quotes, a value that needs them is quoted again, delete takes the first, add appends" { + var arena: std.heap.ArenaAllocator = .init(testing.allocator); + defer arena.deinit(); + const a = arena.allocator(); + var buf: [4096]u8 = undefined; + const attr = "action=showdata filename='/a b/it''s' click=4"; + try testing.expectEqualStrings("/a b/it's", attrValue(attr, "filename", &buf).?); + try testing.expectEqualStrings("4", attrValue(attr, "click", &buf).?); + try testing.expect(attrValue(attr, "addr", &buf) == null); + try testing.expectEqualStrings("action=showdata filename='/a b/it''s'", try repack(a, attr, "click", "")); + try testing.expectEqualStrings("action=showdata filename='/a b/it''s' click=4 addr='x=1'", try repack(a, attr, null, "addr='x=1'")); + // One with no `=` ends them, as plumbunpackattr stops there. + try testing.expect(attrValue("a=1 bogus b=2", "b", &buf) == null); +} + +test "plumb: every parse error in rules.c's words, with its line" { + var arena: std.heap.ArenaAllocator = .init(testing.allocator); + defer arena.deinit(); + const a = arena.allocator(); + for ([_][2][]const u8{ + .{ "type is text\nbogus\n", "t:2: malformed rule" }, + .{ "type is\n", "t:1: malformed rule" }, + .{ "type \n", "t:1: malformed rule" }, + .{ "colour is red\n", "t:1: unknown object colour" }, + .{ "type equals text\n", "t:1: unknown verb equals" }, + .{ "data to edit\n", "t:1: to not valid verb for object data" }, + .{ "type start x\n", "t:1: start not valid verb for object type" }, + .{ "data add x=1\n", "t:1: add not valid verb for object data" }, + .{ "plumb is edit\n", "t:1: is not valid verb for object plumb" }, + .{ "type is text\nplumb to a\nplumb to b\n", "t:3: too many ports" }, + .{ "type is text\nplumb to send\n", "t:2: illegal port name send" }, + .{ "plumb to ..\n", "t:1: illegal port name .." }, + .{ "plumb to rules\n", "t:1: illegal port name rules" }, + .{ "type is text\nplumb start a\nplumb client b\n", "t:3: ruleset has more than one client or start action" }, + .{ "type is text\n\n", "t:2: ruleset must have patterns and actions" }, + .{ "plumb start x\n", "t:1: ruleset must have patterns and actions" }, + .{ "plumb to a\nplumb start x\n\n", "t:3: ruleset must have actions" }, + .{ "include\n", "t:1: malformed include statement" }, + .{ "include a b\n", "t:1: malformed include statement" }, + .{ "includes x\n", "t:1: malformed include statement" }, + .{ "include nowhere\n", "t:1: can't open nowhere for inclusion" }, + .{ "data matches '[a-'\nplumb to edit\n", "t:1: bad regular expression" }, + .{ "data matches '([a-z]+)\\.c'\narg isfile $1\nplumb to edit\n", "t:2: $1: no submatches (the regular expressions have no capture groups): use $0 and several matches" }, + }) |c| try testing.expectEqualStrings(c[1], try reread(a, c[0])); + // Inside quotes a `$1` is the text `$1`. + try testing.expectEqualStrings("data\tis\t'$1'\nplumb\tto\tedit\n\n", try reread(a, "data is '$1'\nplumb to edit\n")); + // The most variables, and ports, are bounded. + var many: std.Io.Writer.Allocating = .init(a); + for (0..max_vars + 1) |i| try many.writer.print("v{d}=x\n", .{i}); + try testing.expectEqualStrings("t:33: too many variables; max 32", try reread(a, many.written())); + many.clearRetainingCapacity(); + for (0..max_ports + 1) |i| try many.writer.print("plumb to p{d}\n", .{i}); + try testing.expectEqualStrings("t:33: too many ports; max 32", try reread(a, many.written())); +} + +test "plumb: rules print as rule sets of tab-separated lines, variables where they were set, and read back the same" { + var arena: std.heap.ArenaAllocator = .init(testing.allocator); + defer arena.deinit(); + const a = arena.allocator(); + const text = + \\# a comment ends nothing it is not in + \\x = '[a-z]+' + \\plumb to seemail + \\plumb to showmail + \\ + \\kind is text + \\data matches $x + \\plumb to edit + \\x=other + \\type is text + \\data set $x + \\plumb start Msg $data + ; + const printed = try reread(a, text); + try testing.expectEqualStrings("x='[a-z]+'\n\nplumb\tto\tseemail\nplumb\tto\tshowmail\n\ntype\tis\ttext\ndata\tmatches\t$x\nplumb\tto\tedit\n\nx=other\n\ntype\tis\ttext\ndata\tset\t$x\nplumb\tstart\tMsg $data\n\n", printed); + try testing.expectEqualStrings(printed, try reread(a, printed)); + // The default rules read, and print as they read. + const defaults = try reread(a, "include basic\n"); + try testing.expect(std.mem.indexOf(u8, defaults, "data\tmatches\t'https?://.*'\nplumb\tto\tweb\n") != null); + try testing.expectEqualStrings(defaults, try reread(a, defaults)); +} + +test "plumb: rc's quoting, variables and the message's in an expansion, the first word alone" { + var arena: std.heap.ArenaAllocator = .init(testing.allocator); + defer arena.deinit(); + var ps: Parser = .{ .arena = arena.allocator(), .p = null, .check = true }; + try ps.feed("t", "v='a b'\nw=x$v'y'\n"); + var m: Msg = .{ .src = "pardes", .wdir = "/w", .data = "f.c" }; + var e: Exec = .{ .m = &m, .match0 = "zero" }; + var buf: [4096]u8 = undefined; + for ([_][2][]const u8{ + .{ "'it''s' rest", "it's" }, + .{ "pre$v.post", "prea b.post" }, + .{ "$w", "xa by" }, + .{ "'$v'", "$v" }, + .{ "$nothere$", "$nothere$" }, + .{ "$src:$wdir:$data:$0:$file", "pardes:/w:f.c:zero:/w/f.c" }, + }) |c| try testing.expectEqualStrings(c[1], (try expand(&ps.rules, &e, c[0], &buf))[0]); + e.file = "/real/f.c"; + try testing.expectEqualStrings("/real/f.c", (try expand(&ps.rules, &e, "$file", &buf))[0]); + // Past 4 KiB: too long, never cut. + const long = try arena.allocator().alloc(u8, 5000); + @memset(long, 'a'); + m.data = long; + try testing.expectError(error.TooLong, expand(&ps.rules, &e, "$data", &buf)); +} + +/// A send against `text`'s rules on a session of its own: the message +/// after its match, the rule set that took it (its index among the sets, +/// null for none) and what dispose said. +const Tried = struct { m: Msg, set: ?usize }; + +fn tryRules(p: *Pardes, text: []const u8, msg: Msg) !Tried { + try testing.expect(apply(p, false, text) == null); + const arena = p.scratch.allocator(); + var s: Send = .{ .p = p, .from = null, .arena = arena, .rules = try rulesOf(p, arena) }; + var m = msg; + var e: Exec = .{ .m = &m }; + var n: usize = 0; + for (s.rules.items.items) |item| { + const set = switch (item) { + .set => |x| x, + else => continue, + }; + e = .{ .m = &m }; + if (try s.matchSet(set, &e)) return .{ .m = m, .set = n }; + n += 1; + } + return .{ .m = m, .set = null }; +} + +test "plumb: matches takes the whole text, or with a click the run around it: Pike's horse.gift is no gif" { + const p = try Pardes.init(testing.allocator, .{ .cols = 80, .rows = 24 }); + defer p.deinit(); + const rules = + \\type is text + \\data matches '[a-zA-Z0-9_\-./]+' + \\data matches '([a-zA-Z0-9_\-./]+)\.(gif|jpe?g)' + \\plumb to image + \\ + ; + try testing.expectEqual(@as(?usize, 0), (try tryRules(p, rules, .{ .type = "text", .data = "horse.gif" })).set); + try testing.expect((try tryRules(p, rules, .{ .type = "text", .data = "horse.gift" })).set == null); + try testing.expect((try tryRules(p, rules, .{ .type = "text", .data = "see horse.gif" })).set == null); + // A click inside the name: the run of file characters around it, the + // data cut to it and the click gone. + const hit = try tryRules(p, rules, .{ .type = "text", .attr = "click=7", .data = "see horse.gif now" }); + try testing.expectEqual(@as(?usize, 0), hit.set); + try testing.expectEqualStrings("horse.gif", hit.m.data); + try testing.expectEqualStrings("", hit.m.attr); + try testing.expectEqualStrings("image", hit.m.dst); + try testing.expect((try tryRules(p, rules, .{ .type = "text", .attr = "click=7", .data = "see horse.gift now" })).set == null); + // The click counts runes: two bytes of é before it. + try testing.expectEqualStrings("horse.gif", (try tryRules(p, rules, .{ .type = "text", .attr = "click=3", .data = "é horse.gif" })).m.data); + // Each object a rule matches whole. + const src = "src\tmatches\t'par.*'\ntype\tmatches\t'te(x|y)t'\nplumb\tto\tedit\n"; + try testing.expectEqual(@as(?usize, 0), (try tryRules(p, src, .{ .src = "pardes", .type = "text" })).set); + try testing.expect((try tryRules(p, src, .{ .src = "pardes", .type = "texts" })).set == null); + // The default rules' URL: http and https, whole. + try testing.expectEqual(@as(?usize, 0), (try tryRules(p, basic, .{ .type = "text", .data = "https://ziglang.org/x?y" })).set); + try testing.expect((try tryRules(p, basic, .{ .type = "text", .data = "see https://ziglang.org" })).set == null); +} + +test "plumb: a set rewrites the message for good, attr delete of one absent fails, a message to a port tries only rule sets to it" { + const p = try Pardes.init(testing.allocator, .{ .cols = 80, .rows = 24 }); + defer p.deinit(); + const rules = + \\data set changed + \\type is never + \\plumb to a + \\ + \\attr delete action + \\attr add 'action=showdiff filename=x' + \\plumb to b + \\ + \\data is changed + \\plumb to c + \\ + ; + // The first set fails after its `set`: the data stays changed; the + // second fails at its delete; the third sees the changed data. + const t = try tryRules(p, rules, .{ .type = "text", .data = "orig" }); + try testing.expectEqual(@as(?usize, 2), t.set); + try testing.expectEqualStrings("changed", t.m.data); + try testing.expectEqualStrings("c", t.m.dst); + const d = try tryRules(p, rules, .{ .type = "text", .attr = "action=showdata", .data = "x" }); + try testing.expectEqual(@as(?usize, 1), d.set); + try testing.expectEqualStrings("action=showdiff filename=x", d.m.attr); + // dst names a port: rule sets to another are passed over. + const to_a = try tryRules(p, "data\tis\tx\nplumb\tto\ta\n\ndata\tis\tx\nplumb\tto\tb\n\n", .{ .dst = "b", .data = "x" }); + try testing.expectEqual(@as(?usize, 1), to_a.set); +} + +test "plumb: isfile and isdir find a name as Look does, past its place, in the message's directory then Incl's; $file is where" { + if (!fs.platform_has_fs) return; + var tmp = testing.tmpDir(.{}); + defer tmp.cleanup(); + try tmp.dir.writeFile(testing.io, .{ .sub_path = "it.zig", .data = "x\n" }); + try tmp.dir.createDir(testing.io, "sub", .default_dir); + var dir_buf: [4096]u8 = undefined; + const root = dir_buf[0..try tmp.dir.realPath(testing.io, &dir_buf)]; + const p = try Pardes.init(testing.allocator, .{ .cols = 80, .rows = 24 }); + defer p.deinit(); + const rules = "arg\tisfile\t$data\ndata\tset\t$file\nplumb\tto\tedit\n\narg\tisdir\t$data\ndata\tset\t$dir\nplumb\tto\tedit\n\n"; + const file = try tryRules(p, rules, .{ .wdir = root, .data = "it.zig:3:2" }); + try testing.expectEqual(@as(?usize, 0), file.set); + try testing.expect(std.mem.endsWith(u8, file.m.data, "/it.zig")); + const dir = try tryRules(p, rules, .{ .wdir = root, .data = "sub" }); + try testing.expectEqual(@as(?usize, 1), dir.set); + try testing.expect(std.mem.endsWith(u8, dir.m.data, "/sub")); + try testing.expect((try tryRules(p, rules, .{ .wdir = root, .data = "nothere.zig" })).set == null); + // Not in wdir: Incl's directories, as acme's includename. + try p.incl.append(p.gpa, try p.gpa.dupe(u8, root)); + try testing.expectEqual(@as(?usize, 0), (try tryRules(p, rules, .{ .wdir = "/", .data = "it.zig" })).set); + try testing.expect((try tryRules(p, rules, .{ .wdir = "/", .data = "./it.zig" })).set == null); +} + +test "plumb: dispose: no rule and no dst, a start, the web port, a port no rule names" { + const p = try Pardes.init(testing.allocator, .{ .cols = 80, .rows = 24 }); + defer p.deinit(); + _ = try p.setTestFile("x\n"); + try testing.expect(apply(p, false, "include basic\n\ntype\tis\tmsg\nplumb\tstart\tMsg $data\n\ntype\tis\tnone\nplumb\tto\tnobody\n\ntype\tis\tclient\nplumb\tclient\tMsg x\n\n") == null); + try testing.expectEqualStrings(e_no_port, send(p, null, .{ .type = "text", .data = "no such thing" }).?); + // A start of a builtin runs it in place. + try testing.expect(send(p, null, .{ .type = "msg", .data = "hello" }) == null); + const pane = p.panes[p.view().active].?; + try testing.expectEqualStrings("hello", pane.msg[0..pane.msg_len]); + try testing.expectEqualStrings(e_client, send(p, null, .{ .type = "client" }).?); + try testing.expectEqualStrings(e_no_start, send(p, null, .{ .type = "none" }).?); + try testing.expectEqualStrings(e_no_start, send(p, null, .{ .dst = "nobody", .type = "x" }).?); + // A port no rule names goes nowhere, said nothing (fsys.c's dispose). + try testing.expect(send(p, null, .{ .dst = "elsewhere", .data = "x" }) == null); + // A URL to the web port: the host's opener. + while (p.nextEffect()) |_| {} + try testing.expect(send(p, null, .{ .type = "text", .data = "https://ziglang.org" }) == null); + var opened = false; + while (p.nextEffect()) |e| switch (e) { + .open_link => |u| { + try testing.expectEqualStrings("https://ziglang.org", u.slice()); + opened = true; + }, + else => {}, + }; + try testing.expect(opened); +} + +test "plumb: rules written replace or add, a refusal keeps them as they were, and a dump keeps them" { + const p = try Pardes.init(testing.allocator, .{ .cols = 80, .rows = 24 }); + defer p.deinit(); + // Every session starts with the defaults. + try testing.expect(std.mem.indexOf(u8, inForce(p), "plumb\tto\tweb") != null); + try testing.expect(!p.plumber.written); + try testing.expect(apply(p, false, "type is a\nplumb to edit\n") == null); + try testing.expect(apply(p, true, "type is b\nplumb to edit\n") == null); + try testing.expectEqualStrings("type\tis\ta\nplumb\tto\tedit\n\ntype\tis\tb\nplumb\tto\tedit\n\n", p.plumber.text.items); + try testing.expectEqualStrings("plumb/rules:1: unknown verb isnt", apply(p, true, "type isnt c\n").?); + try testing.expectEqualStrings("type\tis\ta\nplumb\tto\tedit\n\ntype\tis\tb\nplumb\tto\tedit\n\n", p.plumber.text.items); + try pardes.dump.dumpState(p); + const restored = try pardes.dump.restore(p, p.dump_out.?, "/tmp/pardes.dump.zon"); + defer restored.deinit(); + try testing.expectEqualStrings(p.plumber.text.items, restored.plumber.text.items); + try testing.expect(restored.plumber.written); +} + +test "plumb: plan9port's basic parses, its ¡- classes UTF-8's bytes and its submatch rule sets left out, and its rules match" { + var arena: std.heap.ArenaAllocator = .init(testing.allocator); + defer arena.deinit(); + // plan9port's plumb/basic and fileaddr; `¡-` is `\x80-\xf4`, the bytes + // of UTF-8's multi-byte runes (a run of them is whole runes: UTF-8 is + // self-synchronising), and the rule sets that need `$1`-`$5` are gone. + const p9p = + \\addrelem='((#?[0-9]+)|(/[A-Za-z0-9_\^]+/?)|[.$])' + \\addr=:($addrelem([,;+\-]$addrelem)*) + \\ + \\plumb to seemail + \\plumb to showmail + \\ + \\type is text + \\data matches '(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)://[a-zA-Z0-9_@\-]+([.:][a-zA-Z0-9_@\-]+)*/?[a-zA-Z0-9_?,%#~&/\-+=]+([:.][a-zA-Z0-9_?,%#~&/\-+=]+)*' + \\plumb to web + \\plumb start web $0 + \\ + \\type is text + \\data matches '[a-zA-Z\x80-\xf40-9_\-./]+' + \\data matches '([a-zA-Z\x80-\xf40-9_\-./]+)\.(doc|rtf)' + \\arg isfile $0 + \\plumb to msword + \\plumb start wdoc2txt $file + \\ + \\type is text + \\dst is msword + \\plumb to msword + \\plumb start wdoc2txt $file + \\ + \\type is text + \\data matches '[a-zA-Z\x80-\xf40-9_\-./@]+' + \\data matches '([a-zA-Z\x80-\xf40-9_\-./@]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|bit|png|PNG)' + \\arg isfile $0 + \\plumb to image + \\plumb start 9 page $file + \\ + \\type is text + \\data matches '[a-zA-Z\x80-\xf40-9_\-./@]+' + \\data matches '([a-zA-Z\x80-\xf40-9_\-./@]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI)' + \\arg isfile $0 + \\plumb to postscript + \\plumb start 9 page $file + \\ + \\data matches '[a-zA-Z\x80-\xf40-9_\-./@]+' + \\data matches '([a-zA-Z\x80-\xf40-9_\-./@]+)\.([Ss][XxTt][CcDdIiGgMmWw]|[Dd][Oo][Cc]|[Xx][Ll][Ss]|[Pp][Pp][Tt])' + \\arg isfile $0 + \\plumb to openoffice + \\plumb start openoffice $file + \\ + \\type is text + \\data matches '[a-zA-Z\x80-\xf40-9_\-./]+' + \\data matches '/mail/fs/[a-zA-Z\x80-\xf40-9/]+/[0-9]+' + \\plumb to showmail + \\plumb start window -r 4 120 750 600 upas/nedmail -s $0 + \\ + \\type is text + \\data matches '[a-zA-Z0-9_+.\-]+@[a-zA-Z0-9_+.\-]*' + \\plumb to sendmail + \\plumb start wmail $0 + \\ + \\dst is image + \\arg isfile $data + \\plumb to image + \\plumb start 9 page $data + \\ + \\dst is postscript + \\arg isfile $data + \\plumb start 9 page $data + \\ + ; + const printed = try reread(arena.allocator(), p9p); + try testing.expect(std.mem.startsWith(u8, printed, "addrelem='((#?[0-9]+)|(/[A-Za-z0-9_\\^]+/?)|[.$])'\n\naddr=:($addrelem([,;+\\-]$addrelem)*)\n\nplumb\tto\tseemail\n")); + try testing.expectEqualStrings(printed, try reread(arena.allocator(), printed)); + const p = try Pardes.init(testing.allocator, .{ .cols = 80, .rows = 24 }); + defer p.deinit(); + // Clicked in a line: the URL's run, the mail address's, and the + // faces' path, whole runes of a name that is not ASCII. + const url = try tryRules(p, p9p, .{ .type = "text", .attr = "click=10", .data = "see https://9fans.github.io/plan9port/ now" }); + try testing.expectEqual(@as(?usize, 0), url.set); + try testing.expectEqualStrings("https://9fans.github.io/plan9port/", url.m.data); + try testing.expectEqualStrings("web", url.m.dst); + const mail = try tryRules(p, p9p, .{ .type = "text", .attr = "click=12", .data = "write to [email protected]." }); + try testing.expectEqualStrings("sendmail", mail.m.dst); + try testing.expectEqualStrings("[email protected].", mail.m.data); + const face = try tryRules(p, p9p, .{ .type = "text", .attr = "click=3", .data = "x /mail/fs/café/12 y" }); + try testing.expectEqualStrings("showmail", face.m.dst); + try testing.expectEqualStrings("/mail/fs/café/12", face.m.data); + // An image named in UTF-8, and Pike's horse.gift, by the image set's + // two patterns alone. + const pics = "data matches '[a-zA-Z\\x80-\\xf40-9_\\-./@]+'\ndata matches '([a-zA-Z\\x80-\\xf40-9_\\-./@]+)\\.(jpe?g|gif|png)'\nplumb to image\n"; + try testing.expectEqualStrings("Ångström.png", (try tryRules(p, pics, .{ .attr = "click=2", .data = "Ångström.png" })).m.data); + try testing.expect((try tryRules(p, pics, .{ .attr = "click=2", .data = "horse.gift" })).set == null); + // The rune range as written is refused, in regexp.zig's words. + try testing.expectEqualStrings("t:1: bad regular expression: a range of runes wider than 256 in [...] is not supported", try reread(arena.allocator(), "data matches '[a-zA-Z¡-0-9_\\-./]+'\nplumb to edit\n")); +} diff --git a/src/config.zig b/src/config.zig index 3a846206..8a1528a8 100644 --- a/src/config.zig +++ b/src/config.zig @@ -1818,6 +1818,7 @@ test "reference.typ's #fstree is the tree the session serves, file for file" { for (std.enums.values(tree.TopFile)) |f| switch (f) { .root => {}, .new => try served.put(gpa, "pane/new", {}), + .rules, .send => try served.put(gpa, try std.fmt.allocPrint(gpa, "plumb/{s}", .{f.fileName()}), {}), else => try served.put(gpa, if (f.dir()) try std.fmt.allocPrint(gpa, "{s}/", .{f.fileName()}) else f.fileName(), {}), }; try served.put(gpa, "os/", {}); diff --git a/src/exec.zig b/src/exec.zig index be8dc46b..ece4f98d 100644 --- a/src/exec.zig +++ b/src/exec.zig @@ -712,7 +712,7 @@ pub fn executeFrom(p: *Pardes, id: usize, txt: []const u8, from_body: bool) ?usi /// is done, else a new one, placed as layout.placeNew places a command pane. /// A pane reused keeps what it showed: the new command runs below a line /// naming it, as acme appends to +Errors and never clears it (util.c:213). -fn runCommand(p: *Pardes, from: usize, line: []const u8) ?usize { +pub fn runCommand(p: *Pardes, from: usize, line: []const u8) ?usize { if (line.len > command_max) { p.reportFailure(from, "exec: a command line is at most 1024 bytes"); return null; @@ -735,7 +735,7 @@ fn runCommand(p: *Pardes, from: usize, line: []const u8) ?usize { // Nor one leased: an open that was answered its serial and is still // open reads that pane's output, which another client's command must // not replace; a new pane runs it instead. - const reuse: ?usize = if (!p.exec_header and p.exec_column == null and src != null and src.?.command != null and src.?.command_done and !src.?.command_pty and !leased(p, src.?.serial)) from else for (p.panes, 0..) |slot, i| { + const reuse: ?usize = if (!p.exec_header and p.exec_column == null and p.exec_dir == null and src != null and src.?.command != null and src.?.command_done and !src.?.command_pty and !leased(p, src.?.serial)) from else for (p.panes, 0..) |slot, i| { const other = slot orelse continue; if (p.exec_column) |c| if (if (layout.findPane(p, i)) |f| f.col != c else true) continue; if (other.command != null and other.command_done and !other.command_pty and std.mem.eql(u8, other.cwdSlice(), dir) and !leased(p, other.serial)) break i; diff --git a/src/fs-help.txt b/src/fs-help.txt index e6a48491..4e43a476 100644 --- a/src/fs-help.txt +++ b/src/fs-help.txt @@ -19,12 +19,12 @@ recent files opened lately, closed ones too: open|closed <path> dumps the dumps the state file keeps, the newest first: <label> <date> <size> <panes> layout a line per column: serial index x width current|notcurrent empty|full pane-serials; then active <serial> tag the workspace tag, tagexec a word as a click in it; col/<serial>/ a column's tag, ctl, exec; rmdir: empty only +plumb/ rules: the plumber's rules, plumb(6)'s (a write adds rule sets, > replaces); send: write a message, six lines then data pane/new open it to make a pane (<session dir>/+New) in the active column; the read answers its serial pane/<n>/ name body tag ctl addr dot limit data xdata sel dirty mark scroll errors event look exec tagexec rows; rmdir closes rows: a line a row, kind (m c p; d decl, u unmarked) line col end_line end_col source_column location_end code_start styles path; styles - or N:start+len=role,... (keyword string number comment, add del emph line, joined by .); a write at 0 replaces on terminals pty/data (keys in, output out), pty/status, pty/ctl (winsize, sig, exec), pty/run (a line, its exit and output) os/, src/ the host filesystem; the editor's own sources - $m below: $PARDES_MOUNT (set under 9ns --mntgen); without it, 9p -a "unix!$PARDES_9P". cat $m/index which panes exist n=$(cat $m/pane/new) make a pane of your own (each open makes one), take its serial diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig index e0cb69b5..8902f11e 100644 --- a/src/ninep/tree.zig +++ b/src/ninep/tree.zig @@ -25,6 +25,7 @@ pub const sources = @import("sources.zig"); pub const screen = @import("screen.zig"); const daemon = @import("../daemon.zig"); const panes = @import("../panes.zig"); +const Plumb = @import("../Plumb.zig"); const Pardes = pardes.Pardes; const Pane = pardes.Pane; @@ -99,7 +100,7 @@ fn truncates(req: Req) bool { return switch (Node.target(req.node) orelse return false) { .pane => true, .col => |c| c.file == .tag, - .top => |f| f == .tag, + .top => |f| f == .tag or f == .rules, }; } @@ -151,6 +152,10 @@ pub const Open = struct { /// text after that line held in `pending` until its read puts it /// in (ctl.fillPager), or its close hands it to the editor's step. pager: u32, + /// An open writing plumb/rules or plumb/send: `pending` holds what + /// is not whole yet (rule sets with no blank line after them, a + /// message short of its data). + plumb, } = .{ .snapshot = null }, /// What a write to a file of command lines left unfinished: a last line /// with no newline yet, or an Edit block still open. A write through a @@ -207,7 +212,7 @@ pub const Open = struct { gpa.free(run.line); }, .frozen => |bytes| gpa.free(bytes), - .event, .pty_data, .ctl, .lines, .writes, .pager => {}, + .event, .pty_data, .ctl, .lines, .writes, .pager, .plumb => {}, } o.pending.deinit(gpa); if (o.replay) |r| gpa.free(r.bytes); @@ -269,6 +274,13 @@ pub const TopFile = enum(u5) { /// the addons refused, a line each: `<kind> <version> <abi> /// static|loaded|refused: why [path]`. addons, + /// The plumber's (Plumb.zig, Plan 9's plumber(4)): `rules` and `send`. + plumb, + /// plumb/rules: the rules in force, plumb(6)'s; a write adds rule + /// sets, a `>` replaces them. + rules, + /// plumb/send: a write is a message, plumb(6)'s six lines and data. + send, pub fn fileName(f: TopFile) []const u8 { return if (f == .root) "/" else @tagName(f); @@ -276,15 +288,15 @@ pub const TopFile = enum(u5) { pub fn mode(f: TopFile) u16 { return switch (f) { - .root, .pane, .col => 0o755, - .look, .exec, .log, .focus, .ctl, .tag, .tagexec, .pager => 0o666, + .root, .pane, .col, .plumb => 0o755, + .look, .exec, .log, .focus, .ctl, .tag, .tagexec, .pager, .rules => 0o666, .README, .index, .status, .screen, .listeners, .new, .commands, .layout, .recent, .dumps, .sessions, .addons => 0o444, - .kbdin, .mousein => 0o222, + .kbdin, .mousein, .send => 0o222, }; } pub fn dir(f: TopFile) bool { - return f == .root or f == .pane or f == .col; + return f == .root or f == .pane or f == .col or f == .plumb; } }; @@ -661,7 +673,7 @@ fn topSize(p: *Pardes, f: TopFile) u64 { // frame, /pane/new until an open has a pane to name, and the index, // layout, recent list and listeners, which a stat would otherwise // have to build to count. - .root, .pane, .col, .screen, .new, .layout, .index, .recent, .dumps, .addons, .listeners, .sessions, .kbdin, .mousein => 0, + .root, .pane, .col, .screen, .new, .layout, .index, .recent, .dumps, .addons, .listeners, .sessions, .kbdin, .mousein, .plumb, .rules, .send => 0, .tag => cols.headerText(p, null).?.len, .README => fs.help.len, .status => if (ctl.statusText(p)) |text| text.len else |_| 0, @@ -700,8 +712,9 @@ fn lookup(p: *Pardes, req: Req, target: Target) Reply { .top => |f| switch (f) { .root => root: { if (std.mem.eql(u8, name, "os")) return fs.osHandle(p, .{ .tag = req.tag, .op = .getattr, .node = fs.os_root }); - // `new` is reached in /pane, where the panes it makes are. - if (std.meta.stringToEnum(TopFile, name)) |t| if (t != .root and t != .new) break :root @backingInt(t); + // `new` is reached in /pane, where the panes it makes are, + // `rules` and `send` in /plumb. + if (std.meta.stringToEnum(TopFile, name)) |t| if (t != .root and t != .new and t != .rules and t != .send) break :root @backingInt(t); if (sources.node(name)) |n| return sources.handle(p, .{ .tag = req.tag, .op = .getattr, .node = n }); return Reply.fail(req.tag, E.NOENT); }, @@ -715,6 +728,7 @@ fn lookup(p: *Pardes, req: Req, target: Target) Reply { if (serial == 0) return Reply.fail(req.tag, E.NOENT); break :dir if (f == .pane) Node.of(serial, .dir) else Node.ofCol(serial, .dir); }, + .plumb => if (std.mem.eql(u8, name, "rules")) @backingInt(TopFile.rules) else if (std.mem.eql(u8, name, "send")) @backingInt(TopFile.send) else return Reply.fail(req.tag, E.NOENT), else => return Reply.fail(req.tag, E.NOTDIR), }, .col => |c| col: { @@ -755,7 +769,7 @@ fn stageDir(p: *Pardes, out: *std.ArrayList(u8), target: Target, off: u64) error .root => { // The guide, then what describes the session, then the // files that act, then the directories. - inline for (.{ TopFile.README, TopFile.index, TopFile.status, TopFile.focus, TopFile.ctl, TopFile.commands, TopFile.recent, TopFile.dumps, TopFile.addons, TopFile.look, TopFile.exec, TopFile.pager, TopFile.log, TopFile.screen, TopFile.listeners, TopFile.sessions, TopFile.layout, TopFile.tag, TopFile.tagexec, TopFile.kbdin, TopFile.mousein, TopFile.pane, TopFile.col }) |t| { + inline for (.{ TopFile.README, TopFile.index, TopFile.status, TopFile.focus, TopFile.ctl, TopFile.commands, TopFile.recent, TopFile.dumps, TopFile.addons, TopFile.look, TopFile.exec, TopFile.pager, TopFile.log, TopFile.screen, TopFile.listeners, TopFile.sessions, TopFile.layout, TopFile.tag, TopFile.tagexec, TopFile.kbdin, TopFile.mousein, TopFile.plumb, TopFile.pane, TopFile.col }) |t| { if (skip > 0) skip -= 1 else try stageDirent(out, p.gpa, @backingInt(t), t.dir(), t.fileName()); } if (skip > 0) skip -= 1 else try stageDirent(out, p.gpa, fs.os_root, true, "os"); @@ -776,6 +790,9 @@ fn stageDir(p: *Pardes, out: *std.ArrayList(u8), target: Target, off: u64) error try stageDirent(out, p.gpa, Node.of(serial, .dir), true, name); } }, + .plumb => inline for (.{ TopFile.rules, TopFile.send }) |t| { + if (skip > 0) skip -= 1 else try stageDirent(out, p.gpa, @backingInt(t), false, t.fileName()); + }, .col => for (0..p.view().ncol) |c| { if (skip > 0) { skip -= 1; @@ -845,6 +862,11 @@ fn open(p: *Pardes, req: Req, target: Target) Reply { .index, .layout, .recent, .dumps, .addons, .commands, .status, .listeners, .sessions => .{ .frozen = &.{} }, // The root's ctl opened only to read: its settings, frozen. .ctl => if (linesOpen(target, req)) .lines else .{ .frozen = &.{} }, + // One writer of the rules at a time, as plumber(4)'s. + .rules, .send => if (req.omode & 3 == 0) return .{ .tag = req.tag } else plumb: { + if (f == .rules) for (p.fs.opens) |o| if (o.node == req.node and o.what == .plumb) return failText(req.tag, E.BUSY, e_in_use); + break :plumb .plumb; + }, else => if (linesOpen(target, req)) .lines else return .{ .tag = req.tag }, }, .col => |c| if (layout.columnBySerial(p, c.serial) == null) @@ -907,7 +929,7 @@ fn open(p: *Pardes, req: Req, target: Target) Reply { pn.fs.event_reader = pn.fs.event_reader or reader; }, .pty_data => pane_of.?.fs.pty_reader = true, - .run, .ctl, .lines, .writes, .pager => {}, + .run, .ctl, .lines, .writes, .pager, .plumb => {}, } return .{ .tag = req.tag, .handle = @intCast(i + 1) }; } @@ -970,6 +992,9 @@ fn releaseHandle(p: *Pardes, req: Req) void { if (t == .col and t.col.file == .tag) cols.released(p, t.col.serial); if (t == .top and t.top == .tag) cols.released(p, null); const o = openOf(p, req) orelse return; + // A message short of its data is dropped with its open, as plumber(4) + // drops a fid's writebuf; rule text left goes in at the editor's step. + if (o.what == .plumb and req.node == @backingInt(TopFile.send)) o.pending.clearRetainingCapacity(); // A /pager open's text, not read for, goes in at the editor's next // step (ctl.fillClosedPagers): this close need not wait for quiet. if (o.what == .pager and o.pending.items.len > 0) { @@ -1002,7 +1027,7 @@ fn releaseHandle(p: *Pardes, req: Req) void { .ctl => if (pn.fs.lock == req.handle) { pn.fs.lock = null; }, - .snapshot, .log, .lines, .writes, .frozen, .pager => {}, + .snapshot, .log, .lines, .writes, .frozen, .pager, .plumb => {}, }; o.deinit(p.gpa); } @@ -1020,7 +1045,7 @@ fn setattr(p: *Pardes, req: Req, target: Target) Reply { if (pane.truncate(p, p.panes[id].?, t.file) != .ok) return Reply.fail(req.tag, E.NOMEM); }, .col => |c| if (c.file == .tag and cols.truncate(p, c.serial) != .ok) return Reply.fail(req.tag, E.NOENT), - .top => |f| if (f == .tag and cols.truncate(p, null) != .ok) return Reply.fail(req.tag, E.NOMEM), + .top => |f| if (f == .tag and cols.truncate(p, null) != .ok) return Reply.fail(req.tag, E.NOMEM) else if (f == .rules) Plumb.clear(p), }; return .{ .tag = req.tag, .attr = attrOf(p, target) orelse return Reply.fail(req.tag, E.NOENT) }; } @@ -1058,8 +1083,9 @@ fn read(p: *Pardes, req: Req, target: Target) Reply { fn readFile(p: *Pardes, req: Req, target: Target) Reply { switch (target) { .top => |f| return switch (f) { - .kbdin, .mousein => Reply.fail(req.tag, E.PERM), + .kbdin, .mousein, .send => Reply.fail(req.tag, E.PERM), .README => window(p, req, fs.help), + .rules => window(p, req, Plumb.inForce(p)), .index => index: { const out = p.fs.stage(p.gpa); var last: u32 = 0; @@ -1131,7 +1157,7 @@ fn readFile(p: *Pardes, req: Req, target: Target) Reply { break :serial Reply.fail(req.tag, E.NOMEM); break :serial stagedReply(p, req); }, - .root, .pane, .col => Reply.fail(req.tag, E.PERM), + .root, .pane, .col, .plumb => Reply.fail(req.tag, E.PERM), }, .pane => |t| { // A run's answer outlives the pane it ran in. @@ -1356,6 +1382,8 @@ fn writeNow(p: *Pardes, req: Req, target: Target) Reply { .pager => ctl.writePager(p, req), .tag => cols.write(p, req, null), .tagexec => cols.writeExec(p, req, null), + .rules => writeRules(p, req), + .send => writeSend(p, req), else => Reply.fail(req.tag, E.PERM), }, .pane => |t| { @@ -1373,6 +1401,60 @@ fn writeNow(p: *Pardes, req: Req, target: Target) Reply { } } +/// plumb/rules: rule text added to the rules in force a rule set at a time, +/// as each is whole (a blank line after it, rules.c's morerules), the rest +/// at the open's close; a refusal is the write's, in plumb(6)'s words, the +/// rules as they were and the text it held dropped. +fn writeRules(p: *Pardes, req: Req) Reply { + const done: Reply = .{ .tag = req.tag, .written = @intCast(req.data.len) }; + // A close's rest (runClosedLines), or a write with no open: whole. + const o = openOf(p, req) orelse return if (Plumb.apply(p, true, req.data)) |why| failText(req.tag, E.INVAL, why) else done; + if (o.pending.items.len + req.data.len > Plumb.max_text) { + o.pending.clearRetainingCapacity(); + return failText(req.tag, E.INVAL, std.fmt.comptimePrint("rules too long; max {d} KiB", .{Plumb.max_text / 1024})); + } + o.pending.appendSlice(p.gpa, req.data) catch return Reply.fail(req.tag, E.NOMEM); + const end = Plumb.wholeSets(o.pending.items); + if (end == 0) return done; + const why = Plumb.apply(p, true, o.pending.items[0..end]); + if (why != null) o.pending.clearRetainingCapacity() else { + const rest = o.pending.items.len - end; + std.mem.copyForwards(u8, o.pending.items[0..rest], o.pending.items[end..]); + o.pending.shrinkRetainingCapacity(rest); + } + return if (why) |w| failText(req.tag, E.INVAL, w) else done; +} + +/// plumb/send: a message, its writes put together until its data is all +/// there (plumber(4)), then matched and sent: the write is answered when it +/// has gone where the rules say, or with why not, in Plan 9's words. +fn writeSend(p: *Pardes, req: Req) Reply { + const o = openOf(p, req); + const held = if (o) |op| op.pending.items.len > 0 else false; + if (held) o.?.pending.appendSlice(p.gpa, req.data) catch return Reply.fail(req.tag, E.NOMEM); + defer if (o) |op| if (op.pending.items.len > pending_cap) op.pending.clearRetainingCapacity(); + switch (Plumb.unpack(if (held) o.?.pending.items else req.data)) { + .bad => { + if (o) |op| op.pending.clearRetainingCapacity(); + return failText(req.tag, E.INVAL, Plumb.e_bad_msg); + }, + .more => |n| { + const op = o orelse return failText(req.tag, E.INVAL, Plumb.e_bad_msg); + if (op.pending.items.len + n > pending_cap) { + op.pending.clearRetainingCapacity(); + return failText(req.tag, E.INVAL, Plumb.e_bad_msg ++ ": over 1 MiB"); + } + if (!held) op.pending.appendSlice(p.gpa, req.data) catch return Reply.fail(req.tag, E.NOMEM); + return .{ .tag = req.tag, .written = @intCast(req.data.len) }; + }, + .msg => |m| { + defer if (o) |op| op.pending.clearRetainingCapacity(); + if (Plumb.send(p, null, m)) |why| return failText(req.tag, E.IO, why); + return .{ .tag = req.tag, .written = @intCast(req.data.len) }; + }, + } +} + // ---- tests ---- const testing = std.testing; @@ -1572,13 +1654,23 @@ test "readdir lists the root and a pane directory without creating anything" { @memcpy(top_bytes[0..top_reply.bytes.len], top_reply.bytes); const top = th.dirents(top_bytes[0..top_reply.bytes.len], &buf); try testing.expect(top.len >= 10); - for ([_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "recent", "dumps", "addons", "look", "exec", "pager", "log", "screen", "listeners", "sessions", "layout", "tag", "tagexec", "kbdin", "mousein", "pane", "col", "os" }, 0..) |name, i| { + for ([_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "recent", "dumps", "addons", "look", "exec", "pager", "log", "screen", "listeners", "sessions", "layout", "tag", "tagexec", "kbdin", "mousein", "plumb", "pane", "col", "os" }, 0..) |name, i| { try testing.expectEqualStrings(name, top[i].name); try testing.expectEqual(i >= 21, top[i].dir); } - try testing.expectEqual(@backingInt(TopFile.pane), top[21].node); - try testing.expectEqual(@backingInt(TopFile.col), top[22].node); - try testing.expectEqual(fs.os_root, top[23].node); + try testing.expectEqual(@backingInt(TopFile.plumb), top[21].node); + try testing.expectEqual(@backingInt(TopFile.pane), top[22].node); + try testing.expectEqual(@backingInt(TopFile.col), top[23].node); + try testing.expectEqual(fs.os_root, top[24].node); + // The plumber's directory: its rules, then send. + const plumb_reply = rdir(p, @backingInt(TopFile.plumb), 0); + var plumb_bytes: [256]u8 = undefined; + @memcpy(plumb_bytes[0..plumb_reply.bytes.len], plumb_reply.bytes); + var plumb_buf: [4]th.Dirent = undefined; + const plumb = th.dirents(plumb_bytes[0..plumb_reply.bytes.len], &plumb_buf); + try testing.expectEqual(@as(usize, 2), plumb.len); + try testing.expectEqualStrings("rules", plumb[0].name); + try testing.expectEqualStrings("send", plumb[1].name); var idbuf: [16]u8 = undefined; try testing.expect(th.nameAt(top, try std.fmt.bufPrint(&idbuf, "{d}", .{serial})) == null); try testing.expect(th.nameAt(top, "self") == null); diff --git a/src/pardes.zig b/src/pardes.zig index 9f5c36ff..511f7d35 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -385,6 +385,7 @@ test { _ = @import("Addon.zig"); _ = @import("rollback.zig"); _ = @import("Core.zig"); + _ = @import("Plumb.zig"); _ = @import("lsp/Ask.zig"); _ = @import("lsp/lsp_client.zig"); _ = @import("Jump.zig"); diff --git a/src/plumbing b/src/plumbing new file mode 100644 index 00000000..74c1f306 --- /dev/null +++ b/src/plumbing @@ -0,0 +1,23 @@ +# pardes's plumbing rules, in plumb(6)'s language: a plumbing file of +# your own names this one as `include basic`. A message (plumb/send) is +# matched against the rule sets in order; the first whose patterns all +# hold takes it, and its actions say where it goes: a port pardes reads +# itself (edit: a file or directory opened as Look opens one; web: the +# host's browser; a loaded kind by its name, `image`, `pdf`), another +# port a program reads, or a word or command started. + +# urls go to the web browser (the host's: xdg-open, open on macOS) +type is text +data matches 'https?://.*' +plumb to web + +# existing directories, and existing files at the place written after +# them, go to the editor; a file a kind shows (a picture, a PDF) to +# that kind +type is text +arg isdir $data +plumb to edit + +type is text +arg isfile $data +plumb to edit diff --git a/src/regexp.zig b/src/regexp.zig index 7bcbceff..87fc51d6 100644 --- a/src/regexp.zig +++ b/src/regexp.zig @@ -595,6 +595,14 @@ test "a \\x without two hex digits is refused, not handed to mvzr to panic on" { try std.testing.expectEqual(@as(usize, 1), (try rx.find("xA", 0, 1, 2)).?.start); } +test "a class's range may end at \\xff: UTF-8's high bytes as one class" { + var rx = try Regex.compile("[a-z\\x80-\\xff]+"); + const text = "-- café --"; + const m = (try rx.find(text, 0, text.len, text.len)).?; + try std.testing.expectEqualStrings("café", text[m.start..m.end]); + _ = try Regex.compile("[\\xff-\\xff]"); +} + test "a repeat inside a group gives back to what follows the group" { const Case = struct { pat: []const u8, text: []const u8, start: usize, end: usize }; for ([_]Case{ |
