* PATCH: suffix aliases
@ 2003-09-02 21:11 Peter Stephenson
2003-09-02 23:37 ` DervishD
2003-09-03 7:55 ` Oliver Kiddle
0 siblings, 2 replies; 6+ messages in thread
From: Peter Stephenson @ 2003-09-02 21:11 UTC (permalink / raw)
To: Zsh hackers list
This adds aliases for suffixes, so that after
alias -s ps=gv
attempting to run a command called foo.ps will call `gv foo.ps'.
I could have used `alias .ps=gv' in the way 4DOS did, but as zsh aliases
can be more or less anything it seemed more natural to have a completely
separate table.
I stuck with suffixes instead of patterns, which would have been less
efficient and more complicated for little extra gain.
After writing this, I went somewhat over the top and wrote a complete
function system of MIME type handling using mime.types and mailcap.
That's logically separately so I'll post it some other time. It's
probably worth a separate subdirectory of Functions, even though there
are only three separate functions.
I dutifully added completion to _alias, but it seems that doesn't
understand the difference between aliases with different options, so I
didn't try to make it. The _suffix_alias_files completion for the
command word is rather more useful; that means you get offered files
which have an associated suffix alias.
Index: Completion/Zsh/Command/_alias
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Command/_alias,v
retrieving revision 1.2
diff -u -r1.2 _alias
--- Completion/Zsh/Command/_alias 16 Jan 2002 16:29:52 -0000 1.2
+++ Completion/Zsh/Command/_alias 2 Sep 2003 20:55:36 -0000
@@ -5,6 +5,7 @@
_arguments -C -s -A "-*" -S \
'-+g[list or define global aliases]' \
'-+r[list or define regular aliases]' \
+ '-+s[list or define suffix aliases]' \
'-+m[print aliases matching specified pattern]' \
'-L[print each alias in the form of calls to alias]' \
'*::alias definition:->defn'
@@ -18,4 +19,3 @@
_wanted alias expl 'alias definition' _aliases -S "$suf"
fi
fi
-
Index: Completion/Zsh/Type/.distfiles
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Type/.distfiles,v
retrieving revision 1.1
diff -u -r1.1 .distfiles
--- Completion/Zsh/Type/.distfiles 2 Apr 2001 12:44:25 -0000 1.1
+++ Completion/Zsh/Type/.distfiles 2 Sep 2003 20:55:36 -0000
@@ -4,4 +4,5 @@
_arrays _functions _limits _parameters
_command_names _jobs _options _vars
_directory_stack _jobs_bg _options_set
+_suffix_alias_files
'
Index: Completion/Zsh/Type/_aliases
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Type/_aliases,v
retrieving revision 1.2
diff -u -r1.2 _aliases
--- Completion/Zsh/Type/_aliases 11 Apr 2001 21:47:18 -0000 1.2
+++ Completion/Zsh/Type/_aliases 2 Sep 2003 20:55:36 -0000
@@ -4,14 +4,16 @@
zparseopts -E -D s:=sel
-[[ -z $sel ]] && sel=rg
+[[ -z $sel ]] && sel=rgs
opts=( "$@" )
args=()
[[ $sel = *r* ]] && args=( $args 'aliases:regular alias:compadd -k aliases' )
[[ $sel = *g* ]] && args=( $args 'global-aliases:global alias:compadd -k galiases' )
+[[ $sel = *s* ]] && args=( $args 'suffix-aliases:suffix alias:compadd -k saliases' )
[[ $sel = *R* ]] && args=( $args 'disabled-aliases:disabled regular alias:compadd -k dis_aliases' )
[[ $sel = *G* ]] && args=( $args 'disabled-global-aliases:disabled global alias:compadd -k dis_galiases' )
+[[ $sel = *S* ]] && args=( $args 'disabled-suffix-aliases:disabled suffix alias:compadd -k dis_saliases' )
_alternative -O opts $args
Index: Completion/Zsh/Type/_command_names
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Type/_command_names,v
retrieving revision 1.5
diff -u -r1.5 _command_names
--- Completion/Zsh/Type/_command_names 28 Jan 2002 16:34:13 -0000 1.5
+++ Completion/Zsh/Type/_command_names 2 Sep 2003 20:55:36 -0000
@@ -24,6 +24,7 @@
'builtins:builtin command:compadd -k builtins'
'functions:shell function:compadd -k functions'
'aliases:alias:compadd -k aliases'
+ 'suffix-aliases:suffix alias:_suffix_alias_files'
'reserved-words:reserved word:compadd -k reswords'
'jobs:: _jobs -t'
'parameters:: _parameters -g "^*readonly*" -qS= -r "\n\t\- =["'
Index: Completion/Zsh/Type/_suffix_alias_files
===================================================================
RCS file: Completion/Zsh/Type/_suffix_alias_files
diff -N Completion/Zsh/Type/_suffix_alias_files
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Completion/Zsh/Type/_suffix_alias_files 2 Sep 2003 20:55:36 -0000
@@ -0,0 +1,21 @@
+#autoload
+
+# Complete files for which a suffix alias exists.
+
+local expl pat
+
+(( ${#saliases} )) || return 1
+
+if (( ${#saliases} == 1 )); then
+ pat="*.${(kq)saliases}"
+else
+ local -a tmpa
+ # This is so we can quote the alias names against expansion
+ # without quoting the `|' which needs to be active in the pattern
+ # --- remember that an alias name can be pretty much anything.
+ tmpa=(${(kq)saliases})
+ pat="*.(${(kj.|.)tmpa})"
+fi
+
+# _wanted is called for us by _command_names
+_path_files "$@" -g $pat
Index: Doc/Zsh/builtins.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/builtins.yo,v
retrieving revision 1.62
diff -u -r1.62 builtins.yo
--- Doc/Zsh/builtins.yo 25 Jul 2003 10:53:44 -0000 1.62
+++ Doc/Zsh/builtins.yo 2 Sep 2003 20:55:45 -0000
@@ -60,23 +60,40 @@
findex(alias)
cindex(aliases, defining)
cindex(aliases, listing)
-item(tt(alias) [ {tt(PLUS()|tt(-))}tt(gmrL) ] [ var(name)[tt(=)var(value)] ... ])(
+item(tt(alias) [ {tt(PLUS()|tt(-))}tt(gmrsL) ] [ var(name)[tt(=)var(value)] ... ])(
For each var(name) with a corresponding var(value), define an alias
with that value. A trailing space in var(value) causes the next word
to be checked for alias expansion. If the tt(-g) flag is present,
define a global alias; global aliases are expanded even if they do not
occur in command position.
+If the tt(-s) flags is present, define a suffix alias: if the command
+word on a command line is in the form `var(text)tt(.)var(name)', where
+var(text) is any non-empty string, it is replaced by the text
+`var(value) var(text)tt(.)var(name)'. Note that var(name) is treated as
+a literal string, not a pattern. A trailing space in var(value) is not
+special in this case. For example,
+
+example(alias -s ps=gv)
+
+will cause the command `tt(*.ps)' to be expanded to `tt(gv *.ps)'. As
+alias expansion is carried out earlier than globbing, the `tt(*.ps)' will
+then be expanded. Suffix aliases constitute a different name space from
+other aliases (so in the above example it is still possible
+to create an alias for the command tt(ps)) and the two sets are never
+listed together.
+
For each var(name) with no var(value),
print the value of var(name), if any. With no arguments, print all
-currently defined aliases. If the tt(-m) flag is given the arguments
-are taken as patterns (they should be quoted to preserve them from being
-interpreted as glob patterns), and the aliases matching these patterns
-are printed. When printing aliases and the tt(-g) or tt(-r) flags
-are present, then restrict the printing to global or regular
-aliases, respectively. Using `tt(PLUS())' instead of `tt(-)', or ending
-the option list with a single `tt(PLUS())', prevents the values of the
-aliases from being printed.
+currently defined aliases other than suffix aliases. If the tt(-m) flag
+is given the arguments are taken as patterns (they should be quoted to
+preserve them from being interpreted as glob patterns), and the aliases
+matching these patterns are printed. When printing aliases and one of
+the tt(-g), tt(-r) or tt(-s) flags is present, restrict the printing to
+global, regular or suffix aliases, respectively; a regular alias is one
+which is neither a global nor a suffix alias. Using `tt(PLUS())'
+instead of `tt(-)', or ending the option list with a single
+`tt(PLUS())', prevents the values of the aliases from being printed.
If the tt(-L) flag is present, then print each
alias in a manner suitable for putting in a startup script. The exit
@@ -228,11 +245,12 @@
findex(disable)
cindex(disabling commands)
cindex(commands, disabling)
-item(tt(disable) [ tt(-afmr) ] var(name) ...)(
+item(tt(disable) [ tt(-afmrs) ] var(name) ...)(
Temporarily disable the var(name)d hash table elements. The default
is to disable builtin commands. This allows you to use an external
command with the same name as a builtin command. The tt(-a) option
-causes tt(disable) to act on aliases. The tt(-f) option causes
+causes tt(disable) to act on regular or global aliases. The tt(-s)
+option causes tt(disable) to act on suffix aliases. The tt(-f) option causes
tt(disable) to act on shell functions. The tt(-r) options causes
tt(disable) to act on reserved words. Without arguments all disabled
hash table elements from the corresponding hash table are printed.
@@ -323,11 +341,12 @@
findex(enable)
cindex(enabling commands)
cindex(commands, enabling)
-item(tt(enable) [ tt(-afmr) ] var(name) ...)(
+item(tt(enable) [ tt(-afmrs) ] var(name) ...)(
Enable the var(name)d hash table elements, presumably disabled
earlier with tt(disable). The default is to enable builtin commands.
-The tt(-a) option causes tt(enable) to act on aliases. The tt(-f)
-option causes tt(enable) to act on shell functions. The tt(-r)
+The tt(-a) option causes tt(enable) to act on regular or global aliases.
+The tt(-s) option causes tt(enable) to act on suffix aliases.
+The tt(-f) option causes tt(enable) to act on shell functions. The tt(-r)
option causes tt(enable) to act on reserved words. Without arguments
all enabled hash table elements from the corresponding hash table are
printed. With the tt(-m) flag the arguments are taken as patterns
@@ -1380,10 +1399,12 @@
cindex(functions, removing)
alias(unfunction)(unhash -f)
findex(unhash)
-item(tt(unhash) [ tt(-adfm) ] var(name) ...)(
+item(tt(unhash) [ tt(-adfms) ] var(name) ...)(
Remove the element named var(name) from an internal hash table. The
default is remove elements from the command hash table. The tt(-a)
-option causes tt(unhash) to remove aliases. The tt(-f) option causes
+option causes tt(unhash) to remove regular or global aliases.
+The tt(-s) option causes tt(unhash) to remove suffix aliases.
+The tt(-f) option causes
tt(unhash) to remove shell functions. The tt(-d) options causes
tt(unhash) to remove named directories. If the tt(-m) flag is given
the arguments are taken as patterns (should be quoted) and all elements
Index: Doc/Zsh/mod_parameter.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/mod_parameter.yo,v
retrieving revision 1.5
diff -u -r1.5 mod_parameter.yo
--- Doc/Zsh/mod_parameter.yo 2 Nov 2000 08:12:45 -0000 1.5
+++ Doc/Zsh/mod_parameter.yo 2 Sep 2003 20:55:45 -0000
@@ -64,15 +64,23 @@
)
vindex(dis_aliases)
item(tt(dis_aliases))(
-Like tt(raliases) but for disabled regular aliases.
+Like tt(aliases) but for disabled regular aliases.
)
vindex(galiases)
item(tt(galiases))(
-Like tt(raliases), but for global aliases.
+Like tt(aliases), but for global aliases.
)
vindex(dis_galiases)
item(tt(dis_galiases))(
Like tt(galiases) but for disabled global aliases.
+)
+vindex(saliases)
+item(tt(saliases))(
+Like tt(raliases), but for suffix aliases.
+)
+vindex(dis_saliases)
+item(tt(dis_saliases))(
+Like tt(saliases) but for disabled suffix aliases.
)
vindex(parameters)
item(tt(parameters))(
Index: Src/builtin.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/builtin.c,v
retrieving revision 1.103
diff -u -r1.103 builtin.c
--- Src/builtin.c 9 Jul 2003 11:04:02 -0000 1.103
+++ Src/builtin.c 2 Sep 2003 20:56:03 -0000
@@ -45,7 +45,7 @@
BUILTIN("[", 0, bin_test, 0, -1, BIN_BRACKET, NULL, NULL),
BUILTIN(".", BINF_PSPECIAL, bin_dot, 1, -1, 0, NULL, NULL),
BUILTIN(":", BINF_PSPECIAL, bin_true, 0, -1, 0, NULL, NULL),
- BUILTIN("alias", BINF_MAGICEQUALS | BINF_PLUSOPTS, bin_alias, 0, -1, 0, "Lgmr", NULL),
+ BUILTIN("alias", BINF_MAGICEQUALS | BINF_PLUSOPTS, bin_alias, 0, -1, 0, "Lgmrs", NULL),
BUILTIN("autoload", BINF_PLUSOPTS, bin_functions, 0, -1, 0, "tUXwkz", "u"),
BUILTIN("bg", 0, bin_fg, 0, -1, BIN_BG, NULL, NULL),
BUILTIN("break", BINF_PSPECIAL, bin_break, 0, 1, BIN_BREAK, NULL, NULL),
@@ -55,11 +55,11 @@
BUILTIN("continue", BINF_PSPECIAL, bin_break, 0, 1, BIN_CONTINUE, NULL, NULL),
BUILTIN("declare", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL, bin_typeset, 0, -1, 0, "AE:%F:%HL:%R:%TUZ:%afghi:%lprtux", NULL),
BUILTIN("dirs", 0, bin_dirs, 0, -1, 0, "clpv", NULL),
- BUILTIN("disable", 0, bin_enable, 0, -1, BIN_DISABLE, "afmr", NULL),
+ BUILTIN("disable", 0, bin_enable, 0, -1, BIN_DISABLE, "afmrs", NULL),
BUILTIN("disown", 0, bin_fg, 0, -1, BIN_DISOWN, NULL, NULL),
BUILTIN("echo", BINF_PRINTOPTS | BINF_SKIPINVALID, bin_print, 0, -1, BIN_ECHO, "neE", "-"),
BUILTIN("emulate", 0, bin_emulate, 1, 1, 0, "LR", NULL),
- BUILTIN("enable", 0, bin_enable, 0, -1, BIN_ENABLE, "afmr", NULL),
+ BUILTIN("enable", 0, bin_enable, 0, -1, BIN_ENABLE, "afmrs", NULL),
BUILTIN("eval", BINF_PSPECIAL, bin_eval, 0, -1, BIN_EVAL, NULL, NULL),
BUILTIN("exit", BINF_PSPECIAL, bin_break, 0, 1, BIN_EXIT, NULL, NULL),
BUILTIN("export", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL, bin_typeset, 0, -1, BIN_EXPORT, "E:%F:%HL:%R:%TUZ:%afhi:%lprtu", "xg"),
@@ -123,9 +123,9 @@
BUILTIN("type", 0, bin_whence, 0, -1, 0, "ampfsw", "v"),
BUILTIN("typeset", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL, bin_typeset, 0, -1, 0, "AE:%F:%HL:%R:%TUZ:%afghi:%lprtuxm", NULL),
BUILTIN("umask", 0, bin_umask, 0, 1, 0, "S", NULL),
- BUILTIN("unalias", 0, bin_unhash, 1, -1, 0, "m", "a"),
+ BUILTIN("unalias", 0, bin_unhash, 1, -1, 0, "ms", "a"),
BUILTIN("unfunction", 0, bin_unhash, 1, -1, 0, "m", "f"),
- BUILTIN("unhash", 0, bin_unhash, 1, -1, 0, "adfm", NULL),
+ BUILTIN("unhash", 0, bin_unhash, 1, -1, 0, "adfms", NULL),
BUILTIN("unset", BINF_PSPECIAL, bin_unset, 1, -1, 0, "fmv", NULL),
BUILTIN("unsetopt", 0, bin_setopt, 0, -1, BIN_UNSETOPT, NULL, NULL),
BUILTIN("wait", 0, bin_fg, 0, -1, BIN_WAIT, NULL, NULL),
@@ -461,6 +461,8 @@
ht = shfunctab;
else if (OPT_ISSET(ops,'r'))
ht = reswdtab;
+ else if (OPT_ISSET(ops,'s'))
+ ht = sufaliastab;
else if (OPT_ISSET(ops,'a'))
ht = aliastab;
else
@@ -2671,6 +2673,8 @@
informed = 0;
if (!OPT_ISSET(ops,'p')) {
+ char *suf;
+
/* Look for alias */
if ((hn = aliastab->getnode(aliastab, *argv))) {
aliastab->printnode(hn, printflags);
@@ -2678,6 +2682,15 @@
continue;
informed = 1;
}
+ /* Look for suffix alias */
+ if ((suf = strrchr(*argv, '.')) && suf[1] &&
+ suf > *argv && suf[-1] != Meta &&
+ (hn = sufaliastab->getnode(sufaliastab, suf+1))) {
+ sufaliastab->printnode(hn, printflags);
+ if (!all)
+ continue;
+ informed = 1;
+ }
/* Look for reserved word */
if ((hn = reswdtab->getnode(reswdtab, *argv))) {
reswdtab->printnode(hn, printflags);
@@ -2901,6 +2914,8 @@
ht = nameddirtab; /* named directories */
else if (OPT_ISSET(ops,'f'))
ht = shfunctab; /* shell functions */
+ else if (OPT_ISSET(ops,'s'))
+ ht = sufaliastab; /* suffix aliases, must precede aliases */
else if (OPT_ISSET(ops,'a'))
ht = aliastab; /* aliases */
else
@@ -2963,34 +2978,48 @@
Alias a;
Patprog pprog;
Asgment asg;
- int haveflags = 0, returnval = 0;
+ int returnval = 0;
int flags1 = 0, flags2 = DISABLED;
int printflags = 0;
+ int type_opts;
+ HashTable ht = aliastab;
/* Did we specify the type of alias? */
- if (OPT_ISSET(ops,'r') || OPT_ISSET(ops,'g')) {
- if (OPT_ISSET(ops,'r') && OPT_ISSET(ops,'g')) {
+ type_opts = OPT_ISSET(ops, 'r') + OPT_ISSET(ops, 'g') +
+ OPT_ISSET(ops, 's');
+ if (type_opts) {
+ if (type_opts > 1) {
zwarnnam(name, "illegal combination of options", NULL, 0);
return 1;
}
- haveflags = 1;
if (OPT_ISSET(ops,'g'))
flags1 |= ALIAS_GLOBAL;
else
flags2 |= ALIAS_GLOBAL;
+ if (OPT_ISSET(ops, 's')) {
+ /*
+ * Although we keep suffix aliases in a different table,
+ * it is useful to be able to distinguish Alias structures
+ * without reference to the table, so we have a separate
+ * flag, too.
+ */
+ flags1 |= ALIAS_SUFFIX;
+ ht = sufaliastab;
+ } else
+ flags2 |= ALIAS_SUFFIX;
}
if (OPT_ISSET(ops,'L'))
printflags |= PRINT_LIST;
- else if (OPT_PLUS(ops,'r') || OPT_PLUS(ops,'g')|| OPT_PLUS(ops,'m') ||
- OPT_ISSET(ops,'+'))
+ else if (OPT_PLUS(ops,'g') || OPT_PLUS(ops,'r') || OPT_PLUS(ops,'s') ||
+ OPT_PLUS(ops,'m') || OPT_ISSET(ops,'+'))
printflags |= PRINT_NAMEONLY;
/* In the absence of arguments, list all aliases. If a command *
* line flag is specified, list only those of that type. */
if (!*argv) {
queue_signals();
- scanhashtable(aliastab, 1, flags1, flags2, aliastab->printnode, printflags);
+ scanhashtable(ht, 1, flags1, flags2, ht->printnode, printflags);
unqueue_signals();
return 0;
}
@@ -3003,8 +3032,8 @@
if ((pprog = patcompile(*argv, PAT_STATIC, NULL))) {
/* display the matching aliases */
queue_signals();
- scanmatchtable(aliastab, pprog, flags1, flags2,
- aliastab->printnode, printflags);
+ scanmatchtable(ht, pprog, flags1, flags2,
+ ht->printnode, printflags);
unqueue_signals();
} else {
untokenize(*argv);
@@ -3021,14 +3050,15 @@
if (asg->value && !OPT_ISSET(ops,'L')) {
/* The argument is of the form foo=bar and we are not *
* forcing a listing with -L, so define an alias */
- aliastab->addnode(aliastab, ztrdup(asg->name),
- createaliasnode(ztrdup(asg->value), flags1));
- } else if ((a = (Alias) aliastab->getnode(aliastab, asg->name))) {
+ ht->addnode(ht, ztrdup(asg->name),
+ createaliasnode(ztrdup(asg->value), flags1));
+ } else if ((a = (Alias) ht->getnode(ht, asg->name))) {
/* display alias if appropriate */
- if (!haveflags ||
- (OPT_ISSET(ops,'r') && !(a->flags & ALIAS_GLOBAL)) ||
- (OPT_ISSET(ops,'g') && (a->flags & ALIAS_GLOBAL)))
- aliastab->printnode((HashNode) a, printflags);
+ if (!type_opts || ht == sufaliastab ||
+ (OPT_ISSET(ops,'r') &&
+ !(a->flags & (ALIAS_GLOBAL|ALIAS_SUFFIX))) ||
+ (OPT_ISSET(ops,'g') && (a->flags & ALIAS_GLOBAL)))
+ ht->printnode((HashNode) a, printflags);
} else
returnval = 1;
}
Index: Src/hashtable.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/hashtable.c,v
retrieving revision 1.13
diff -u -r1.13 hashtable.c
--- Src/hashtable.c 27 Aug 2002 21:10:34 -0000 1.13
+++ Src/hashtable.c 2 Sep 2003 20:56:06 -0000
@@ -1014,30 +1014,51 @@
/**/
mod_export HashTable aliastab;
-/* Create new hash table for aliases */
+/* has table containing suffix aliases */
+
+/**/
+mod_export HashTable sufaliastab;
+
+/* Create new hash tables for aliases */
+
+/**/
+void
+createaliastable(HashTable ht)
+{
+ ht->hash = hasher;
+ ht->emptytable = NULL;
+ ht->filltable = NULL;
+ ht->cmpnodes = strcmp;
+ ht->addnode = addhashnode;
+ ht->getnode = gethashnode;
+ ht->getnode2 = gethashnode2;
+ ht->removenode = removehashnode;
+ ht->disablenode = disablehashnode;
+ ht->enablenode = enablehashnode;
+ ht->freenode = freealiasnode;
+ ht->printnode = printaliasnode;
+}
/**/
void
-createaliastable(void)
+createaliastables(void)
{
+ /* Table for regular and global aliases */
+
aliastab = newhashtable(23, "aliastab", NULL);
- aliastab->hash = hasher;
- aliastab->emptytable = NULL;
- aliastab->filltable = NULL;
- aliastab->cmpnodes = strcmp;
- aliastab->addnode = addhashnode;
- aliastab->getnode = gethashnode;
- aliastab->getnode2 = gethashnode2;
- aliastab->removenode = removehashnode;
- aliastab->disablenode = disablehashnode;
- aliastab->enablenode = enablehashnode;
- aliastab->freenode = freealiasnode;
- aliastab->printnode = printaliasnode;
+ createaliastable(aliastab);
/* add the default aliases */
aliastab->addnode(aliastab, ztrdup("run-help"), createaliasnode(ztrdup("man"), 0));
aliastab->addnode(aliastab, ztrdup("which-command"), createaliasnode(ztrdup("whence"), 0));
+
+
+ /* Table for suffix aliases --- make this smaller */
+
+ sufaliastab = newhashtable(11, "sufaliastab", NULL);
+
+ createaliastable(sufaliastab);
}
/* Create a new alias node */
@@ -1093,10 +1114,12 @@
if (printflags & PRINT_WHENCE_CSH) {
nicezputs(a->nam, stdout);
- if (a->flags & ALIAS_GLOBAL)
- printf(": globally aliased to ");
- else
- printf(": aliased to ");
+ printf(": ");
+ if (a->flags & ALIAS_SUFFIX)
+ printf("suffix ");
+ else if (a->flags & ALIAS_GLOBAL)
+ printf("globally ");
+ printf (" aliased to ");
nicezputs(a->text, stdout);
putchar('\n');
return;
@@ -1104,10 +1127,14 @@
if (printflags & PRINT_WHENCE_VERBOSE) {
nicezputs(a->nam, stdout);
- if (a->flags & ALIAS_GLOBAL)
- printf(" is a global alias for ");
+ printf(" is a");
+ if (a->flags & ALIAS_SUFFIX)
+ printf(" suffix");
+ else if (a->flags & ALIAS_GLOBAL)
+ printf(" global");
else
- printf(" is an alias for ");
+ printf("n");
+ printf(" alias for");
nicezputs(a->text, stdout);
putchar('\n');
return;
@@ -1115,7 +1142,9 @@
if (printflags & PRINT_LIST) {
printf("alias ");
- if (a->flags & ALIAS_GLOBAL)
+ if (a->flags & ALIAS_SUFFIX)
+ printf("-s ");
+ else if (a->flags & ALIAS_GLOBAL)
printf("-g ");
/* If an alias begins with `-', then we must output `-- ' *
@@ -1127,6 +1156,7 @@
quotedzputs(a->nam, stdout);
putchar('=');
quotedzputs(a->text, stdout);
+
putchar('\n');
}
Index: Src/init.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/init.c,v
retrieving revision 1.34
diff -u -r1.34 init.c
--- Src/init.c 15 May 2003 09:23:11 -0000 1.34
+++ Src/init.c 2 Sep 2003 20:56:11 -0000
@@ -792,7 +792,7 @@
initlextabs(); /* initialize lexing tables */
createreswdtable(); /* create hash table for reserved words */
- createaliastable(); /* create hash table for aliases */
+ createaliastables(); /* create hash tables for aliases */
createcmdnamtable(); /* create hash table for external commands */
createshfunctable(); /* create hash table for shell functions */
createbuiltintable(); /* create hash table for builtin commands */
Index: Src/lex.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/lex.c,v
retrieving revision 1.26
diff -u -r1.26 lex.c
--- Src/lex.c 11 Aug 2003 10:45:10 -0000 1.26
+++ Src/lex.c 2 Sep 2003 20:56:13 -0000
@@ -1510,7 +1510,7 @@
mod_export int
parse_subst_string(char *s)
{
- int c, l = strlen(s), err, olen;
+ int c, l = strlen(s), err, olen, lexstop_ret;
if (!*s || !strcmp(s, nulstring))
return 0;
@@ -1522,6 +1522,7 @@
bptr = tokstr = s;
bsiz = l + 1;
c = hgetc();
+ lexstop_ret = lexstop;
c = gettokstr(c, 1);
err = errflag;
strinend();
@@ -1603,17 +1604,32 @@
if (tok == STRING) {
/* Check for an alias */
- an = (noaliases || unset(ALIASESOPT)) ? NULL :
- (Alias) aliastab->getnode(aliastab, yytext);
- if (an && !an->inuse && ((an->flags & ALIAS_GLOBAL) || incmdpos ||
- inalmore)) {
- inpush(an->text, INP_ALIAS, an);
- if (an->text[0] == ' ')
- aliasspaceflag = 1;
- lexstop = 0;
- if (yytext == copy)
- yytext = tokstr;
- return 1;
+ if (!noaliases && isset(ALIASESOPT)) {
+ char *suf;
+
+ an = (Alias) aliastab->getnode(aliastab, yytext);
+ if (an && !an->inuse &&
+ ((an->flags & ALIAS_GLOBAL) || incmdpos || inalmore)) {
+ inpush(an->text, INP_ALIAS, an);
+ if (an->text[0] == ' ')
+ aliasspaceflag = 1;
+ lexstop = 0;
+ if (yytext == copy)
+ yytext = tokstr;
+ return 1;
+ }
+ if ((suf = strrchr(yytext, '.')) && suf[1] &&
+ suf > yytext && suf[-1] != Meta &&
+ (an = (Alias)sufaliastab->getnode(sufaliastab, suf+1)) &&
+ !an->inuse && incmdpos) {
+ inpush(dupstring(yytext), INP_ALIAS, NULL);
+ inpush(" ", INP_ALIAS, NULL);
+ inpush(an->text, INP_ALIAS, an);
+ lexstop = 0;
+ if (yytext == copy)
+ yytext = tokstr;
+ return 1;
+ }
}
/* Then check for a reserved word */
Index: Src/zsh.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.h,v
retrieving revision 1.48
diff -u -r1.48 zsh.h
--- Src/zsh.h 22 May 2003 09:48:29 -0000 1.48
+++ Src/zsh.h 2 Sep 2003 20:56:19 -0000
@@ -872,8 +872,11 @@
int inuse; /* alias is being expanded */
};
-/* is this alias global */
+/* bit 0 of flags is the DISABLED flag */
+/* is this alias global? */
#define ALIAS_GLOBAL (1<<1)
+/* is this an alias for suffix handling? */
+#define ALIAS_SUFFIX (1<<2)
/* node in command path hash table (cmdnamtab) */
Index: Src/Modules/parameter.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/parameter.c,v
retrieving revision 1.24
diff -u -r1.24 parameter.c
--- Src/Modules/parameter.c 22 Jul 2003 13:12:11 -0000 1.24
+++ Src/Modules/parameter.c 2 Sep 2003 20:56:22 -0000
@@ -1611,49 +1611,56 @@
}
}
-/* Functions for the regularaliases and globalaliases special parameters. */
+/* Functions for the raliases, galiases and saliases special parameters. */
/**/
static void
-setralias(Param pm, char *value, int dis)
+setalias(HashTable ht, Param pm, char *value, int flags)
{
- aliastab->addnode(aliastab, ztrdup(pm->nam), createaliasnode(value, dis));
+ ht->addnode(aliastab, ztrdup(pm->nam),
+ createaliasnode(value, flags));
}
/**/
static void
setpmralias(Param pm, char *value)
{
- setralias(pm, value, 0);
+ setalias(aliastab, pm, value, 0);
}
/**/
static void
setpmdisralias(Param pm, char *value)
{
- setralias(pm, value, DISABLED);
+ setalias(aliastab, pm, value, DISABLED);
}
/**/
static void
-setgalias(Param pm, char *value, int dis)
+setpmgalias(Param pm, char *value)
{
- aliastab->addnode(aliastab, ztrdup(pm->nam),
- createaliasnode(value, dis | ALIAS_GLOBAL));
+ setalias(aliastab, pm, value, ALIAS_GLOBAL);
}
/**/
static void
-setpmgalias(Param pm, char *value)
+setpmdisgalias(Param pm, char *value)
{
- setgalias(pm, value, 0);
+ setgalias(aliastab, pm, value, ALIAS_GLOBAL|DISABLED);
}
/**/
static void
-setpmdisgalias(Param pm, char *value)
+setpmsalias(Param pm, char *value)
+{
+ setgalias(sufaliastab, pm, value, 0);
+}
+
+/**/
+static void
+setpmdissalias(Param pm, char *value)
{
- setgalias(pm, value, DISABLED);
+ setgalias(sufaliastab, pm, value, DISABLED);
}
/**/
@@ -1668,7 +1675,17 @@
/**/
static void
-setaliases(Param pm, HashTable ht, int global, int dis)
+unsetpmsalias(Param pm, int exp)
+{
+ HashNode hd = sufaliastab->removenode(sufaliastab, pm->nam);
+
+ if (hd)
+ sufaliastab->freenode(hd);
+}
+
+/**/
+static void
+setaliases(HashTable alht, Param pm, HashTable ht, int flags)
{
int i;
HashNode hn, next, hd;
@@ -1676,13 +1693,18 @@
if (!ht)
return;
- for (i = 0; i < aliastab->hsize; i++)
- for (hn = aliastab->nodes[i]; hn; hn = next) {
+ for (i = 0; i < alht->hsize; i++)
+ for (hn = alht->nodes[i]; hn; hn = next) {
next = hn->next;
- if (((global && (((Alias) hn)->flags & ALIAS_GLOBAL)) ||
- (!global && !(((Alias) hn)->flags & ALIAS_GLOBAL))) &&
- (hd = aliastab->removenode(aliastab, hn->nam)))
- aliastab->freenode(hd);
+ /*
+ * The following respects the DISABLED flag, e.g.
+ * we get a different behaviour for raliases and dis_raliases.
+ * The predecessor to this code didn't do that; presumably
+ * that was a bug.
+ */
+ if (flags == ((Alias)hn)->flags &&
+ (hd = alht->removenode(alht, hn->nam)))
+ alht->freenode(hd);
}
for (i = 0; i < ht->hsize; i++)
@@ -1696,10 +1718,8 @@
v.pm = (Param) hn;
if ((val = getstrvalue(&v)))
- aliastab->addnode(aliastab, ztrdup(hn->nam),
- createaliasnode(ztrdup(val),
- (global ? ALIAS_GLOBAL : 0) |
- (dis ? DISABLED : 0)));
+ alht->addnode(alht, ztrdup(hn->nam),
+ createaliasnode(ztrdup(val), flags));
}
deleteparamtable(ht);
}
@@ -1708,53 +1728,103 @@
static void
setpmraliases(Param pm, HashTable ht)
{
- setaliases(pm, ht, 0, 0);
+ setaliases(aliastab, pm, ht, 0);
}
/**/
static void
setpmdisraliases(Param pm, HashTable ht)
{
- setaliases(pm, ht, 0, DISABLED);
+ setaliases(aliastab, pm, ht, DISABLED);
}
/**/
static void
setpmgaliases(Param pm, HashTable ht)
{
- setaliases(pm, ht, 1, 0);
+ setaliases(aliastab, pm, ht, ALIAS_GLOBAL);
}
/**/
static void
setpmdisgaliases(Param pm, HashTable ht)
{
- setaliases(pm, ht, 1, DISABLED);
+ setaliases(aliastab, pm, ht, ALIAS_GLOBAL|DISABLED);
}
/**/
-static HashNode
-getalias(HashTable ht, char *name, int global, int dis)
+static void
+setpmsaliases(Param pm, HashTable ht)
{
- Param pm = NULL;
- Alias al;
+ setaliases(sufaliastab, pm, ht, ALIAS_SUFFIX);
+}
- pm = (Param) zhalloc(sizeof(struct param));
- pm->nam = dupstring(name);
+/**/
+static void
+setpmdissaliases(Param pm, HashTable ht)
+{
+ setaliases(sufaliastab, pm, ht, ALIAS_SUFFIX|DISABLED);
+}
+
+/**/
+static void
+assignaliasdefs(Param pm, int flags)
+{
pm->flags = PM_SCALAR;
- pm->sets.cfn = (global ? (dis ? setpmdisgalias : setpmgalias) :
- (dis ? setpmdisralias : setpmralias));
+
+ /* we really need to squirrel the flags away somewhere... */
+ switch (flags) {
+ case 0:
+ pm->sets.cfn = setpmralias;
+ break;
+
+ case ALIAS_GLOBAL:
+ pm->sets.cfn = setpmgalias;
+ break;
+
+ case ALIAS_SUFFIX:
+ pm->sets.cfn = setpmsalias;
+ break;
+
+ case DISABLED:
+ pm->sets.cfn = setpmdisralias;
+ break;
+
+ case ALIAS_GLOBAL|DISABLED:
+ pm->sets.cfn = setpmdisgalias;
+ break;
+
+ case ALIAS_SUFFIX|DISABLED:
+ pm->sets.cfn = setpmdissalias;
+ break;
+ }
+
pm->gets.cfn = strgetfn;
- pm->unsetfn = unsetpmalias;
+ if (flags & ALIAS_SUFFIX)
+ pm->unsetfn = unsetpmsalias;
+ else
+ pm->unsetfn = unsetpmalias;
pm->ct = 0;
pm->env = NULL;
pm->ename = NULL;
pm->old = NULL;
pm->level = 0;
- if ((al = (Alias) aliastab->getnode2(aliastab, name)) &&
- ((global && (al->flags & ALIAS_GLOBAL)) ||
- (!global && !(al->flags & ALIAS_GLOBAL))) &&
- (dis ? (al->flags & DISABLED) : !(al->flags & DISABLED)))
+}
+
+/**/
+static HashNode
+getalias(HashTable alht, HashTable ht, char *name, int flags)
+{
+ Param pm = NULL;
+ Alias al;
+
+ pm = (Param) zhalloc(sizeof(struct param));
+ pm->nam = dupstring(name);
+
+ assignaliasdefs(pm, flags);
+
+ if ((al = (Alias) alht->getnode2(alht, name)) &&
+ flags == al->flags)
pm->u.str = dupstring(al->text);
else {
pm->u.str = dupstring("");
@@ -1767,61 +1837,64 @@
static HashNode
getpmralias(HashTable ht, char *name)
{
- return getalias(ht, name, 0, 0);
+ return getalias(aliastab, ht, name, 0);
}
/**/
static HashNode
getpmdisralias(HashTable ht, char *name)
{
- return getalias(ht, name, 0, 0);
+ return getalias(aliastab, ht, name, DISABLED);
}
/**/
static HashNode
getpmgalias(HashTable ht, char *name)
{
- return getalias(ht, name, 1, 0);
+ return getalias(aliastab, ht, name, ALIAS_GLOBAL);
}
/**/
static HashNode
getpmdisgalias(HashTable ht, char *name)
{
- return getalias(ht, name, 1, DISABLED);
+ return getalias(aliastab, ht, name, ALIAS_GLOBAL|DISABLED);
+}
+
+/**/
+static HashNode
+getpmsalias(HashTable ht, char *name)
+{
+ return getalias(sufaliastab, ht, name, ALIAS_SUFFIX);
+}
+
+/**/
+static HashNode
+getpmdissalias(HashTable ht, char *name)
+{
+ return getalias(sufaliastab, ht, name, ALIAS_SUFFIX|DISABLED);
}
/**/
static void
-scanaliases(HashTable ht, ScanFunc func, int flags, int global, int dis)
+scanaliases(HashTable alht, HashTable ht, ScanFunc func,
+ int pmflags, int alflags)
{
struct param pm;
int i;
- HashNode hn;
Alias al;
- pm.flags = PM_SCALAR;
- pm.sets.cfn = (global ? (dis ? setpmdisgalias : setpmgalias) :
- (dis ? setpmdisralias : setpmralias));
- pm.gets.cfn = strgetfn;
- pm.unsetfn = unsetpmalias;
- pm.ct = 0;
- pm.env = NULL;
- pm.ename = NULL;
- pm.old = NULL;
- pm.level = 0;
-
- for (i = 0; i < aliastab->hsize; i++)
- for (hn = aliastab->nodes[i]; hn; hn = hn->next) {
- if (((global && ((al = (Alias) hn)->flags & ALIAS_GLOBAL)) ||
- (!global && !((al = (Alias) hn)->flags & ALIAS_GLOBAL))) &&
- (dis ? (al->flags & DISABLED) : !(al->flags & DISABLED))) {
- pm.nam = hn->nam;
+ assignaliasdefs(&pm, alflags);
+
+ for (i = 0; i < alht->hsize; i++)
+ for (al = (Alias) alht->nodes[i]; al; al = (Alias) al->next) {
+ if (alflags == al->flags) {
+ pm.nam = al->nam;
if (func != scancountparams &&
- ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
- !(flags & SCANPM_WANTKEYS)))
+ ((pmflags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
+ !(pmflags & SCANPM_WANTKEYS)))
pm.u.str = dupstring(al->text);
- func((HashNode) &pm, flags);
+ func((HashNode) &pm, pmflags);
}
}
}
@@ -1830,28 +1903,42 @@
static void
scanpmraliases(HashTable ht, ScanFunc func, int flags)
{
- scanaliases(ht, func, flags, 0, 0);
+ scanaliases(aliastab, ht, func, flags, 0);
}
/**/
static void
scanpmdisraliases(HashTable ht, ScanFunc func, int flags)
{
- scanaliases(ht, func, flags, 0, DISABLED);
+ scanaliases(aliastab, ht, func, flags, DISABLED);
}
/**/
static void
scanpmgaliases(HashTable ht, ScanFunc func, int flags)
{
- scanaliases(ht, func, flags, 1, 0);
+ scanaliases(aliastab, ht, func, flags, ALIAS_GLOBAL);
}
/**/
static void
scanpmdisgaliases(HashTable ht, ScanFunc func, int flags)
{
- scanaliases(ht, func, flags, 1, DISABLED);
+ scanaliases(aliastab, ht, func, flags, ALIAS_GLOBAL|DISABLED);
+}
+
+/**/
+static void
+scanpmsaliases(HashTable ht, ScanFunc func, int flags)
+{
+ scanaliases(sufaliastab, ht, func, flags, ALIAS_SUFFIX);
+}
+
+/**/
+static void
+scanpmdissaliases(HashTable ht, ScanFunc func, int flags)
+{
+ scanaliases(sufaliastab, ht, func, flags, ALIAS_SUFFIX|DISABLED);
}
/* Table for defined parameters. */
@@ -1932,11 +2019,17 @@
{ "galiases", 0,
getpmgalias, scanpmgaliases, setpmgaliases,
NULL, NULL, stdunsetfn, NULL },
+ { "saliases", 0,
+ getpmsalias, scanpmsaliases, setpmsaliases,
+ NULL, NULL, stdunsetfn, NULL },
{ "dis_aliases", 0,
getpmdisralias, scanpmdisraliases, setpmdisraliases,
NULL, NULL, stdunsetfn, NULL },
{ "dis_galiases", 0,
getpmdisgalias, scanpmdisgaliases, setpmdisgaliases,
+ NULL, NULL, stdunsetfn, NULL },
+ { "dis_saliases", 0,
+ getpmdissalias, scanpmdissaliases, setpmdissaliases,
NULL, NULL, stdunsetfn, NULL },
{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
};
--
Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
Work: pws@csr.com
Web: http://www.pwstephenson.fsnet.co.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PATCH: suffix aliases
2003-09-02 21:11 PATCH: suffix aliases Peter Stephenson
@ 2003-09-02 23:37 ` DervishD
2003-09-03 7:55 ` Oliver Kiddle
1 sibling, 0 replies; 6+ messages in thread
From: DervishD @ 2003-09-02 23:37 UTC (permalink / raw)
To: Peter Stephenson; +Cc: Zsh hackers list
Hi Peter :)
* Peter Stephenson <pws@pwstephenson.fsnet.co.uk> dixit:
> This adds aliases for suffixes, so that after
> alias -s ps=gv
> attempting to run a command called foo.ps will call `gv foo.ps'.
Hey, that's a very good and useful feature. I really *loved* that
one back in the days of 4DOS. This feature is something I've been
missing since I use Linux.
Raúl Núñez de Arenas Coronado
--
Linux Registered User 88736
http://www.pleyades.net & http://raul.pleyades.net/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PATCH: suffix aliases
2003-09-02 21:11 PATCH: suffix aliases Peter Stephenson
2003-09-02 23:37 ` DervishD
@ 2003-09-03 7:55 ` Oliver Kiddle
2003-09-03 10:38 ` Peter Stephenson
1 sibling, 1 reply; 6+ messages in thread
From: Oliver Kiddle @ 2003-09-03 7:55 UTC (permalink / raw)
To: Zsh hackers list
Peter wrote:
> This adds aliases for suffixes, so that after
>
> alias -s ps=gv
>
> attempting to run a command called foo.ps will call `gv foo.ps'.
>
> I could have used `alias .ps=gv' in the way 4DOS did, but as zsh aliases
> can be more or less anything it seemed more natural to have a completely
> separate table.
That makes sense.
Used to like that in 4DOS too myself. Was the only piece of shareware I
ever registered.
> I stuck with suffixes instead of patterns, which would have been less
> efficient and more complicated for little extra gain.
That's a pity. I have preexec testing for <-> and other combinations
like (#b)(<->).(<->) so that I can type numbers to get at MH messages.
I then need a few strategic alias 11='nocorrect 11' so that correction
doesn't offer me X11 or whatever as a correction. With pattern aliases,
back references could disable substituting the word as the last
argument which might have other uses such as commands which don't want
the file as the last argument (e.g. mozilla -remote).
>From the perspective of handling mime types and easier completion there
might be an argument for having both pattern and suffix completion.
Suffix completion could actually look for files, perhaps in it's own
path array and could allow the suffix to be omitted. So for wine
programs you wouldn't need to type the .exe and could put the program
directories in a suffix path.
> I dutifully added completion to _alias, but it seems that doesn't
> understand the difference between aliases with different options, so I
There isn't much point: completing existing aliases when defining new
ones isn't that useful anyway.
Oliver
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PATCH: suffix aliases
2003-09-03 7:55 ` Oliver Kiddle
@ 2003-09-03 10:38 ` Peter Stephenson
2003-09-03 12:33 ` Oliver Kiddle
0 siblings, 1 reply; 6+ messages in thread
From: Peter Stephenson @ 2003-09-03 10:38 UTC (permalink / raw)
To: Zsh hackers list
Oliver Kiddle wrote:
> > I stuck with suffixes instead of patterns, which would have been less
> > efficient and more complicated for little extra gain.
>
> That's a pity.
Patterns would need to be array-based rather than hash-based. That way
you don't get a hit if you don't have any pattern aliases. It's not
at all technically difficult to add. I think we need suffix aliases for
efficiency anyway.
> > I dutifully added completion to _alias, but it seems that doesn't
> > understand the difference between aliases with different options, so I
>
> There isn't much point: completing existing aliases when defining new
> ones isn't that useful anyway.
It would be useful when trying to output existing messages. I'm a bit
bemused why _aliases goes to all that trouble of sorting aliases into
type but _alias doesn't use it.
pws
**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential
and/or privileged material.
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by
persons or entities other than the intended recipient is
prohibited.
If you received this in error, please contact the sender and
delete the material from any computer.
**********************************************************************
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PATCH: suffix aliases
2003-09-03 10:38 ` Peter Stephenson
@ 2003-09-03 12:33 ` Oliver Kiddle
2003-09-03 12:59 ` Peter Stephenson
0 siblings, 1 reply; 6+ messages in thread
From: Oliver Kiddle @ 2003-09-03 12:33 UTC (permalink / raw)
To: Zsh hackers list
Peter wrote:
>
> Patterns would need to be array-based rather than hash-based. That way
> you don't get a hit if you don't have any pattern aliases. It's not
> at all technically difficult to add. I think we need suffix aliases for
> efficiency anyway.
Okay. There's other things like correction that also work better with
suffix aliases being separate so I agree that's best.
I've just been trying them out. All looks good. A couple of the whence
outputs are not quite right by the way:
% alias -s c=nedit
% whence -v t.c
c is a suffix alias fornedit (missing space)
% whence -c t.c
c: suffix aliased to nedit (two spaces after `suffix')
I'm not particularly bothered but any thoughts on the suggestion of
suffix aliases checking for files in a special path and not needing the
suffix to be typed? This is closer to what 4DOS did; I'd be slightly
inclined towards not having the current directory in that path and it
could be useful for things like wine and java.
> > > I dutifully added completion to _alias, but it seems that doesn't
> > > understand the difference between aliases with different options, so I
> >
> > There isn't much point: completing existing aliases when defining new
> > ones isn't that useful anyway.
>
> It would be useful when trying to output existing messages. I'm a bit
> bemused why _aliases goes to all that trouble of sorting aliases into
> type but _alias doesn't use it.
You mean trying to output existing aliases right.
Was probably just laziness when _alias was written. Easy enough though.
Oliver
Index: Completion/Zsh/Command/_alias
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Command/_alias,v
retrieving revision 1.3
diff -u -r1.3 _alias
--- Completion/Zsh/Command/_alias 3 Sep 2003 10:15:35 -0000 1.3
+++ Completion/Zsh/Command/_alias 3 Sep 2003 12:19:15 -0000
@@ -1,11 +1,12 @@
#compdef alias
-local curcontext="$curcontext" state line suf
+local curcontext="$curcontext" state line type suf
+typeset -A opt_args
_arguments -C -s -A "-*" -S \
- '-+g[list or define global aliases]' \
- '-+r[list or define regular aliases]' \
- '-+s[list or define suffix aliases]' \
+ '(-r +r -s +s)-+g[list or define global aliases]' \
+ '(-g +g -s +s)-+r[list or define regular aliases]' \
+ '(-r +r -g +g)-+s[list or define suffix aliases]' \
'-+m[print aliases matching specified pattern]' \
'-L[print each alias in the form of calls to alias]' \
'*::alias definition:->defn'
@@ -16,6 +17,8 @@
_normal
else
compset -S '=*' || suf='='
- _wanted alias expl 'alias definition' _aliases -S "$suf"
+ type=( ${opt_args[(i)[-+][grs]]#?} )
+ (( $#type )) && type=( -s $type )
+ _wanted -x alias expl 'alias definition' _aliases -S "$suf" "$type[@]"
fi
fi
Index: Completion/Zsh/Command/_unhash
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Command/_unhash,v
retrieving revision 1.1
diff -u -r1.1 _unhash
--- Completion/Zsh/Command/_unhash 2 Apr 2001 11:31:42 -0000 1.1
+++ Completion/Zsh/Command/_unhash 3 Sep 2003 12:19:15 -0000
@@ -3,11 +3,12 @@
local expl state line curcontext="$curcontext"
_arguments -C -s -S \
- '(-a -f *)-d[remove named directories]:*:named directory:->nameddir' \
- '(-d -f *)-a[remove aliases]:*:aliases:_aliases' \
- '(-d -a *)-f[remove functions]:*:functions:_functions' \
+ '(-a -f -s *)-d[remove named directories]:*:named directory:->nameddir' \
+ '(-d -f -s *)-a[remove aliases]:*:alias:_aliases' \
+ '(-a -d -f *)-s[remove suffix aliases]:*:suffix alias:_aliases -s s' \
+ '(-d -a -s *)-f[remove functions]:*:function:_functions' \
'-m[treat arguments as patterns]' \
- '(-a -d -f -m)*:commands: _command_names -e' && return 0
+ '(-a -d -f -m)*:command: _command_names -e' && return 0
[[ "$state" = nameddir ]] &&
_wanted named-directories expl 'named directory' compadd -k nameddirs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PATCH: suffix aliases
2003-09-03 12:33 ` Oliver Kiddle
@ 2003-09-03 12:59 ` Peter Stephenson
0 siblings, 0 replies; 6+ messages in thread
From: Peter Stephenson @ 2003-09-03 12:59 UTC (permalink / raw)
To: Zsh hackers list
Oliver Kiddle wrote:
> I've just been trying them out. All looks good. A couple of the whence
> outputs are not quite right by the way:
> % alias -s c=nedit
> % whence -v t.c
> c is a suffix alias fornedit (missing space)
> % whence -c t.c
> c: suffix aliased to nedit (two spaces after `suffix')
Fixed below.
> I'm not particularly bothered but any thoughts on the suggestion of
> suffix aliases checking for files in a special path and not needing the
> suffix to be typed? This is closer to what 4DOS did; I'd be slightly
> inclined towards not having the current directory in that path and it
> could be useful for things like wine and java.
Hmm... it's not completely trivial, you need to trawl the entire special
path using the entire suffix alias list. This is sounding a bit more
like a job for a handler for ENOENT or ENOEXEC on execution, perhaps.
We could run a function if a programme wasn't found and that could do
the checking.
Index: Src/hashtable.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/hashtable.c,v
retrieving revision 1.14
diff -u -r1.14 hashtable.c
--- Src/hashtable.c 3 Sep 2003 10:15:36 -0000 1.14
+++ Src/hashtable.c 3 Sep 2003 12:51:39 -0000
@@ -1119,7 +1119,7 @@
printf("suffix ");
else if (a->flags & ALIAS_GLOBAL)
printf("globally ");
- printf (" aliased to ");
+ printf ("aliased to ");
nicezputs(a->text, stdout);
putchar('\n');
return;
@@ -1134,7 +1134,7 @@
printf(" global");
else
printf("n");
- printf(" alias for");
+ printf(" alias for ");
nicezputs(a->text, stdout);
putchar('\n');
return;
--
Peter Stephenson <pws@csr.com> Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070
**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential
and/or privileged material.
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by
persons or entities other than the intended recipient is
prohibited.
If you received this in error, please contact the sender and
delete the material from any computer.
**********************************************************************
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-09-03 13:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-09-02 21:11 PATCH: suffix aliases Peter Stephenson
2003-09-02 23:37 ` DervishD
2003-09-03 7:55 ` Oliver Kiddle
2003-09-03 10:38 ` Peter Stephenson
2003-09-03 12:33 ` Oliver Kiddle
2003-09-03 12:59 ` Peter Stephenson
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).