[gawk-diffs] [SCM] gawk branch, master, updated. 891b30a5417f93c3fc5e5aa4d54e270282bea380

[Arnold Robbins]

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, master has been updated
       via  891b30a5417f93c3fc5e5aa4d54e270282bea380 (commit)
       via  a7c502a756732ec9a1773d6169376bb7b25f4308 (commit)
      from  840661815d5063942b4475a908af423cf6bc813c (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=891b30a5417f93c3fc5e5aa4d54e270282bea380

commit 891b30a5417f93c3fc5e5aa4d54e270282bea380
Merge: 8406618 a7c502a
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Mar 11 22:50:11 2013 +0200

    Merge branch 'gawk-4.0-stable'

diff --cc ChangeLog
index 256c52f,dc2af7c..534b124
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,9 +1,18 @@@
+ 2013-03-11         Arnold D. Robbins     <address@hidden>
+ 
+       * re.c (check_bracket_exp): Make handling of embedded ] in
+       regexp smarter. Thanks to Ed Morton <address@hidden>
+       for reporting the bug.
+ 
 +2013-02-28         Arnold D. Robbins     <address@hidden>
 +
 +      Cause profiling / pretty printing to include a list of
 +      loaded extensions. Thanks to Hermann Peifer for the bug report.
 +
 +      * awk.h (srcfiles): Add declaration.
 +      * profile.c (print_lib_list): New function.
 +      (dump_prog): Call it.
 +
  2013-02-26         Arnold D. Robbins     <address@hidden>
  
        * parse.y (expression_list): In case of error return the list
diff --cc test/Makefile.am
index c45be57,ee57bdd..1859932
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@@ -953,14 -851,11 +956,14 @@@ UNIX_TESTS = 
  GAWK_EXT_TESTS = \
        aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
        backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-       clos1way delsub devfd devfd1 devfd2 dumpvars exit \
+       colonwarn clos1way delsub devfd devfd1 devfd2 dumpvars exit \
        fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
 +      functab1 functab2 functab3 \
        fwtest fwtest2 fwtest3 \
        gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
 -      icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall \
 +      icasefs icasers id igncdym igncfs ignrcas2 ignrcase \
 +      incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
 +      include include2 indirectcall \
        lint  lintold lintwarn \
        manyfiles match1 match2 match3 mbstr1 \
        nastyparm  next nondec nondec2 \
@@@ -1769,24 -1485,18 +1772,31 @@@ charasbytes
        od -c -t x1 | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
  
 +
 +symtab6:
 +      @echo $@
 +      @$(AWK) -d__$@ -f $(srcdir)/address@hidden
 +      @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@
 +      @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 +
 +symtab8:
 +      @echo $@
 +      @$(AWK) -d__$@ -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@
 +      @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' | grep -v '^FILENAME' >> 
_$@ ; rm __$@
 +      @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 +
  reginttrad:
        @echo $@
 -      @$(AWK) --traditional -r -f address@hidden > _$@
 +      @$(AWK) --traditional -r -f $(srcdir)/address@hidden > _$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
  
+ colonwarn:
+       @echo $@
+       @for i in 1 2 3 ; \
+       do $(AWK) -f $(srcdir)/address@hidden $$i < $(srcdir)/address@hidden ; \
+       done > _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+ 
  # Targets generated for other tests:
  include Maketests
  
diff --cc test/Makefile.in
index e1a44a5,b6aa3f6..f320a72
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@@ -1164,14 -1055,11 +1167,14 @@@ UNIX_TESTS = 
  GAWK_EXT_TESTS = \
        aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
        backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-       clos1way delsub devfd devfd1 devfd2 dumpvars exit \
+       colonwarn clos1way delsub devfd devfd1 devfd2 dumpvars exit \
        fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
 +      functab1 functab2 functab3 \
        fwtest fwtest2 fwtest3 \
        gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
 -      icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall \
 +      icasefs icasers id igncdym igncfs ignrcas2 ignrcase \
 +      incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
 +      include include2 indirectcall \
        lint  lintold lintwarn \
        manyfiles match1 match2 match3 mbstr1 \
        nastyparm  next nondec nondec2 \
@@@ -2149,22 -1862,17 +2152,29 @@@ charasbytes
        od -c -t x1 | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
  
 +symtab6:
 +      @echo $@
 +      @$(AWK) -d__$@ -f $(srcdir)/address@hidden
 +      @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@
 +      @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 +
 +symtab8:
 +      @echo $@
 +      @$(AWK) -d__$@ -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@
 +      @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' | grep -v '^FILENAME' >> 
_$@ ; rm __$@
 +      @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 +
  reginttrad:
        @echo $@
 -      @$(AWK) --traditional -r -f address@hidden > _$@
 +      @$(AWK) --traditional -r -f $(srcdir)/address@hidden > _$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+ 
+ colonwarn:
+       @echo $@
+       @for i in 1 2 3 ; \
+       do $(AWK) -f $(srcdir)/address@hidden $$i < $(srcdir)/address@hidden ; \
+       done > _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
  Gt-dummy:
  # file Maketests, generated from Makefile.am by the Gentests program
  addcomma:

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

Summary of changes:
 ChangeLog          |    6 ++++++
 re.c               |   18 ++++++++++++++++--
 test/ChangeLog     |    5 +++++
 test/Makefile.am   |   12 +++++++++++-
 test/Makefile.in   |   12 +++++++++++-
 test/colonwarn.awk |    4 ++++
 test/colonwarn.in  |    1 +
 test/colonwarn.ok  |    3 +++
 8 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 test/colonwarn.awk
 create mode 100644 test/colonwarn.in
 create mode 100644 test/colonwarn.ok


hooks/post-receive
-- 
gawk