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

manual/7915

Browse source
This commit is contained in:
Tanaka Akira 1999-09-17 15:12:01 +00:00
parent 77c1b9a3d4
commit d0f024f152
12 changed files with 812 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Src/subst.c
View file

@ -685,7 +685,7 @@ get_intarg(char **s)
singsub(&p);
if (errflag)
return -1;
ret = matheval(p);
ret = mathevali(p);
if (errflag)
return -1;
if (ret < 0)
@ -1045,6 +1045,8 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
case PM_SCALAR: val = "scalar"; break;
case PM_ARRAY: val = "array"; break;
case PM_INTEGER: val = "integer"; break;
case PM_EFLOAT:
case PM_FFLOAT: val = "float"; break;
case PM_HASHED: val = "association"; break;
}
val = dupstring(val);
@ -1823,12 +1825,16 @@ arithsubst(char *a, char **bptr, char *rest)
{
char *s = *bptr, *t;
char buf[DIGBUFSIZE], *b = buf;
zlong v;
mnumber v;
singsub(&a);
v = matheval(a);
convbase(buf, v, 0);
t = *bptr = (char *)ncalloc(strlen(*bptr) + strlen(buf) + strlen(rest) + 1);
if (v.type & MN_FLOAT)
b = convfloat(v.u.d, 0, 0, NULL);
else
convbase(buf, v.u.l, 0);
t = *bptr = (char *)ncalloc(strlen(*bptr) + strlen(b) +
strlen(rest) + 1);
t--;
while ((*++t = *s++));
t--;