diff options
author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-12-04 02:22:36 +0300 |
---|---|---|
committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-12-04 11:43:18 +0300 |
commit | 3a823fb43ba0abe52f3152d337675e9ed9a3f175 (patch) | |
tree | f63143368fe15b4fbf88f9646a0a913eb46717fd /src/glob.c | |
parent | 11054d94a99e8c11d6010b117c84ee88b4fa1a73 (diff) | |
download | sciteco-3a823fb43ba0abe52f3152d337675e9ed9a3f175.tar.gz |
implemented ^Y/^S commands for receiving pattern match/insertion ranges and lengths (refs #27)
* Allows storing pattern matches into Q-Registers (^YXq).
* You can also refer to subpatterns marked by ^E[...] by passing a number > 0.
This is equivalent to \0-9 references in many programming languages.
* It's especially useful for supporting TECO's equivalent of structural regular expressions.
This will be done with additional macros.
* You can also simply back up to the beginning of an insertion or search.
So I...$^SC leaves dot at the beginning of the insertion.
S...$^SC leaves dot before the found pattern.
This has been previously requested by users.
* Perhaps there should be ^Y string building characters as well to backreference
in search-replacement commands (TODO).
This means that the search commands would have to store the matched text itself
in teco_range_t structures since FR deletes the matched text before
processing the replacement string.
It could also be made into a FR/FS-specific construct,
so we don't fetch the substrings unnecessarily.
* This differs from DEC TECO in always returning the same range even after dot movements,
since we are storing start/end byte positions instead of only the length.
Also DEC TECO does not support fetching subpattern ranges.
Diffstat (limited to 'src/glob.c')
-rw-r--r-- | src/glob.c | 24 |
1 files changed, 18 insertions, 6 deletions
@@ -35,6 +35,7 @@ #include "qreg.h" #include "ring.h" #include "error.h" +#include "undo.h" #include "glob.h" /* @@ -512,14 +513,19 @@ teco_state_glob_filename_done(teco_machine_main_t *ctx, const teco_string_t *str if (g_regex_match(pattern, filename, 0, NULL) && (teco_test_mode == 0 || g_file_test(filename, file_flags))) { if (!colon_modified) { + gsize len = strlen(filename); + + teco_undo_gsize(teco_ranges[0].from) = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0); + teco_undo_gsize(teco_ranges[0].to) = teco_ranges[0].from + len + 1; + teco_undo_guint(teco_ranges_count) = 1; + /* * FIXME: Filenames may contain linefeeds. * But if we add them null-terminated, they will be relatively hard to parse. */ + filename[len] = '\n'; teco_interface_ssm(SCI_BEGINUNDOACTION, 0, 0); - teco_interface_ssm(SCI_ADDTEXT, strlen(filename), - (sptr_t)filename); - teco_interface_ssm(SCI_ADDTEXT, 1, (sptr_t)"\n"); + teco_interface_ssm(SCI_ADDTEXT, len+1, (sptr_t)filename); teco_interface_ssm(SCI_ENDUNDOACTION, 0, 0); } @@ -544,17 +550,23 @@ teco_state_glob_filename_done(teco_machine_main_t *ctx, const teco_string_t *str g_auto(teco_globber_t) globber; teco_globber_init(&globber, pattern_str.data, file_flags); + teco_undo_gsize(teco_ranges[0].from) = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0); + teco_undo_gsize(teco_ranges[0].to) = teco_ranges[0].from; + teco_undo_guint(teco_ranges_count) = 1; + teco_interface_ssm(SCI_BEGINUNDOACTION, 0, 0); gchar *globbed_filename; while ((globbed_filename = teco_globber_next(&globber))) { + gsize len = strlen(globbed_filename); + teco_ranges[0].to += len+1; + /* * FIXME: Filenames may contain linefeeds. * But if we add them null-terminated, they will be relatively hard to parse. */ - teco_interface_ssm(SCI_ADDTEXT, strlen(globbed_filename), - (sptr_t)globbed_filename); - teco_interface_ssm(SCI_ADDTEXT, 1, (sptr_t)"\n"); + globbed_filename[len] = '\n'; + teco_interface_ssm(SCI_ADDTEXT, len+1, (sptr_t)globbed_filename); g_free(globbed_filename); matching = TRUE; |