diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-11-09 09:31:08 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-11-09 09:31:08 -0500 |
| commit | e7bf93d184c1aaf14e5f8e5cf8a517582eb49f23 (patch) | |
| tree | 050f2268b305f56237c8e6ca03358c596f96ef95 | |
| parent | d0299eb46c0f4551d355591a58e88715fee139e7 (diff) | |
| parent | f9098699afea06c80045a6e7ab0ff819a29da84f (diff) | |
| download | egawk-e7bf93d184c1aaf14e5f8e5cf8a517582eb49f23.tar.gz egawk-e7bf93d184c1aaf14e5f8e5cf8a517582eb49f23.tar.bz2 egawk-e7bf93d184c1aaf14e5f8e5cf8a517582eb49f23.zip | |
Merge branch 'master' into select
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | awklib/ChangeLog | 5 | ||||
| -rw-r--r-- | awklib/Makefile.am | 2 | ||||
| -rw-r--r-- | awklib/Makefile.in | 2 | ||||
| -rw-r--r-- | gawkapi.c | 5 |
5 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2014-11-09 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * gawkapi.c (node_to_awk_value): When the type wanted is AWK_UNDEFINED + and a it's a Node_val set to Nnull_string, return AWK_UNDEFINED instead + of AWK_NUMBER 0. + 2014-11-06 Andrew J. Schorr <aschorr@telemetry-investments.com> * awk.h (redirect_string): First argument should be const. Add a new diff --git a/awklib/ChangeLog b/awklib/ChangeLog index 13d6b090..bede4234 100644 --- a/awklib/ChangeLog +++ b/awklib/ChangeLog @@ -1,3 +1,8 @@ +2014-11-05 Juergen Kahrs <juergen.kahrs@googlemail.com> + + * Makefile.am (AWKPROG): Add quotes around the name in case the + build dir has spaces in it. + 2014-10-17 Andrew J. Schorr <aschorr@telemetry-investments.com> * Makefile.am (stamp-eg): Use explicit ./extract.awk to avoid diff --git a/awklib/Makefile.am b/awklib/Makefile.am index c1d58780..27bb269f 100644 --- a/awklib/Makefile.am +++ b/awklib/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg if TEST_CROSS_COMPILE AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT) else -AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT) +AWKPROG = LC_ALL=C LANG=C "$(abs_top_builddir)/gawk$(EXEEXT)" endif # Get config.h from the build directory and custom.h from the source directory. diff --git a/awklib/Makefile.in b/awklib/Makefile.in index cb8097bf..611d2193 100644 --- a/awklib/Makefile.in +++ b/awklib/Makefile.in @@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg -@TEST_CROSS_COMPILE_FALSE@AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT) +@TEST_CROSS_COMPILE_FALSE@AWKPROG = LC_ALL=C LANG=C "$(abs_top_builddir)/gawk$(EXEEXT)" # With some locales, the script extract.awk fails. # So we fix the locale to some sensible value. @TEST_CROSS_COMPILE_TRUE@AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT) @@ -446,7 +446,10 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) case AWK_UNDEFINED: /* return true and actual type for request of undefined */ - if ((node->flags & NUMBER) != 0) { + if (node == Nnull_string) { + val->val_type = AWK_UNDEFINED; + ret = awk_true; + } else if ((node->flags & NUMBER) != 0) { val->val_type = AWK_NUMBER; val->num_value = get_number_d(node); ret = awk_true; |