[gawk-diffs] [SCM] gawk branch, comment, updated. gawk-4.1.0-734-ga1df630

[Stephen Davies]

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  a1df6304be3c217877919097d2e4b3b16de6cd02 (commit)
      from  1cc790ecafc378da1dbbda8480a2a41f13c1821e (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=a1df6304be3c217877919097d2e4b3b16de6cd02

commit a1df6304be3c217877919097d2e4b3b16de6cd02
Author: Stephen Davies <address@hidden>
Date:   Mon Sep 8 13:46:17 2014 +0930

    profile.c fixes

diff --git a/profile.c b/profile.c
index 8eb31b2..f1ced7e 100644
--- a/profile.c
+++ b/profile.c
@@ -176,8 +176,6 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool 
in_for_header)
        char *str;
        NODE *t2;
        INSTRUCTION *ip;
-       INSTRUCTION *ic;
-       INSTRUCTION *i2;
        NODE *m;
        char *tmp;
        int rule;
@@ -198,7 +196,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool 
in_for_header)
                                if (ip->opcode == Op_comment){
        /* print pre-begin/end comments */
                                        print_comment(ip, 0);
-                                       ip = ip->nexti->nexti;
+                                       ip = ip->nexti;
                                }
                                if (do_profile && ! rule_count[rule]++)
                                        fprintf(prof_fp, _("\t# %s 
block(s)\n\n"), ruletab[rule]);
@@ -206,8 +204,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool 
in_for_header)
                        } else {
                                if (do_profile && ! rule_count[rule]++)
                                        fprintf(prof_fp, _("\t# Rule(s)\n\n"));
-                               ic = ip = pc->nexti;
-                               i2 = (pc + 1)->firsti;
+                               ip = pc->nexti;
                                lind = ip->exec_count;
        /*print pre-block comments */
                                if(ip->opcode == Op_exec_count && 
ip->nexti->opcode == Op_comment)ip = ip->nexti;
@@ -1533,7 +1530,8 @@ pp_func(INSTRUCTION *pc, void *data ATTRIBUTE_UNUSED)
                print_comment(fp, 0);
                fp = fp->nexti;
        }
-       fprintf(prof_fp, "\t");
+       if (!do_profile)
+               fprintf(prof_fp, "\t");
        indent(pc->nexti->exec_count);
        fprintf(prof_fp, "%s %s(", op2str(Op_K_function), func->vname);
        pcount = func->param_cnt;
diff --git a/test/Makefile.am b/test/Makefile.am
index f28b381..65952ac 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1686,14 +1686,12 @@ profile3:
 
 profile4:
        @echo $@
-       @$(AWK) address@hidden -f "$(srcdir)"/address@hidden > /dev/null
-       @sed 1,2d < address@hidden > _$@; rm address@hidden
+       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 profile5:
        @echo $@
-       @$(AWK) address@hidden -f "$(srcdir)"/address@hidden > /dev/null
-       @sed 1,2d < address@hidden > _$@; rm address@hidden
+       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 posix2008sub:
diff --git a/test/Makefile.in b/test/Makefile.in
index f3b537f..7159357 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2110,14 +2110,12 @@ profile3:
 
 profile4:
        @echo $@
-       @$(AWK) address@hidden -f "$(srcdir)"/address@hidden > /dev/null
-       @sed 1,2d < address@hidden > _$@; rm address@hidden
+       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 profile5:
        @echo $@
-       @$(AWK) address@hidden -f "$(srcdir)"/address@hidden > /dev/null
-       @sed 1,2d < address@hidden > _$@; rm address@hidden
+       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 posix2008sub:

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

Summary of changes:
 profile.c        |   10 ++++------
 test/Makefile.am |    6 ++----
 test/Makefile.in |    6 ++----
 3 files changed, 8 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
gawk