aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2025-08-30 20:38:57 +0300
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2025-08-30 20:51:39 +0300
commite82dc6639e829490cb11267fa4a49ef97c6459ae (patch)
tree7625e231f06a47c0bcbb79b64f2a5c6bab811498 /src
parent2070d7faf66425c72677c02616a087d30a9aa863 (diff)
downloadsciteco-e82dc6639e829490cb11267fa4a49ef97c6459ae.tar.gz
the computed go-to command (O) is now 0-indexed and all invalid indexes and empty labels are ignored
* This has long been a TECO-11 incompatibility. * The first label in a list has index 0, i.e. `1Ofoo,bar$` jumps to label `!bar!`. Consequently 0 is also implied, so `Olabel$` continues to do what you expect. * `0Ofoo$` was previously also jumping to `!foo!` which was inconsistent: All invalid indexes should do nothing, i.e. execution continues after the go-to command. * Fixed handling of empty labels as in `1Ofoo,,bar$` - execution should also continue after the command. This eases writing "default" clauses immediately after the go-to. * The ED hook values now also begin at 0, so most existing ED hook macros should continue to work. * Similarily, the mouse events returned by -EJ also begin at 0 now, so fnkeys.tes continues to work as expected. * It's still very possible of course that this breaks existing code.
Diffstat (limited to 'src')
-rw-r--r--src/core-commands.c8
-rw-r--r--src/goto-commands.c31
-rw-r--r--src/interface.h2
-rw-r--r--src/qreg.c8
-rw-r--r--src/qreg.h2
5 files changed, 33 insertions, 18 deletions
diff --git a/src/core-commands.c b/src/core-commands.c
index 6d0a3dc..5fe960b 100644
--- a/src/core-commands.c
+++ b/src/core-commands.c
@@ -2142,13 +2142,13 @@ teco_state_ecommand_flags(teco_machine_main_t *ctx, GError **error)
* Type of the last mouse event (\fBread-only\fP).
* One of the following values will be returned:
* .RS
- * . IP 1: 4
+ * . IP 0: 4
* Some button has been pressed
- * . IP 2:
+ * . IP 1:
* Some button has been released
- * . IP 3:
+ * . IP 2:
* Scroll up
- * . IP 4:
+ * . IP 3:
* Scroll down
* .RE
* .IP -2:
diff --git a/src/goto-commands.c b/src/goto-commands.c
index d95886d..ac98b70 100644
--- a/src/goto-commands.c
+++ b/src/goto-commands.c
@@ -24,6 +24,7 @@
#include <glib.h>
#include "sciteco.h"
+#include "error.h"
#include "string-utils.h"
#include "expressions.h"
#include "parser.h"
@@ -110,15 +111,22 @@ teco_state_goto_done(teco_machine_main_t *ctx, const teco_string_t *str, GError
if (ctx->flags.mode > TECO_MODE_NORMAL)
return &teco_state_start;
+ if (!str->len) {
+ /* you can still write @O/,/, though... */
+ g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED,
+ "No labels given for <O>");
+ return NULL;
+ }
+
teco_int_t value;
- if (!teco_expressions_pop_num_calc(&value, 1, error))
+ if (!teco_expressions_pop_num_calc(&value, 0, error))
return NULL;
/*
* Find the comma-separated substring in str indexed by `value`.
*/
teco_string_t label = {NULL, 0};
- while (value > 0) {
+ while (value >= 0) {
label.data = label.data ? label.data+label.len+1 : str->data;
const gchar *p = label.data ? memchr(label.data, ',', str->len - (label.data - str->data)) : NULL;
label.len = p ? p - label.data : str->len - (label.data - str->data);
@@ -129,7 +137,7 @@ teco_state_goto_done(teco_machine_main_t *ctx, const teco_string_t *str, GError
break;
}
- if (value == 0) {
+ if (value < 0 && label.len > 0) {
gssize pc = teco_goto_table_find(&ctx->goto_table, label.data, label.len);
if (pc >= 0) {
@@ -156,19 +164,22 @@ gboolean teco_state_goto_insert_completion(teco_machine_main_t *ctx, const teco_
/*$ "O" goto
* Olabel$ -- Go to label
- * [n]Olabel1[,label2,...]$
+ * [n]Olabel0[,label1,...]$
*
* Go to <label>.
* The simple go-to command is a special case of the
* computed go-to command.
* A comma-separated list of labels may be specified
* in the string argument.
- * The label to jump to is selected by <n> (1 is <label1>,
- * 2 is <label2>, etc.).
- * If <n> is omitted, 1 is implied.
+ * The label to jump to is selected by <n> (0 is <label0>,
+ * 1 is <label1>, etc.).
+ * If <n> is omitted, 0 is implied.
+ * Computed go-tos can be used like switch-case statements
+ * other languages.
*
* If the label selected by <n> is does not exist in the
- * list of labels, the command does nothing.
+ * list of labels or is empty, the command does nothing
+ * and execution continues normally.
* Label definitions are cached in a table, so that
* if the label to go to has already been defined, the
* go-to command will jump immediately.
@@ -179,6 +190,10 @@ gboolean teco_state_goto_insert_completion(teco_machine_main_t *ctx, const teco_
* is terminated.
* In the latter case, the user will not be able to
* terminate the command-line.
+ *
+ * String building constructs are enabled in \fBO\fP
+ * which allows for a second kind of computed go-to,
+ * where the label name contains the value to select.
*/
TECO_DEFINE_STATE_EXPECTSTRING(teco_state_goto,
.process_edit_cmd_cb = (teco_state_process_edit_cmd_cb_t)teco_state_goto_process_edit_cmd,
diff --git a/src/interface.h b/src/interface.h
index c0c41bd..9531d37 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -155,7 +155,7 @@ gboolean teco_interface_is_interrupted(void);
typedef struct {
enum {
- TECO_MOUSE_PRESSED = 1,
+ TECO_MOUSE_PRESSED = 0,
TECO_MOUSE_RELEASED,
TECO_MOUSE_SCROLLUP,
TECO_MOUSE_SCROLLDOWN
diff --git a/src/qreg.c b/src/qreg.c
index 332b5f6..d49a4d6 100644
--- a/src/qreg.c
+++ b/src/qreg.c
@@ -1334,10 +1334,10 @@ teco_ed_hook(teco_ed_hook_t type, GError **error)
teco_expressions_brace_close(error);
static const gchar *const type2name[] = {
- [TECO_ED_HOOK_ADD-1] = "ADD",
- [TECO_ED_HOOK_EDIT-1] = "EDIT",
- [TECO_ED_HOOK_CLOSE-1] = "CLOSE",
- [TECO_ED_HOOK_QUIT-1] = "QUIT"
+ [TECO_ED_HOOK_ADD] = "ADD",
+ [TECO_ED_HOOK_EDIT] = "EDIT",
+ [TECO_ED_HOOK_CLOSE] = "CLOSE",
+ [TECO_ED_HOOK_QUIT] = "QUIT"
};
error_add_frame:
diff --git a/src/qreg.h b/src/qreg.h
index 2b970aa..6daaff3 100644
--- a/src/qreg.h
+++ b/src/qreg.h
@@ -239,7 +239,7 @@ gboolean teco_qreg_stack_pop(teco_qreg_t *qreg, GError **error);
void teco_qreg_stack_clear(void);
typedef enum {
- TECO_ED_HOOK_ADD = 1,
+ TECO_ED_HOOK_ADD = 0,
TECO_ED_HOOK_EDIT,
TECO_ED_HOOK_CLOSE,
TECO_ED_HOOK_QUIT