diff options
| author | Julian Hurst <ark@mansus.space> | 2025-10-27 16:09:18 +0100 |
|---|---|---|
| committer | Julian Hurst <ark@mansus.space> | 2025-10-27 16:09:18 +0100 |
| commit | 13f506b3c41ed0670ddeeee7a6c6e855495a9bc9 (patch) | |
| tree | f84386a1ace3938eb68fae575e1d5910c93d3053 | |
| parent | 9ab640686859b3cae14cc1db2e19a1ef047865a1 (diff) | |
| download | hare-libtui-master.tar.gz | |
| -rw-r--r-- | libtui/libtui.ha | 4 | ||||
| -rw-r--r-- | libtui/widget/ed/ed.ha | 6 | ||||
| -rw-r--r-- | libtui/widget/list/list.ha | 8 | ||||
| -rw-r--r-- | libtui/widget/widget.ha | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libtui/libtui.ha b/libtui/libtui.ha index 381a0ac..14f8531 100644 --- a/libtui/libtui.ha +++ b/libtui/libtui.ha @@ -134,13 +134,13 @@ fn loop(ui: *ttyui) void = { // Add a listener to the given ttyui. export fn addlistener(ui: *ttyui, l: listener) void = { - append(ui.listeners, l); + append(ui.listeners, l)!; }; // Print a string or rune to the ttyui. export fn print(ui: *ttyui, arg: str) void = { if (ui.doclear) { - let out = strings::concat(CLEARESC, arg); + let out = strings::concat(CLEARESC, arg)!; defer free(out); fmt::fprint(ui.f, out)!; ui.doclear = false; diff --git a/libtui/widget/ed/ed.ha b/libtui/widget/ed/ed.ha index fe03db1..d9c63a4 100644 --- a/libtui/widget/ed/ed.ha +++ b/libtui/widget/ed/ed.ha @@ -121,7 +121,7 @@ export fn print(editor: *widget::widget) (void | widget::error) = { for (let i = editor.frame.start; i < end: u16; i += 1) { let lineno = strconv::ztos(i+1); lineno = strings::padstart(lineno, ' ', maxlinenosz); - const line = strings::concat(lineno, "| ", editor.lines[i]); + const line = strings::concat(lineno, "| ", editor.lines[i])!; const truncitem = wcwidth::truncate(line, editor.sz.cols); defer free(truncitem); if (editor.cursor.0 == i) { @@ -255,7 +255,7 @@ export fn insertrune(l: *editorwidget, r: rune) (void | io::error) = { memio::concat(&st, strings::sub(line, 0, l.cursor.1))?; memio::appendrune(&st, r)?; memio::concat(&st, strings::sub(line, l.cursor.1, strings::end))?; - l.lines[l.cursor.0] = strings::dup(memio::string(&st)); + l.lines[l.cursor.0] = strings::dup(memio::string(&st))!; right(l); set::add(&linestofree, l.cursor.0); io::close(&st)?; @@ -272,7 +272,7 @@ fn specialkey(l: *editorwidget, keycode: libtui::keycode) (void | io::error) = { if (len(line) > l.cursor.1) { memio::concat(&st, strings::sub(line, l.cursor.1, strings::end))?; }; - l.lines[l.cursor.0] = strings::dup(memio::string(&st)); + l.lines[l.cursor.0] = strings::dup(memio::string(&st))!; left(l); set::add(&linestofree, l.cursor.0); io::close(&st)?; diff --git a/libtui/widget/list/list.ha b/libtui/widget/list/list.ha index cad23bd..13f406a 100644 --- a/libtui/widget/list/list.ha +++ b/libtui/widget/list/list.ha @@ -68,7 +68,7 @@ export fn newlistsz(ui: libtui::ttyui, sz: tty::ttysize, items: str...) listwidg ui = ui, ... }, - items = strings::dupall(items), + items = strings::dupall(items)!, marked = sset::new(), cursor = 0z, //listeners = [], @@ -103,7 +103,7 @@ export fn finish(list: *widget::widget) void = { // frame. export fn setitems(list: *listwidget, items: str...) void = { const doreset = len(items) < len(list.items); - list.items = strings::dupall(items); + list.items = strings::dupall(items)!; if (doreset) { reset(list); }; @@ -361,7 +361,7 @@ export fn fnmatchmark(l: *listwidget, s: str) void = { // Marks items according to a regular expression (POSIX ERE). export fn regexmark(l: *listwidget, re: *regex::regex) void = { for (let i = 0z; i < len(l.items); i += 1) { - if (regex::test(re, l.items[i])) { + if (regex::test(re, l.items[i])!) { set::add(&l.marked, i); }; }; @@ -375,7 +375,7 @@ export fn selected(l: listwidget) (str | []str) = { let result: []str = []; let its = set::items(&l.marked); for (let i = 0z; i < len(its); i += 1) { - append(result, l.items[its[i]]); + append(result, l.items[its[i]])!; }; return result; } else { diff --git a/libtui/widget/widget.ha b/libtui/widget/widget.ha index 915914a..0ad254e 100644 --- a/libtui/widget/widget.ha +++ b/libtui/widget/widget.ha @@ -63,7 +63,7 @@ export type widget = struct { // Add a listener to the given widget. export fn addlistener(w: *widget, listener: listener) void = { - append(w.listeners, listener); + append(w.listeners, listener)!; }; // Delete a listener from the given widget. |
