[gawk-diffs] [SCM] gawk branch, master, updated. a2f4c46ba3d4cd3de6be372316abc0e0e6518d4c

[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  a2f4c46ba3d4cd3de6be372316abc0e0e6518d4c (commit)
       via  1bba94521445126120cecd41f7ea29a2810a5eeb (commit)
       via  118622c2a66b302ec9706ccd3296a6cc2b8bfb13 (commit)
       via  9d8d0cf6e83832f2d9902b23b8513402c648c59d (commit)
       via  4d44431ecc06af0cc82a45c3317a8895c01c004a (commit)
       via  f0866c5197ee0c01fd1ded16e364cbe612c271be (commit)
       via  1fea520248b42ca995c8797698c60301ea42ffe9 (commit)
      from  29658e8b38047b234d682613592253761df63d24 (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=a2f4c46ba3d4cd3de6be372316abc0e0e6518d4c

commit a2f4c46ba3d4cd3de6be372316abc0e0e6518d4c
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Oct 25 21:58:39 2011 +0200

    Fix warning messages after merge with gawk_performance.

diff --git a/ChangeLog b/ChangeLog
index 0c3d0c0..b6b3828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-25         Arnold D. Robbins     <address@hidden>
+
+       Merge with gawk_performance branch done. Additionally:
+
+       * cint_array.c, int_array.c, str_array.c: Fix compiler complaints
+       about printf formats (signed / unsigned vs. %d / %u).
+       * eval.c (setup_frame): Add a missing return value.
+
 2011-09-30  Eli Zaretskii  <address@hidden>
 
        * io.c (remap_std_file): Fix non-portable code that caused
diff --git a/cint_array.c b/cint_array.c
index 72cd737..bdda111 100644
--- a/cint_array.c
+++ b/cint_array.c
@@ -1011,7 +1011,7 @@ tree_print(NODE *tree, size_t bi, int indent_level)
        hsize = tree->array_size;
        if ((tree->flags & HALFHAT) != 0)
                hsize /= 2;
-       fprintf(output_fp, "%4d:%s[%4lu:%-4lu]\n", bi,
+       fprintf(output_fp, "%4u:%s[%4lu:%-4lu]\n", bi,
                        (tree->flags & HALFHAT) ? "HH" : "H",
                        (unsigned long) hsize, (unsigned long) 
tree->table_size);
 
@@ -1225,7 +1225,7 @@ static void
 leaf_print(NODE *array, size_t bi, int indent_level)
 {
        indent(indent_level);
-       fprintf(output_fp, "%4d:L[%4lu:%-4lu]\n", bi,
+       fprintf(output_fp, "%4u:L[%4lu:%-4lu]\n", bi,
                        (unsigned long) array->array_size,
                        (unsigned long) array->table_size);
 }
diff --git a/configure b/configure
index b4d5e89..9bb85fd 100755
--- a/configure
+++ b/configure
@@ -748,15 +748,8 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CPPFLAGS
 YACC
-YFLAGS
-CC
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CPPFLAGS'
+YFLAGS'
 
 
 # Initialize some variables set by options.
diff --git a/eval.c b/eval.c
index daba0a0..1804cf8 100644
--- a/eval.c
+++ b/eval.c
@@ -1357,7 +1357,7 @@ setup_frame(INSTRUCTION *pc)
 
        if (tail_optimize) {
                frame_ptr->num_tail_calls++;
-               return;
+               return f->code_ptr;
        }
 
        if (pc->opcode == Op_indirect_func_call) {
diff --git a/int_array.c b/int_array.c
index 7bbfb58..9d85273 100644
--- a/int_array.c
+++ b/int_array.c
@@ -582,7 +582,7 @@ int_dump(NODE *symbol, NODE *ndump)
                fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
        }
        indent(indent_level);
-       fprintf(output_fp, "INT_CHAIN_MAX: %d\n", INT_CHAIN_MAX);
+       fprintf(output_fp, "INT_CHAIN_MAX: %u\n", INT_CHAIN_MAX);
        indent(indent_level);
        fprintf(output_fp, "array_size: %lu (int)\n", (unsigned long) 
symbol->array_size);
        indent(indent_level);
diff --git a/str_array.c b/str_array.c
index 330280a..f7f35ef 100644
--- a/str_array.c
+++ b/str_array.c
@@ -443,7 +443,7 @@ str_dump(NODE *symbol, NODE *ndump)
                fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
        }
        indent(indent_level);
-       fprintf(output_fp, "STR_CHAIN_MAX: %d\n", STR_CHAIN_MAX);
+       fprintf(output_fp, "STR_CHAIN_MAX: %u\n", STR_CHAIN_MAX);
        indent(indent_level);
        fprintf(output_fp, "array_size: %lu\n", (unsigned long) 
symbol->array_size);
        indent(indent_level);

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

commit 1bba94521445126120cecd41f7ea29a2810a5eeb
Merge: 29658e8 118622c
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Oct 25 21:44:18 2011 +0200

    Merge branch 'gawk_performance'


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

Summary of changes:
 ChangeLog             |  126 ++
 Makefile.am           |    4 +
 Makefile.in           |   20 +-
 array.c               | 1384 ++++++++---------------
 awk.h                 |  530 ++++++---
 awkgram.c             | 3020 +++++++++++++++++++------------------------------
 awkgram.y             | 1159 ++++---------------
 builtin.c             |   63 +-
 cint_array.c          | 1232 ++++++++++++++++++++
 cmd.h                 |    3 +-
 command.c             |  655 ++++++-----
 command.y             |   74 +-
 configure             |    4 +-
 configure.ac          |    4 +-
 debug.c               |  317 +++---
 doc/ChangeLog         |    4 +
 doc/gawk.info         | 1294 +++++++++++-----------
 doc/gawk.texi         |   29 +-
 eval.c                |  522 ++++++----
 ext.c                 |  150 +--
 extension/ChangeLog   |    4 +
 extension/arrayparm.c |    8 +-
 extension/filefuncs.c |   44 +-
 extension/fork.c      |    8 +-
 extension/ordchr.c    |    4 +-
 extension/readfile.c  |    2 +-
 extension/rwarray.c   |    6 +-
 extension/testarg.c   |    8 +-
 field.c               |   28 +-
 int_array.c           |  826 ++++++++++++++
 io.c                  |    9 +-
 main.c                |  137 ++--
 node.c                |  168 ++--
 profile.c             |   40 +-
 str_array.c           |  759 +++++++++++++
 symbol.c              |  718 ++++++++++++
 test/Makefile.am      |    1 +
 test/Makefile.in      |    3 +-
 test/Maketests        |    2 +-
 test/delfunc.ok       |    5 +-
 test/fnamedat.ok      |    5 +-
 test/fnarray.ok       |    2 -
 test/fnarray2.in      |    1 +
 test/fnarray2.ok      |    4 +-
 test/fnarydel.ok      |   10 +-
 test/fnasgnm.ok       |    5 +-
 test/fnparydl.ok      |    6 +-
 test/funsmnam.ok      |    2 +-
 test/gsubasgn.ok      |    8 +-
 test/match2.ok        |    5 +-
 50 files changed, 7769 insertions(+), 5653 deletions(-)
 create mode 100644 cint_array.c
 create mode 100644 int_array.c
 create mode 100644 str_array.c
 create mode 100644 symbol.c
 create mode 100644 test/fnarray2.in


hooks/post-receive
-- 
gawk