gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 67abdd7a54c00f


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 67abdd7a54c00fae450a0f0964a9c9615a8a50c5
Date: Mon, 14 May 2012 18:37:27 +0000

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.0-stable has been updated
       via  67abdd7a54c00fae450a0f0964a9c9615a8a50c5 (commit)
       via  ae93fda5ed5957fb62e2b6f0cd6f104c7009b2ee (commit)
       via  4b43ad8d4aeb149eb4ca42c5da20934183ee9698 (commit)
      from  fe0a0998411173db5cab614253562b2efd6f9664 (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=67abdd7a54c00fae450a0f0964a9c9615a8a50c5

commit 67abdd7a54c00fae450a0f0964a9c9615a8a50c5
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 14 21:36:46 2012 +0300

    Fix jarebug test.

diff --git a/test/ChangeLog b/test/ChangeLog
index 4537f05..97065a2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-14         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (jarebug): Move to charset tests. Adjust to check
+       for existence of needed Japanese locale before running the test.
+
 2012-05-09         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (jarebug): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 3987b4e..24255b7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -804,7 +804,6 @@ BASIC_TESTS = \
        getline getline2 getline3 getline4 getlnbuf getnr2tb getnr2tm \
        gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
        gsubtst7 gsubtst8 \
-       jarebug \
        hex hsprint \
        inputred intest intprec iobug1 \
        leaddig leadnl litoct longsub longwrds \
@@ -854,7 +853,7 @@ INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
 
 LOCALE_CHARSET_TESTS = \
-       asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
+       asort asorti fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
        mbprintf1 mbprintf2 mbprintf3 rebt8b2 rtlenmb sort1 sprintfc
 
 # List of the tests which should be run with --lint option:
@@ -1457,9 +1456,11 @@ rri1::
 
 jarebug::
        @echo $@
-       @GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \
-       $(AWK) -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@ 2>&1 
|| echo EXIT CODE: $$? >> _$@
-       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+       @if locale -a | grep ja_JP.EUC-JP > /dev/null ; then \
+       GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \
+       $(AWK) -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@ 2>&1 
|| echo EXIT CODE: $$? >> _$@ ; \
+       -$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@ ; \
+       fi
 
 
 # Targets generated for other tests:
diff --git a/test/Makefile.in b/test/Makefile.in
index 3628735..709009e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1009,7 +1009,6 @@ BASIC_TESTS = \
        getline getline2 getline3 getline4 getlnbuf getnr2tb getnr2tm \
        gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
        gsubtst7 gsubtst8 \
-       jarebug \
        hex hsprint \
        inputred intest intprec iobug1 \
        leaddig leadnl litoct longsub longwrds \
@@ -1056,7 +1055,7 @@ EXTRA_TESTS = inftest regtest
 INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
 LOCALE_CHARSET_TESTS = \
-       asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
+       asort asorti fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
        mbprintf1 mbprintf2 mbprintf3 rebt8b2 rtlenmb sort1 sprintfc
 
 
@@ -1835,9 +1834,11 @@ rri1::
 
 jarebug::
        @echo $@
-       @GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \
-       $(AWK) -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@ 2>&1 
|| echo EXIT CODE: $$? >> _$@
-       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+       @if locale -a | grep ja_JP.EUC-JP > /dev/null ; then \
+       GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \
+       $(AWK) -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@ 2>&1 
|| echo EXIT CODE: $$? >> _$@ ; \
+       -$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@ ; \
+       fi
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=ae93fda5ed5957fb62e2b6f0cd6f104c7009b2ee

commit ae93fda5ed5957fb62e2b6f0cd6f104c7009b2ee
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 14 21:36:01 2012 +0300

    Fix typo in it.po and rebuild it.gmo.

diff --git a/po/it.gmo b/po/it.gmo
index 05925e4..7d524ad 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 24b0923..6c74d5a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -558,7 +558,7 @@ msgstr "log: argomento negativo %g"
 
 #: builtin.c:740 builtin.c:745
 msgid "fatal: must use `count$' on all formats or none"
-msgstr "fatale: `count$' va usato per ogni 'format' o per nessuno""
+msgstr "fatale: `count$' va usato per ogni 'format' o per nessuno"
 
 #: builtin.c:815
 #, c-format

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=4b43ad8d4aeb149eb4ca42c5da20934183ee9698

commit 4b43ad8d4aeb149eb4ca42c5da20934183ee9698
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 14 21:35:33 2012 +0300

    Sync dfa.c (again) with GNU grep.

diff --git a/dfa.c b/dfa.c
index f9355f1..64b7ddc 100644
--- a/dfa.c
+++ b/dfa.c
@@ -51,7 +51,7 @@
    - It's typically faster.
    Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
    only '0' through '9' are digits.  Prefer ISASCIIDIGIT to isdigit unless
-   it's important to use the locale's definition of `digit' even when the
+   it's important to use the locale's definition of "digit" even when the
    host does not conform to Posix.  */
 #define ISASCIIDIGIT(c) ((unsigned) (c) - '0' <= 9)
 
@@ -666,7 +666,7 @@ static charclass newline;
 # define is_valid_unibyte_character(c) (! (MBS_SUPPORT && btowc (c) == WEOF))
 #endif
 
-/* Return non-zero if C is a 'word-constituent' byte; zero otherwise.  */
+/* Return non-zero if C is a "word-constituent" byte; zero otherwise.  */
 #define IS_WORD_CONSTITUENT(C) \
   (is_valid_unibyte_character (C) && (isalnum (C) || (C) == '_'))
 
@@ -1006,9 +1006,9 @@ parse_bracket_exp (void)
           char str[BRACKET_BUFFER_SIZE];
           FETCH_WC (c1, wc1, _("unbalanced ["));
 
-          /* If pattern contains `[[:', `[[.', or `[[='.  */
+          /* If pattern contains '[[:', '[[.', or '[[='.  */
           if (c1 == ':'
-              /* TODO: handle `[[.' and `[[=' also for MB_CUR_MAX == 1.  */
+              /* TODO: handle '[[.' and '[[=' also for MB_CUR_MAX == 1.  */
               || (MB_CUR_MAX > 1 && (c1 == '.' || c1 == '=')))
             {
               size_t len = 0;
@@ -3096,11 +3096,11 @@ charset_matched:
   return match ? match_len : 0;
 }
 
-/* Check each of `d->states[s].mbps.elem' can match or not. Then return the
-   array which corresponds to `d->states[s].mbps.elem' and each element of
+/* Check each of 'd->states[s].mbps.elem' can match or not. Then return the
+   array which corresponds to 'd->states[s].mbps.elem' and each element of
    the array contains the amount of the bytes with which the element can
    match.
-   `idx' is the index from the buf_begin, and it is the current position
+   'idx' is the index from the buf_begin, and it is the current position
    in the buffer.
    Caller MUST free the array which this function return.  */
 static int *
@@ -3129,11 +3129,11 @@ check_matching_with_multibyte_ops (struct dfa *d, 
state_num s, size_t idx)
 }
 
 /* Consume a single character and enumerate all of the positions which can
-   be next position from the state `s'.
-   `match_lens' is the input. It can be NULL, but it can also be the output
+   be next position from the state 's'.
+   'match_lens' is the input. It can be NULL, but it can also be the output
    of check_matching_with_multibyte_ops() for optimization.
-   `mbclen' and `pps' are the output.  `mbclen' is the length of the
-   character consumed, and `pps' is the set this function enumerate.  */
+   'mbclen' and 'pps' are the output.  'mbclen' is the length of the
+   character consumed, and 'pps' is the set this function enumerate.  */
 static status_transit_state
 transit_state_consume_1char (struct dfa *d, state_num s,
                              unsigned char const **pp,
@@ -3149,15 +3149,15 @@ transit_state_consume_1char (struct dfa *d, state_num s,
      to which p points.  */
   *mbclen = (mblen_buf[*pp - buf_begin] == 0) ? 1 : mblen_buf[*pp - buf_begin];
 
-  /* Calculate the state which can be reached from the state `s' by
-     consuming `*mbclen' single bytes from the buffer.  */
+  /* Calculate the state which can be reached from the state 's' by
+     consuming '*mbclen' single bytes from the buffer.  */
   s1 = s;
   for (k = 0; k < *mbclen; k++)
     {
       s2 = s1;
       rs = transit_state_singlebyte (d, s2, (*pp)++, &s1);
     }
-  /* Copy the positions contained by `s1' to the set `pps'.  */
+  /* Copy the positions contained by 's1' to the set 'pps'.  */
   copy (&(d->states[s1].elems), pps);
 
   /* Check (input) match_lens, and initialize if it is NULL.  */
@@ -3166,7 +3166,7 @@ transit_state_consume_1char (struct dfa *d, state_num s,
   else
     work_mbls = match_lens;
 
-  /* Add all of the positions which can be reached from `s' by consuming
+  /* Add all of the positions which can be reached from 's' by consuming
      a single character.  */
   for (i = 0; i < d->states[s].mbps.nelem; i++)
     {
@@ -3233,10 +3233,10 @@ transit_state (struct dfa *d, state_num s, unsigned 
char const **pp)
   /* This state has some operators which can match a multibyte character.  */
   alloc_position_set (&follows, d->nleaves);
 
-  /* `maxlen' may be longer than the length of a character, because it may
+  /* 'maxlen' may be longer than the length of a character, because it may
      not be a character but a (multi character) collating element.
-     We enumerate all of the positions which `s' can reach by consuming
-     `maxlen' bytes.  */
+     We enumerate all of the positions which 's' can reach by consuming
+     'maxlen' bytes.  */
   transit_state_consume_1char (d, s, pp, match_lens, &mbclen, &follows);
 
   wc = inputwcs[*pp - mbclen - buf_begin];

-----------------------------------------------------------------------

Summary of changes:
 dfa.c            |   36 ++++++++++++++++++------------------
 po/it.gmo        |  Bin 44170 -> 47961 bytes
 po/it.po         |    2 +-
 test/ChangeLog   |    5 +++++
 test/Makefile.am |   11 ++++++-----
 test/Makefile.in |   11 ++++++-----
 6 files changed, 36 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]