mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 17:24:50 +01:00
Code Releases Activity

UNREVIEWED: Further optimizations

Browse source
This commit is contained in:
Daniel Shahaf 2015-12-13 14:56:43 +00:00 committed by Mikael Magnusson
parent 3062f6aef1
commit 7db77ff1bb
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Src/builtin.c
View file

@ -3404,7 +3404,7 @@ bin_unset(char *name, char **argv, Options ops, int func)
} else { } else {
/* start is after the element for reverse index */ /* start is after the element for reverse index */
int start = vbuf.start - !!(vbuf.flags & VALFLAG_INV); int start = vbuf.start - !!(vbuf.flags & VALFLAG_INV);
if (start < arrlen(vbuf.pm->u.arr)) { if (start < vbuf.pm->length) {
char *arr[2]; char *arr[2];
arr[0] = ""; arr[0] = "";
arr[1] = 0; arr[1] = 0;

28
Src/params.c
View file

@ -1452,7 +1452,7 @@ getarg(char **str, int *inv, Value v, int a2, zlong *w,
ta = getarrvalue(v); ta = getarrvalue(v);
if (!ta || !*ta) if (!ta || !*ta)
return !down; return !down;
len = arrlen(ta); len = v->pm->length;
if (beg < 0) if (beg < 0)
beg += len; beg += len;
if (down) { if (down) {
@ -1475,7 +1475,7 @@ getarg(char **str, int *inv, Value v, int a2, zlong *w,
} }
} else if (word) { } else if (word) {
ta = sepsplit(d = s = getstrvalue(v), sep, 1, 1); ta = sepsplit(d = s = getstrvalue(v), sep, 1, 1);
len = arrlen(ta); len = v->pm->length;
if (beg < 0) if (beg < 0)
beg += len; beg += len;
if (down) { if (down) {
@ -2026,8 +2026,8 @@ getstrvalue(Value v)
s = sepjoin(ss, NULL, 1); s = sepjoin(ss, NULL, 1);
else { else {
if (v->start < 0) if (v->start < 0)
v->start += arrlen(ss); v->start += v->pm->length;
s = (v->start >= arrlen(ss) || v->start < 0) ? s = (v->start >= v->pm->length || v->start < 0) ?
(char *) hcalloc(1) : ss[v->start]; (char *) hcalloc(1) : ss[v->start];
} }
return s; return s;
@ -2223,16 +2223,16 @@ getarrvalue(Value v)
if (v->start == 0 && v->end == -1) if (v->start == 0 && v->end == -1)
return s; return s;
if (v->start < 0) if (v->start < 0)
v->start += arrlen(s); v->start += v->pm->length;
if (v->end < 0) if (v->end < 0)
v->end += arrlen(s) + 1; v->end += v->pm->length + 1;
if (v->start > arrlen(s) || v->start < 0) if (v->start > v->pm->length || v->start < 0)
s = arrdup(nular); s = arrdup(nular);
else else
s = arrdup(s + v->start); s = arrdup(s + v->start);
if (v->end <= v->start) if (v->end <= v->start)
s[0] = NULL; s[0] = NULL;
else if (v->end - v->start <= arrlen(s)) else if (v->end - v->start <= v->pm->length)
s[v->end - v->start] = NULL; s[v->end - v->start] = NULL;
return s; return s;
} }
@ -2555,7 +2555,7 @@ setarrvalue(Value v, char **val)
char **const old = v->pm->gsu.a->getfn(v->pm); char **const old = v->pm->gsu.a->getfn(v->pm);
char **new; char **new;
char **p, **q, **r; /* index variables */ char **p, **q, **r; /* index variables */
const int pre_assignment_length = arrlen(old); const int pre_assignment_length = v->pm->length;
int post_assignment_length; int post_assignment_length;
int i; int i;
@ -2810,7 +2810,7 @@ assignsparam(char *s, char *val, int flags)
return v->pm; /* avoid later setstrvalue() call */ return v->pm; /* avoid later setstrvalue() call */
case PM_ARRAY: case PM_ARRAY:
if (unset(KSHARRAYS)) { if (unset(KSHARRAYS)) {
v->start = arrlen(v->pm->gsu.a->getfn(v->pm)); v->start = v->pm->length;
v->end = v->start + 1; v->end = v->start + 1;
} else { } else {
/* ksh appends scalar to first element */ /* ksh appends scalar to first element */
@ -2938,7 +2938,9 @@ assignaparam(char *s, char **val, int flags)
if (flags & ASSPM_AUGMENT) { if (flags & ASSPM_AUGMENT) {
if (v->start == 0 && v->end == -1) { if (v->start == 0 && v->end == -1) {
if (PM_TYPE(v->pm->node.flags) & PM_ARRAY) { if (PM_TYPE(v->pm->node.flags) & PM_ARRAY) {
v->start = arrlen(v->pm->gsu.a->getfn(v->pm)); v->start =
//arrlen(v->pm->gsu.a->getfn(v->pm));
v->pm->length;
v->end = v->start + 1; v->end = v->start + 1;
} else if (PM_TYPE(v->pm->node.flags) & PM_HASHED) } else if (PM_TYPE(v->pm->node.flags) & PM_HASHED)
v->start = -1, v->end = 0; v->start = -1, v->end = 0;
@ -2946,7 +2948,9 @@ assignaparam(char *s, char **val, int flags)
if (v->end > 0) if (v->end > 0)
v->start = v->end--; v->start = v->end--;
else if (PM_TYPE(v->pm->node.flags) & PM_ARRAY) { else if (PM_TYPE(v->pm->node.flags) & PM_ARRAY) {
v->end = arrlen(v->pm->gsu.a->getfn(v->pm)) + v->end; v->end
//= arrlen(v->pm->gsu.a->getfn(v->pm)) + v->end;
+= v->pm->length;
v->start = v->end + 1; v->start = v->end + 1;
} }
} }