aboutsummaryrefslogtreecommitdiff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2015-04-15 18:14:27 +0100
committerPeter Stephenson <pws@zsh.org>2015-04-15 18:14:27 +0100
commit493fe2b4440679ca73d9022d94129039b9eacfeb (patch)
tree5dc08f43f7f5b06857c835506d63c41dee024350 /Src
parent2ef4b38461dfb554ed2226d9de8958703bc00b98 (diff)
downloadzsh-493fe2b4440679ca73d9022d94129039b9eacfeb.tar.gz
zsh-493fe2b4440679ca73d9022d94129039b9eacfeb.tar.xz
zsh-493fe2b4440679ca73d9022d94129039b9eacfeb.zip
unposted: rewrite Nularg math handling to be like other cases
Diffstat (limited to 'Src')
-rw-r--r--Src/math.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Src/math.c b/Src/math.c
index 2105180c8..97a97b32b 100644
--- a/Src/math.c
+++ b/Src/math.c
@@ -1398,7 +1398,9 @@ matheval(char *s)
if (!mlevel)
outputradix = outputunderscore = 0;
- if (!*s || *s == Nularg) {
+ if (*s == Nularg)
+ s++;
+ if (!*s) {
x.type = MN_INTEGER;
x.u.l = 0;
return x;
@@ -1435,7 +1437,9 @@ mathevalarg(char *s, char **ss)
*
* To avoid a more opaque error further in, bail out here.
*/
- if (!*s || *s == Nularg) {
+ if (*s == Nularg)
+ s++;
+ if (!*s) {
zerr("bad math expression: empty string");
return (zlong)0;
}