diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-12-28 12:19:07 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-12-28 12:19:07 +0000 |
| commit | e26430d06609e41dde861d3f0deee5a60d3fe722 (patch) | |
| tree | 3cddd8ef82c6fc3fbe720e45396fcd241564b567 | |
| parent | b65c01da243947a6bca00417e2a83a8df959165c (diff) | |
| download | zsh-e26430d06609e41dde861d3f0deee5a60d3fe722.tar.gz zsh-e26430d06609e41dde861d3f0deee5a60d3fe722.tar.xz zsh-e26430d06609e41dde861d3f0deee5a60d3fe722.zip | |
zsh-workers/9162
| -rw-r--r-- | Completion/Base/_regex_arguments | 2 | ||||
| -rw-r--r-- | Src/Modules/zutil.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Completion/Base/_regex_arguments b/Completion/Base/_regex_arguments index d898a96fb..428815419 100644 --- a/Completion/Base/_regex_arguments +++ b/Completion/Base/_regex_arguments @@ -70,7 +70,7 @@ _regex_arguments () { "$funcname"' () { local _ra_p1 _ra_p2 _ra_left _ra_right _ra_com local _ra_actions _ra_line="${(pj:\0:)${(@)words[1,CURRENT - 1]:Q}}"$'\''\0'\''"$PREFIX" - regexparse -c _ra_p1 _ra_p2 "$_ra_line" '"${(j: :)${(qqqq)regex[@]}}"' + zregexparse -c _ra_p1 _ra_p2 "$_ra_line" '"${(j: :)${(qqqq)regex[@]}}"' case "$?" in 0|2) _message "no more arguments";; 1) diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c index 742baf7fb..1c0393578 100644 --- a/Src/Modules/zutil.c +++ b/Src/Modules/zutil.c @@ -721,7 +721,7 @@ bin_zformat(char *nam, char **args, char *ops, int func) return 1; } -/* Regexparse stuff. */ +/* Zregexparse stuff. */ typedef struct { int cutoff; @@ -1105,7 +1105,7 @@ rmatch(RParseResult *sm, char *subj, char *var1, char *var2, int comp) } /* - usage: regexparse string regex... + usage: zregexparse string regex... status: 0: matched 1: unmatched (all next state candidates are failed) @@ -1114,7 +1114,7 @@ rmatch(RParseResult *sm, char *subj, char *var1, char *var2, int comp) */ static int -bin_regexparse(char *nam, char **args, char *ops, int func) +bin_zregexparse(char *nam, char **args, char *ops, int func) { int oldextendedglob = opts[EXTENDEDGLOB]; char *var1 = args[0]; @@ -1152,7 +1152,7 @@ bin_regexparse(char *nam, char **args, char *ops, int func) static struct builtin bintab[] = { BUILTIN("zstyle", 0, bin_zstyle, 0, -1, 0, NULL, NULL), BUILTIN("zformat", 0, bin_zformat, 3, -1, 0, NULL, NULL), - BUILTIN("regexparse", 0, bin_regexparse, 3, -1, 0, "c", NULL), + BUILTIN("zregexparse", 0, bin_zregexparse, 3, -1, 0, "c", NULL), }; |