* PATCH: retrieving array as number
@ 2007-06-12 15:36 Peter Stephenson
0 siblings, 0 replies; only message in thread
From: Peter Stephenson @ 2007-06-12 15:36 UTC (permalink / raw)
To: Zsh hackers list
% array=(42)
% print $(( array ))
0
This looks wrong to me. I've passed the result to matheval(), which is
what we do with scalars, after sticking together with $IFS[0]. This
makes things like
array=(1 + 2)
work, assuming $IFS[0] is whitespace. If it isn't, well, I tried.
(There's no obvious reason why
array=(1 2 3)
IFS=+ eval 'print $(( array ))'
shouldn't output 6, so it does.)
Index: Src/params.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/params.c,v
retrieving revision 1.129
diff -u -r1.129 params.c
--- Src/params.c 29 May 2007 14:16:03 -0000 1.129
+++ Src/params.c 12 Jun 2007 15:30:34 -0000
@@ -1941,10 +1941,18 @@
mod_export zlong
getintvalue(Value v)
{
- if (!v || v->isarr)
+ if (!v)
return 0;
if (v->inv)
return v->start;
+ if (v->isarr) {
+ char **arr = getarrvalue(v);
+ if (arr) {
+ char *scal = sepjoin(arr, NULL, 1);
+ return mathevali(scal);
+ } else
+ return 0;
+ }
if (PM_TYPE(v->pm->node.flags) == PM_INTEGER)
return v->pm->gsu.i->getfn(v->pm);
if (v->pm->node.flags & (PM_EFLOAT|PM_FFLOAT))
@@ -1959,10 +1967,18 @@
mnumber mn;
mn.type = MN_INTEGER;
- if (!v || v->isarr) {
+
+ if (!v) {
mn.u.l = 0;
} else if (v->inv) {
mn.u.l = v->start;
+ } else if (v->isarr) {
+ char **arr = getarrvalue(v);
+ if (arr) {
+ char *scal = sepjoin(arr, NULL, 1);
+ return matheval(scal);
+ } else
+ mn.u.l = 0;
} else if (PM_TYPE(v->pm->node.flags) == PM_INTEGER) {
mn.u.l = v->pm->gsu.i->getfn(v->pm);
} else if (v->pm->node.flags & (PM_EFLOAT|PM_FFLOAT)) {
--
Peter Stephenson <pws@csr.com> Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070
To access the latest news from CSR copy this link into a web browser: http://www.csr.com/email_sig.php
To get further information regarding CSR, please visit our Investor Relations page at http://ir.csr.com/csr/about/overview
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-06-12 15:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-06-12 15:36 PATCH: retrieving array as number 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).