[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-305
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-3050-gf6a89a9 |
|
Date: |
Fri, 21 Sep 2018 05:44:51 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk-4.2-stable has been updated
via f6a89a9b3ecd956e97b61719ea0d634886ace814 (commit)
via 53175840c18d19259ec11128bdda64cad71ac8dc (commit)
via 0f509ca515b41544df4a48bc672c8a3af847cbe4 (commit)
from c80262bd52c0f1631e9a0aeebf7b732afb76d76f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=f6a89a9b3ecd956e97b61719ea0d634886ace814
commit f6a89a9b3ecd956e97b61719ea0d634886ace814
Author: Arnold D. Robbins <address@hidden>
Date: Fri Sep 21 12:44:21 2018 +0300
Sync files from GNULIB.
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index 2990bd3..6752ddc 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-21 Arnold D. Robbins <address@hidden>
+
+ * intprops.h, mktime.c, verify.h: Updated from GNULIB.
+ * mktime-internal.h: New file, imported from GNULIB.
+
2018-09-07 Arnold D. Robbins <address@hidden>
* intprops.h, mktime.c: Updated from GNULIB.
diff --git a/missing_d/intprops.h b/missing_d/intprops.h
index a4be30b..9702aec 100644
--- a/missing_d/intprops.h
+++ b/missing_d/intprops.h
@@ -342,8 +342,8 @@
Arguments should be free of side effects. */
#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \
op_result_overflow (a, b, \
- _GL_INT_MINIMUM ((1 ? 0 : (b)) + (a)), \
- _GL_INT_MAXIMUM ((1 ? 0 : (b)) + (a)))
+ _GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \
+ _GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b)))
/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
Return 1 if the result overflows. See above for restrictions. */
diff --git a/missing_d/mktime.c b/missing_d/mktime.c
index 1a332e1..3ecab0d 100644
--- a/missing_d/mktime.c
+++ b/missing_d/mktime.c
@@ -76,11 +76,7 @@
# define NEED_MKTIME_WORKING DEBUG_MKTIME
#endif
-#ifdef _LIBC
-typedef long int mktime_offset_t;
-#else
# include "mktime-internal.h"
-#endif
#ifndef _LIBC
static void
@@ -531,7 +527,7 @@ mktime (struct tm *tp)
be set as if the tzset() function had been called. */
__tzset ();
-# if defined __LIBC || NEED_MKTIME_WORKING
+# if defined _LIBC || NEED_MKTIME_WORKING
static mktime_offset_t localtime_offset;
return __mktime_internal (tp, __localtime_r, &localtime_offset);
# else
diff --git a/missing_d/verify.h b/missing_d/verify.h
index bc7f99d..3b57dde 100644
--- a/missing_d/verify.h
+++ b/missing_d/verify.h
@@ -276,7 +276,8 @@ template <int w>
when 'assume' silences warnings even with older GCCs. */
# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
#else
-# define assume(R) ((void) (0 && (R)))
+ /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */
+# define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0)
#endif
/* @assert.h omit end@ */
diff --git a/support/ChangeLog b/support/ChangeLog
index 86e24b3..d426f53 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-21 Arnold D. Robbins <address@hidden>
+
+ * dfa.c, intprops.h: Sync from GNULIB.
+
2018-09-16 Arnold D. Robbins <address@hidden>
* Makefile.in: Regenerated, using Automake 1.16.1.
diff --git a/support/dfa.c b/support/dfa.c
index 41df67b..86eb677 100644
--- a/support/dfa.c
+++ b/support/dfa.c
@@ -257,43 +257,19 @@ enum
end of input; any value of END or less in
the parse tree is such a symbol. Accepting
states of the DFA are those that would have
- a transition on END. */
+ a transition on END. This is -1, not some
+ more-negative value, to tweak the speed of
+ comparisons to END. */
/* Ordinary character values are terminal symbols that match themselves. */
+ /* CSET must come last in the following list of special tokens. Otherwise,
+ the list order matters only for performance. Related special tokens
+ should have nearby values so that code like (t == ANYCHAR || t == MBCSET
+ || CSET <= t) can be done with a single machine-level comparison. */
EMPTY = NOTCHAR, /* EMPTY is a terminal symbol that matches
the empty string. */
- BACKREF, /* BACKREF is generated by \<digit>
- or by any other construct that
- is not completely handled. If the scanner
- detects a transition on backref, it returns
- a kind of "semi-success" indicating that
- the match will have to be verified with
- a backtracking matcher. */
-
- BEGLINE, /* BEGLINE is a terminal symbol that matches
- the empty string at the beginning of a
- line. */
-
- ENDLINE, /* ENDLINE is a terminal symbol that matches
- the empty string at the end of a line. */
-
- BEGWORD, /* BEGWORD is a terminal symbol that matches
- the empty string at the beginning of a
- word. */
-
- ENDWORD, /* ENDWORD is a terminal symbol that matches
- the empty string at the end of a word. */
-
- LIMWORD, /* LIMWORD is a terminal symbol that matches
- the empty string at the beginning or the
- end of a word. */
-
- NOTLIMWORD, /* NOTLIMWORD is a terminal symbol that
- matches the empty string not at
- the beginning or end of a word. */
-
QMARK, /* QMARK is an operator of one argument that
matches zero or one occurrences of its
argument. */
@@ -323,15 +299,47 @@ enum
RPAREN, /* RPAREN never appears in the parse tree. */
+ WCHAR, /* Only returned by lex. wctok contains
+ the wide character representation. */
ANYCHAR, /* ANYCHAR is a terminal symbol that matches
a valid multibyte (or single byte)
character.
It is used only if MB_CUR_MAX > 1. */
+ BEG, /* BEG is an initial symbol that matches the
+ beginning of input. */
+
+ BEGLINE, /* BEGLINE is a terminal symbol that matches
+ the empty string at the beginning of a
+ line. */
+
+ ENDLINE, /* ENDLINE is a terminal symbol that matches
+ the empty string at the end of a line. */
+
+ BEGWORD, /* BEGWORD is a terminal symbol that matches
+ the empty string at the beginning of a
+ word. */
+
+ ENDWORD, /* ENDWORD is a terminal symbol that matches
+ the empty string at the end of a word. */
+
+ LIMWORD, /* LIMWORD is a terminal symbol that matches
+ the empty string at the beginning or the
+ end of a word. */
+
+ NOTLIMWORD, /* NOTLIMWORD is a terminal symbol that
+ matches the empty string not at
+ the beginning or end of a word. */
+
+ BACKREF, /* BACKREF is generated by \<digit>
+ or by any other construct that
+ is not completely handled. If the scanner
+ detects a transition on backref, it returns
+ a kind of "semi-success" indicating that
+ the match will have to be verified with
+ a backtracking matcher. */
MBCSET, /* MBCSET is similar to CSET, but for
multibyte characters. */
- WCHAR, /* Only returned by lex. wctok contains
- the wide character representation. */
CSET /* CSET and (and any value greater) is a
terminal symbol that matches any of a
@@ -660,9 +668,9 @@ mbs_to_wchar (wint_t *pwc, char const *s, size_t n, struct
dfa *d)
static void
prtok (token t)
{
- if (t < 0)
+ if (t <= END)
fprintf (stderr, "END");
- else if (t < NOTCHAR)
+ else if (0 <= t && t < NOTCHAR)
{
unsigned int ch = t;
fprintf (stderr, "0x%02x", ch);
@@ -672,6 +680,9 @@ prtok (token t)
char const *s;
switch (t)
{
+ case BEG:
+ s = "BEG";
+ break;
case EMPTY:
s = "EMPTY";
break;
@@ -1844,7 +1855,30 @@ add_utf8_anychar (struct dfa *dfa)
static void
atom (struct dfa *dfa)
{
- if (dfa->parse.tok == WCHAR)
+ if ((0 <= dfa->parse.tok && dfa->parse.tok < NOTCHAR)
+ || dfa->parse.tok >= CSET
+ || dfa->parse.tok == BEG || dfa->parse.tok == BACKREF
+ || dfa->parse.tok == BEGLINE || dfa->parse.tok == ENDLINE
+ || dfa->parse.tok == BEGWORD || dfa->parse.tok == ENDWORD
+ || dfa->parse.tok == LIMWORD || dfa->parse.tok == NOTLIMWORD
+ || dfa->parse.tok == ANYCHAR || dfa->parse.tok == MBCSET)
+ {
+ if (dfa->parse.tok == ANYCHAR && dfa->localeinfo.using_utf8)
+ {
+ /* For UTF-8 expand the period to a series of CSETs that define a
+ valid UTF-8 character. This avoids using the slow multibyte
+ path. I'm pretty sure it would be both profitable and correct to
+ do it for any encoding; however, the optimization must be done
+ manually as it is done above in add_utf8_anychar. So, let's
+ start with UTF-8: it is the most used, and the structure of the
+ encoding makes the correctness more obvious. */
+ add_utf8_anychar (dfa);
+ }
+ else
+ addtok (dfa, dfa->parse.tok);
+ dfa->parse.tok = lex (dfa);
+ }
+ else if (dfa->parse.tok == WCHAR)
{
if (dfa->lex.wctok == WEOF)
addtok (dfa, BACKREF);
@@ -1867,28 +1901,6 @@ atom (struct dfa *dfa)
dfa->parse.tok = lex (dfa);
}
- else if (dfa->parse.tok == ANYCHAR && dfa->localeinfo.using_utf8)
- {
- /* For UTF-8 expand the period to a series of CSETs that define a valid
- UTF-8 character. This avoids using the slow multibyte path. I'm
- pretty sure it would be both profitable and correct to do it for
- any encoding; however, the optimization must be done manually as
- it is done above in add_utf8_anychar. So, let's start with
- UTF-8: it is the most used, and the structure of the encoding
- makes the correctness more obvious. */
- add_utf8_anychar (dfa);
- dfa->parse.tok = lex (dfa);
- }
- else if ((0 <= dfa->parse.tok && dfa->parse.tok < NOTCHAR)
- || dfa->parse.tok >= CSET || dfa->parse.tok == BACKREF
- || dfa->parse.tok == BEGLINE || dfa->parse.tok == ENDLINE
- || dfa->parse.tok == BEGWORD || dfa->parse.tok == ANYCHAR
- || dfa->parse.tok == MBCSET || dfa->parse.tok == ENDWORD
- || dfa->parse.tok == LIMWORD || dfa->parse.tok == NOTLIMWORD)
- {
- addtok (dfa, dfa->parse.tok);
- dfa->parse.tok = lex (dfa);
- }
else if (dfa->parse.tok == LPAREN)
{
dfa->parse.tok = lex (dfa);
@@ -2014,6 +2026,9 @@ dfaparse (char const *s, size_t len, struct dfa *d)
if (!d->syntax.syntax_bits_set)
dfaerror (_("no syntax specified"));
+ if (!d->nregexps)
+ addtok (d, BEG);
+
d->parse.tok = lex (d);
d->parse.depth = d->depth;
@@ -2132,6 +2147,21 @@ merge (position_set const *s1, position_set const *s2,
position_set *m)
merge_constrained (s1, s2, -1, m);
}
+static void
+merge2 (position_set *dst, position_set const *src, position_set *m)
+{
+ if (src->nelem < 4)
+ {
+ for (ptrdiff_t i = 0; i < src->nelem; ++i)
+ insert (src->elems[i], dst);
+ }
+ else
+ {
+ merge (src, dst, m);
+ copy (m, dst);
+ }
+}
+
/* Delete a position from a set. Return the nonzero constraint of the
deleted position, or zero if there was no such position. */
static unsigned int
@@ -2227,7 +2257,7 @@ state_index (struct dfa *d, position_set const *s, int
context)
for (state_num j = 0; j < s->nelem; j++)
{
int c = s->elems[j].constraint;
- if (d->tokens[s->elems[j].index] < 0)
+ if (d->tokens[s->elems[j].index] <= END)
{
if (succeeds_in_context (c, context, CTX_ANY))
constraint |= c;
@@ -2352,6 +2382,126 @@ state_separate_contexts (position_set const *s)
return separate_contexts;
}
+enum
+{
+ /* Single token is repeated. It is distinguished from non-repeated. */
+ OPT_REPEAT = (1 << 0),
+
+ /* Multiple tokens are repeated. This flag is on at head of tokens. The
+ node is not merged. */
+ OPT_LPAREN = (1 << 1),
+
+ /* Multiple branches are joined. The node is not merged. */
+ OPT_RPAREN = (1 << 2),
+
+ /* The node is walked. If the node is found in walking again, OPT_RPAREN
+ flag is turned on. */
+ OPT_WALKED = (1 << 3),
+
+ /* The node is queued. The node is not queued again. */
+ OPT_QUEUED = (1 << 4)
+};
+
+static ptrdiff_t
+merge_nfa_state (struct dfa *d, size_t *queue, ptrdiff_t nqueue, size_t tindex,
+ char *flags, position_set *merged)
+{
+ position_set *follows = d->follows;
+ ptrdiff_t nelem = 0;
+
+ for (ptrdiff_t i = 0; i < follows[tindex].nelem; i++)
+ {
+ size_t dindex = follows[tindex].elems[i].index;
+
+ /* Skip the node as pruned in future. */
+ unsigned int iconstraint = follows[tindex].elems[i].constraint;
+ if (iconstraint == 0)
+ continue;
+
+ follows[tindex].elems[nelem++] = follows[tindex].elems[i];
+
+ if (tindex < dindex && !(flags[dindex] & OPT_QUEUED))
+ {
+ queue[nqueue++] = dindex;
+ flags[dindex] |= OPT_QUEUED;
+ }
+
+ if (flags[dindex] & (OPT_LPAREN | OPT_RPAREN))
+ continue;
+
+ for (ptrdiff_t j = i + 1; j < follows[tindex].nelem; j++)
+ {
+ size_t sindex = follows[tindex].elems[j].index;
+
+ if (follows[tindex].elems[j].constraint != iconstraint)
+ continue;
+
+ if (flags[sindex] & (OPT_LPAREN | OPT_RPAREN))
+ continue;
+
+ if (d->tokens[sindex] != d->tokens[dindex])
+ continue;
+
+ if ((flags[sindex] ^ flags[dindex]) & OPT_REPEAT)
+ continue;
+
+ if (flags[sindex] & OPT_REPEAT)
+ delete (sindex, &follows[sindex]);
+
+ merge2 (&follows[dindex], &follows[sindex], merged);
+
+ /* Mark it as pruned in future. */
+ follows[tindex].elems[j].constraint = 0;
+ }
+ }
+
+ follows[tindex].nelem = nelem;
+
+ return nqueue;
+}
+
+static void
+dfaoptimize (struct dfa *d)
+{
+ char *flags;
+ size_t *queue;
+ ptrdiff_t nqueue;
+ position_set merged0;
+ position_set *merged;
+ ptrdiff_t extra_space = d->tindex + sizeof *queue - 1;
+ extra_space -= extra_space % sizeof *queue;
+
+ queue = xmalloc (d->nleaves * sizeof *queue + extra_space);
+ flags = (char *) (queue + d->nleaves);
+ memset (flags, 0, d->tindex * sizeof *flags);
+
+ for (size_t i = 0; i < d->tindex; i++)
+ {
+ for (ptrdiff_t j = 0; j < d->follows[i].nelem; j++)
+ {
+ if (d->follows[i].elems[j].index == i)
+ flags[d->follows[i].elems[j].index] |= OPT_REPEAT;
+ else if (d->follows[i].elems[j].index < i)
+ flags[d->follows[i].elems[j].index] |= OPT_LPAREN;
+ else if (flags[d->follows[i].elems[j].index] &= OPT_WALKED)
+ flags[d->follows[i].elems[j].index] |= OPT_RPAREN;
+ else
+ flags[d->follows[i].elems[j].index] |= OPT_WALKED;
+ }
+ }
+
+ merged = &merged0;
+ alloc_position_set (merged, d->nleaves);
+
+ nqueue = 0;
+ queue[nqueue++] = 0;
+
+ for (ptrdiff_t i = 0; i < nqueue; i++)
+ nqueue = merge_nfa_state (d, queue, nqueue, queue[i], flags, merged);
+
+ free (merged->elems);
+ free (queue);
+}
/* Perform bottom-up analysis on the parse tree, computing various functions.
Note that at this point, we're pretending constructs like \< are real
@@ -2427,6 +2577,8 @@ dfaanalyze (struct dfa *d, bool searchflag)
position_set merged; /* Result of merging sets. */
+ addtok (d, CAT);
+
#ifdef DEBUG
fprintf (stderr, "dfaanalyze:\n");
for (size_t i = 0; i < d->tindex; ++i)
@@ -2569,6 +2721,8 @@ dfaanalyze (struct dfa *d, bool searchflag)
#endif
}
+ dfaoptimize (d);
+
#ifdef DEBUG
for (size_t i = 0; i < d->tindex; ++i)
if (d->tokens[i] < NOTCHAR || d->tokens[i] == BACKREF
@@ -2587,26 +2741,21 @@ dfaanalyze (struct dfa *d, bool searchflag)
}
#endif
- /* Get the epsilon closure of the firstpos of the regexp. The result will
- be the set of positions of state 0. */
- merged.nelem = 0;
- for (size_t i = 0; i < stk[-1].nfirstpos; ++i)
- insert (firstpos[i], &merged);
/* For each follow set that is the follow set of a real position, replace
it with its epsilon closure. */
- epsclosure (&merged, d);
+ epsclosure (&d->follows[0], d);
/* Context wanted by some position. */
- int separate_contexts = state_separate_contexts (&merged);
+ int separate_contexts = state_separate_contexts (&d->follows[0]);
/* Build the initial state. */
if (separate_contexts & CTX_NEWLINE)
- state_index (d, &merged, CTX_NEWLINE);
+ state_index (d, &d->follows[0], CTX_NEWLINE);
d->initstate_notbol = d->min_trcount
- = state_index (d, &merged, separate_contexts ^ CTX_ANY);
+ = state_index (d, &d->follows[0], separate_contexts ^ CTX_ANY);
if (separate_contexts & CTX_LETTER)
- d->min_trcount = state_index (d, &merged, CTX_LETTER);
+ d->min_trcount = state_index (d, &d->follows[0], CTX_LETTER);
d->min_trcount++;
d->trcount = 0;
@@ -3394,8 +3543,10 @@ dfa_supported (struct dfa const *d)
return true;
}
+/* Disable use of the superset DFA if it is not likely to help
+ performance. */
static void
-dfaoptimize (struct dfa *d)
+maybe_disable_superset_dfa (struct dfa *d)
{
if (!d->localeinfo.using_utf8)
return;
@@ -3523,7 +3674,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, bool
searchflag)
if (dfa_supported (d))
{
- dfaoptimize (d);
+ maybe_disable_superset_dfa (d);
dfaanalyze (d, searchflag);
}
else
@@ -3830,7 +3981,7 @@ dfamust (struct dfa const *d)
bool need_endline = false;
bool case_fold_unibyte = d->syntax.case_fold && MB_CUR_MAX == 1;
- for (size_t ri = 0; ri < d->tindex; ++ri)
+ for (size_t ri = 1; ri + 1 < d->tindex; ri++)
{
token t = d->tokens[ri];
switch (t)
diff --git a/support/intprops.h b/support/intprops.h
index a4be30b..9702aec 100644
--- a/support/intprops.h
+++ b/support/intprops.h
@@ -342,8 +342,8 @@
Arguments should be free of side effects. */
#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \
op_result_overflow (a, b, \
- _GL_INT_MINIMUM ((1 ? 0 : (b)) + (a)), \
- _GL_INT_MAXIMUM ((1 ? 0 : (b)) + (a)))
+ _GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \
+ _GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b)))
/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
Return 1 if the result overflows. See above for restrictions. */
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=53175840c18d19259ec11128bdda64cad71ac8dc
commit 53175840c18d19259ec11128bdda64cad71ac8dc
Author: Arnold D. Robbins <address@hidden>
Date: Fri Sep 21 12:44:05 2018 +0300
Update UPDATE_MONTH in the doc.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f624ac4..a64e5fc 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-21 Arnold D. Robbins <address@hidden>
+
+ * gawktexi.in: Update UPDATE_MONTH.
+
2018-09-16 Arnold D. Robbins <address@hidden>
* Makefile.in: Regenerated, using Automake 1.16.1.
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 5d09951..b8c3baf 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -64,7 +64,7 @@
@c applies to and all the info about who's publishing this edition
@c These apply across the board.
address@hidden UPDATE-MONTH May, 2018
address@hidden UPDATE-MONTH September, 2018
@set VERSION 4.2
@set PATCHLEVEL 1
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 8b64585..52b0009 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -59,7 +59,7 @@
@c applies to and all the info about who's publishing this edition
@c These apply across the board.
address@hidden UPDATE-MONTH May, 2018
address@hidden UPDATE-MONTH September, 2018
@set VERSION 4.2
@set PATCHLEVEL 1
diff --git a/missing_d/mktime-internal.h b/missing_d/mktime-internal.h
new file mode 100644
index 0000000..3e64156
--- /dev/null
+++ b/missing_d/mktime-internal.h
@@ -0,0 +1,53 @@
+/* mktime variant that also uses an offset guess
+
+ Copyright 2016-2018 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+
+/* mktime_offset_t is a signed type wide enough to hold a UTC offset
+ in seconds, and used as part of the type of the offset-guess
+ argument to mktime_internal. Use time_t on platforms where time_t
+ is signed, to be compatible with platforms like BeOS that export
+ this implementation detail of mktime. On platforms where time_t is
+ unsigned, GNU and POSIX code can assume 'int' is at least 32 bits
+ which is wide enough for a UTC offset. */
+
+#if TIME_T_IS_SIGNED
+typedef time_t mktime_offset_t;
+#else
+typedef int mktime_offset_t;
+#endif
+
+time_t mktime_internal (struct tm *,
+ struct tm * (*) (time_t const *, struct tm *),
+ mktime_offset_t *);
+
+/* Although glibc source code uses leading underscores, Gnulib wants
+ ordinary names.
+
+ Portable standalone applications should supply a <time.h> that
+ declares a POSIX-compliant localtime_r, for the benefit of older
+ implementations that lack localtime_r or have a nonstandard one.
+ Similarly for gmtime_r. See the gnulib time_r module for one way
+ to implement this. */
+
+#undef __gmtime_r
+#undef __localtime_r
+#define __gmtime_r gmtime_r
+#define __localtime_r localtime_r
+
+#define __mktime_internal mktime_internal
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=0f509ca515b41544df4a48bc672c8a3af847cbe4
commit 0f509ca515b41544df4a48bc672c8a3af847cbe4
Author: Arnold D. Robbins <address@hidden>
Date: Fri Sep 21 12:20:24 2018 +0300
Fix compile problem for AIX.
diff --git a/ChangeLog b/ChangeLog
index 76ff7fc..02c12bf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-21 Arnold D. Robbins <address@hidden>
+
+ * io.c (fork_and_open_slave_pty): Move an errant close brace
+ inside the #endif so that gawk will compile on AIX. Thanks to
+ Fredrik Laurin <address@hidden> for the report.
+
2018-09-18 Arnold D. Robbins <address@hidden>
* NEWS: Fix typo in gettext version.
diff --git a/io.c b/io.c
index 18c2adb..3d90e71 100644
--- a/io.c
+++ b/io.c
@@ -2104,8 +2104,8 @@ fork_and_open_slave_pty(const char *slavenam, int master,
const char *command, p
}
return true;
-}
#endif
+}
#endif /* defined(HAVE_TERMIOS_H) */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +
doc/ChangeLog | 4 +
doc/gawk.texi | 2 +-
doc/gawktexi.in | 2 +-
io.c | 2 +-
missing_d/ChangeLog | 5 +
missing_d/intprops.h | 4 +-
missing_d/mktime-internal.h | 53 ++++++++
missing_d/mktime.c | 6 +-
missing_d/verify.h | 3 +-
support/ChangeLog | 4 +
support/dfa.c | 295 +++++++++++++++++++++++++++++++++-----------
support/intprops.h | 4 +-
13 files changed, 305 insertions(+), 85 deletions(-)
create mode 100644 missing_d/mktime-internal.h
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-3050-gf6a89a9,
Arnold Robbins <=