mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00
Code Releases Activity

make _tags use C-code for braces in tag-order values; and misc. stuff (10775)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-04-17 08:04:42 +00:00
parent 8c474bbcd4
commit cd45aa331d
5 changed files with 56 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Src/Zle/computil.c
View file

@ -2425,42 +2425,64 @@ bin_comptry(char *nam, char **args, char *ops, int func)
s++;
*p = '\0';
if (*q) {
char *qq = dupstring(q);
char *qq, *qqq;
if (c)
*c = '\0';
qqq = qq = dupstring(q);
while (*qqq) {
if (qqq == qq || qqq[-1] != '\\') {
if (*qqq == '{')
*qqq = Inbrace;
else if (*qqq == '}')
*qqq = Outbrace;
else if (*qqq == ',')
*qqq = Comma;
}
qqq++;
}
tokenize(qq);
if (haswilds(qq)) {
if (haswilds(qq) || hasbraces(qq)) {
Patprog prog;
LinkNode node;
LinkNode bnode, node;
LinkList blist = newlinklist();
if ((prog = patcompile(qq, PAT_STATIC, NULL))) {
char **a, *n;
int l = (c ? strlen(c + 1) + 2 : 1), al;
addlinknode(blist, qq);
for (bnode = firstnode(blist); bnode; incnode(bnode))
while (hasbraces(getdata(bnode)))
xpandbraces(blist, &bnode);
for (a = all; *a; a++) {
for (node = firstnode(list); node;
incnode(node)) {
char *as, *ls;
for (bnode = firstnode(blist); bnode; incnode(bnode)) {
qq = (char *) getdata(bnode);
if ((prog = patcompile(qq, PAT_STATIC, NULL))) {
char **a, *n;
int l = (c ? strlen(c + 1) + 2 : 1), al;
for (as = *a, ls = (char *) getdata(node);
*as && *ls && *ls != ':'; as++, ls++)
if (*as != *ls)
for (a = all; *a; a++) {
for (node = firstnode(list); node;
incnode(node)) {
char *as, *ls;
for (as = *a, ls = (char *) getdata(node);
*as && *ls && *ls != ':'; as++, ls++)
if (*as != *ls)
break;
if (!*as && (!*ls || *ls == ':'))
break;
if (!*as && (!*ls || *ls == ':'))
break;
}
if (node)
continue;
if (pattry(prog, *a)) {
n = (char *) zhalloc((al = strlen(*a)) + l);
strcpy(n, *a);
if (c) {
n[al] = ':';
strcpy(n + al + 1, c + 1);
}
addlinknode(list, n);
num++;
if (node)
continue;
if (pattry(prog, *a)) {
n = (char *) zhalloc((al = strlen(*a)) + l);
strcpy(n, *a);
if (c) {
n[al] = ':';
strcpy(n + al + 1, c + 1);
}
addlinknode(list, n);
num++;
}
}
}
}