diff options
Diffstat (limited to 'src/move-commands.c')
| -rw-r--r-- | src/move-commands.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/move-commands.c b/src/move-commands.c index 868bb19..3a31b6b 100644 --- a/src/move-commands.c +++ b/src/move-commands.c @@ -55,7 +55,7 @@ teco_state_start_jump(teco_machine_main_t *ctx, GError **error) { teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, 0, error)) + if (!teco_expressions_pop_int_calc(&v, 0, error)) return; gssize next_pos = teco_interface_glyphs2bytes_absdot(v); @@ -107,7 +107,7 @@ teco_state_start_move(teco_machine_main_t *ctx, GError **error) { teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return; teco_bool_t rc = teco_move_chars(v); @@ -132,7 +132,7 @@ teco_state_start_reverse(teco_machine_main_t *ctx, GError **error) { teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return; teco_bool_t rc = teco_move_chars(-v); @@ -191,7 +191,7 @@ teco_state_start_line(teco_machine_main_t *ctx, GError **error) { teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return; teco_bool_t rc = teco_move_lines(v); @@ -217,7 +217,7 @@ teco_state_start_back(teco_machine_main_t *ctx, GError **error) { teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return; teco_bool_t rc = teco_move_lines(-v); @@ -388,7 +388,7 @@ teco_state_start_words(teco_machine_main_t *ctx, const gchar *cmd, gint factor, return &teco_state_start; teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return NULL; sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0); @@ -458,7 +458,7 @@ teco_state_start_delete_words(teco_machine_main_t *ctx, const gchar *cmd, gint f return &teco_state_start; teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return NULL; v *= factor; @@ -504,7 +504,7 @@ teco_state_start_kill(teco_machine_main_t *ctx, const gchar *cmd, gboolean by_li from = pos; if (by_lines) { teco_int_t line; - if (!teco_expressions_pop_num_calc(&line, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&line, teco_num_sign, error)) return FALSE; line += teco_interface_ssm(SCI_LINEFROMPOSITION, from, 0); len = teco_interface_ssm(SCI_POSITIONFROMLINE, line, 0) - from; @@ -519,7 +519,7 @@ teco_state_start_kill(teco_machine_main_t *ctx, const gchar *cmd, gboolean by_li teco_current_doc_set_dot(teco_interface_bytes2glyphs_reldot(len)); } else { teco_int_t len_glyphs; - if (!teco_expressions_pop_num_calc(&len_glyphs, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&len_glyphs, teco_num_sign, error)) return FALSE; gssize to = teco_interface_glyphs2bytes_reldot(len_glyphs); rc = teco_bool(to >= 0); @@ -533,9 +533,9 @@ teco_state_start_kill(teco_machine_main_t *ctx, const gchar *cmd, gboolean by_li from -= len; } } else { - teco_int_t to_glyphs = teco_expressions_pop_num(0); + teco_int_t to_glyphs = teco_expressions_pop_int(0); gssize to = teco_interface_glyphs2bytes_absdot(to_glyphs); - teco_int_t from_glyphs = teco_expressions_pop_num(0); + teco_int_t from_glyphs = teco_expressions_pop_int(0); from = teco_interface_glyphs2bytes_absdot(from_glyphs); len = to - from; rc = teco_bool(len >= 0 && from >= 0 && to >= 0); @@ -656,7 +656,7 @@ teco_state_control_lines2glyphs(teco_machine_main_t *ctx, GError **error) * FIXME: Could be optimized by directly calling * SCI_LINEFROMINDEXPOSITION. */ - pos = teco_interface_glyphs2bytes_absdot(teco_expressions_pop_num(0)); + pos = teco_interface_glyphs2bytes_absdot(teco_expressions_pop_int(0)); if (pos < 0) { teco_error_range_set(error, "^Q"); return; @@ -667,7 +667,7 @@ teco_state_control_lines2glyphs(teco_machine_main_t *ctx, GError **error) } else { teco_int_t v; - if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error)) + if (!teco_expressions_pop_int_calc(&v, teco_num_sign, error)) return; sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0); |