[gawk-diffs] [SCM] gawk branch, comment, updated. gawk-4.1.0-829-g9701514

[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, comment has been updated
       via  9701514d4ad1152da564ebf6690c514becd4339a (commit)
       via  e71e74ac9af232d58e6c672e37ddf7e8737d68b1 (commit)
       via  66479f2ca1fbbf3b96cd2e1b15c0119b209df54a (commit)
       via  6f66d82e5794022ec2873d1f3ccba8e1267ca9a3 (commit)
       via  eeb0b5d5b0791c580e49e7a6ca4f844f2a0edabb (commit)
       via  c7882f59b6e5e4bb142928939264ca0c9af8e129 (commit)
       via  2a4725673f46d42cddff89b7002b193c67222c85 (commit)
       via  32649f52d26b1c3a6d09ffbca04928b476698713 (commit)
       via  ffab492af7444f26e3eb4945700cf72841a36e6e (commit)
       via  fc9b58482ce186b2fa0461351d4e060735e21b78 (commit)
       via  6641754c13e38dd6198832f23aa2be4b4546b324 (commit)
       via  06e16db227de0422f33b5f83817df55340f11846 (commit)
       via  ce2747c81b98b70e75ec399c8bdc6c09308380d3 (commit)
       via  eff1b6b21720518f2ea9dbd862fe3844d899db08 (commit)
       via  8b4e8f702df30b2b2238158504de5d8eb436958d (commit)
       via  4dcc853c04e05a88e2c07125bf3e7ab75cbcb6ca (commit)
      from  6b1b9c16a1b55804df36457de0650414ab3f017d (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=9701514d4ad1152da564ebf6690c514becd4339a

commit 9701514d4ad1152da564ebf6690c514becd4339a
Merge: 6b1b9c1 e71e74a
Author: Arnold D. Robbins <address@hidden>
Date:   Sat Sep 27 22:33:01 2014 +0300

    Merge branch 'master' into comment

diff --cc profile.c
index 3c4c918,b0fbbed..ddb9c35
--- a/profile.c
+++ b/profile.c
@@@ -192,35 -189,16 +192,35 @@@ pprint(INSTRUCTION *startp, INSTRUCTIO
                        rule = pc->in_rule;
  
                        if (rule != Rule) {
 -                              if (! rule_count[rule]++)
 -                                      fprintf(prof_fp, _("\t# %s 
rules(s)\n\n"), ruletab[rule]);
 -                              fprintf(prof_fp, "\t%s {\n", ruletab[rule]);
                                ip = (pc + 1)->firsti;
 +
 +                              /* print pre-begin/end comments */
 +                              if (ip->opcode == Op_comment) {
 +                                      print_comment(ip, 0);
 +                                      ip = ip->nexti;
 +                              }
 +
 +                              if (do_profile) {
 +                                      if (! rule_count[rule]++)
-                                               fprintf(prof_fp, _("\t# %s 
block(s)\n\n"), ruletab[rule]);
++                                              fprintf(prof_fp, _("\t# %s 
rule(s)\n\n"), ruletab[rule]);
 +                                      indent(0);
 +                              }
 +                              fprintf(prof_fp, "%s {\n", ruletab[rule]);
                        } else {
 -                              if (! rule_count[rule]++)
 +                              if (do_profile && ! rule_count[rule]++)
                                        fprintf(prof_fp, _("\t# Rule(s)\n\n"));
                                ip = pc->nexti;
 -                              indent(ip->exec_count);
 +                              lind = ip->exec_count;
 +                              /* print pre-block comments */
 +                              if (ip->opcode == Op_exec_count && 
ip->nexti->opcode == Op_comment)
 +                                      ip = ip->nexti;
 +                              if (ip->opcode == Op_comment) {
 +                                      print_comment(ip, lind);
 +                                      if (ip->nexti->nexti == (pc + 
1)->firsti)
 +                                              ip = ip->nexti->nexti;
 +                              }
                                if (ip != (pc + 1)->firsti) {           /* 
non-empty pattern */
 +                                      indent(lind);
                                        pprint(ip->nexti, (pc + 1)->firsti, 
false);
                                        t1 = pp_pop();
                                        fprintf(prof_fp, "%s {", t1->pp_str);
diff --cc test/profile2.ok
index 50c7e19,66b0140..938d685
--- a/test/profile2.ok
+++ b/test/profile2.ok
@@@ -1,4 -1,4 +1,4 @@@
-       # BEGIN block(s)
 -      # BEGIN rules(s)
++      # BEGIN rule(s)
  
        BEGIN {
       1        if (sortcmd == "") {
diff --cc test/profile3.ok
index 50172c4,5a9eeea..bbf0654
--- a/test/profile3.ok
+++ b/test/profile3.ok
@@@ -1,4 -1,4 +1,4 @@@
-       # BEGIN block(s)
 -      # BEGIN rules(s)
++      # BEGIN rule(s)
  
        BEGIN {
       1        the_func = "p"

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

Summary of changes:
 ChangeLog                   |   31 +
 NEWS                        |    3 +
 awkgram.c                   |   18 +-
 awkgram.y                   |   18 +-
 awklib/eg/lib/ctime.awk     |    3 +-
 awklib/eg/lib/ftrans.awk    |    2 +-
 awklib/eg/lib/gettime.awk   |    2 +-
 awklib/eg/lib/groupawk.in   |    3 +-
 awklib/eg/lib/noassign.awk  |    2 +-
 awklib/eg/lib/quicksort.awk |    2 +-
 awklib/eg/lib/readable.awk  |    2 +-
 awklib/eg/lib/strtonum.awk  |    2 +-
 awklib/eg/misc/arraymax.awk |   10 +-
 awklib/eg/misc/findpat.awk  |   13 +-
 awklib/eg/prog/cut.awk      |    8 +-
 awklib/eg/prog/egrep.awk    |    7 +-
 awklib/eg/prog/extract.awk  |   11 +-
 awklib/eg/prog/id.awk       |   22 +-
 awklib/eg/prog/split.awk    |    5 +-
 awklib/eg/prog/uniq.awk     |    5 +-
 configh.in                  |    3 +
 configure                   |   13 +
 configure.ac                |    6 +
 doc/ChangeLog               |   17 +
 doc/gawk.info               | 3225 ++++++++++++++++++++++---------------------
 doc/gawk.texi               | 1589 +++++++++++-----------
 doc/gawktexi.in             | 1506 +++++++++++----------
 io.c                        |   17 +-
 pc/ChangeLog                |    4 +
 pc/Makefile.tst             |   79 +-
 pc/config.h                 |    6 +
 profile.c                   |    2 +-
 test/ChangeLog              |    5 +
 test/profile2.ok            |    2 +-
 test/profile3.ok            |    2 +-
 35 files changed, 3480 insertions(+), 3165 deletions(-)


hooks/post-receive
-- 
gawk