diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2015-01-19 15:04:21 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2015-01-19 15:04:21 -0500 |
| commit | 1edb5cb33d55a4f866c799d41680088b927f7846 (patch) | |
| tree | 5f74270aa4eae77f6057c1d038ce8da88f5f38da /builtin.c | |
| parent | 2d3f4ffebcb451da84ceb8a4be58bbb23946ee6e (diff) | |
| parent | f77c13a546af58cb8cdb593f49bbfa844b10dd7e (diff) | |
| download | egawk-1edb5cb33d55a4f866c799d41680088b927f7846.tar.gz egawk-1edb5cb33d55a4f866c799d41680088b927f7846.tar.bz2 egawk-1edb5cb33d55a4f866c799d41680088b927f7846.zip | |
Merge branch 'master' into select
Diffstat (limited to 'builtin.c')
| -rw-r--r-- | builtin.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -3,7 +3,7 @@ */ /* - * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc. + * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. @@ -510,6 +510,9 @@ do_length(int nargs) * Support for deferred loading of array elements requires that * we use the array length interface even though it isn't * necessary for the built-in array types. + * + * 1/2015: The deferred arrays are gone, but this is probably + * still a good idea. */ size = assoc_length(tmp); @@ -904,7 +907,10 @@ check_pos: case '*': if (cur == NULL) break; - if (! do_traditional && isdigit((unsigned char) *s1)) { + if (! do_traditional && used_dollar && ! isdigit((unsigned char) *s1)) { + fatal(_("fatal: must use `count$' on all formats or none")); + break; /* silence warnings */ + } else if (! do_traditional && isdigit((unsigned char) *s1)) { int val = 0; for (; n0 > 0 && *s1 && isdigit((unsigned char) *s1); s1++, n0--) { |