From 0ea082b74414696a7800455a437656fca2886f6d Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sat, 26 Jul 2025 16:30:17 +0300 Subject: properly document some functions in expressions.c and simplified code * Practically all calls to teco_expressions_args() must be preceded by teco_expressions_eval(). * In code paths where we know that teco_expressions_args() > 0, it is safe to call teco_expressions_pop_num(0) instead of teco_expressions_pop_num_calc(). This is both easier and faster. * teco_expressions_pop_num_calc() is for simple applications where you just want to get a command argument with default (implied) values. Since it includes teco_expressions_eval(), we can avoid superfluous calls. * -EC...$ turned out to be broken and is fixed now. A test case has been added. --- src/qreg-commands.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/qreg-commands.c') diff --git a/src/qreg-commands.c b/src/qreg-commands.c index 5055058..bec2ca8 100644 --- a/src/qreg-commands.c +++ b/src/qreg-commands.c @@ -284,9 +284,7 @@ teco_state_queryqreg_got_register(teco_machine_main_t *ctx, teco_qreg_t *qreg, if (teco_expressions_args() > 0) { /* Query character from Q-Register string */ - teco_int_t pos; - if (!teco_expressions_pop_num_calc(&pos, 0, error)) - return NULL; + teco_int_t pos = teco_expressions_pop_num(0); if (pos < 0) { teco_error_range_set(error, "Q"); return NULL; @@ -395,9 +393,7 @@ teco_state_setqregstring_nobuilding_done(teco_machine_main_t *ctx, /* the glib docs wrongly claim that one character can take 6 bytes */ buffer = g_malloc(4*args); for (gint i = args; i > 0; i--) { - teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, 0, error)) - return NULL; + teco_int_t v = teco_expressions_pop_num(0); if (v < 0 || !g_unichar_validate(v)) { teco_error_codepoint_set(error, "^U"); return NULL; @@ -407,9 +403,7 @@ teco_state_setqregstring_nobuilding_done(teco_machine_main_t *ctx, } else { buffer = g_malloc(args); for (gint i = args; i > 0; i--) { - teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, 0, error)) - return NULL; + teco_int_t v = teco_expressions_pop_num(0); if (v < 0 || v > 0xFF) { teco_error_codepoint_set(error, "^U"); return NULL; -- cgit v1.2.3