[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.16-24-g05d4dcd

[Eric Blake]

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 "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=05d4dcdadd1451d07aea2b23d23927c01833e44f

The branch, branch-1.4 has been updated
       via  05d4dcdadd1451d07aea2b23d23927c01833e44f (commit)
       via  51c16cc5f4148ce7085a3df0c7b2828701da9f3a (commit)
       via  2273b387014b4aa8acde4587a192b9bd6d4c0fac (commit)
      from  e0c743b759a8f2dcc2dbabef3d7016fcda701a3e (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 -----------------------------------------------------------------
commit 05d4dcdadd1451d07aea2b23d23927c01833e44f
Author: Eric Blake <address@hidden>
Date:   Sat Dec 22 07:37:17 2012 -0700

    maint: enable tight_scope syntax check
    
    I noticed that 'make syntax-check' was outputting a warning about
    the tight_scope rule being worthless.  This makes the rule work,
    ensuring that we use 'static' where possible.
    
    * src/Makefile.am (m4_SOURCES): Move m4.h...
    (noinst_HEADERS): ...into separate listing for syntax check.
    * src/m4.h: Add 'extern' to function declarations.
    (expansion_level): Declare extern variable here...
    * src/debug.c: ...not here.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 51c16cc5f4148ce7085a3df0c7b2828701da9f3a
Author: Eric Blake <address@hidden>
Date:   Sat Dec 22 07:18:15 2012 -0700

    maint: move syntax check exemptions into cfg.mk
    
    It's easier to maintain exemptions in a single file than it is
    to maintain a bunch of hidden .x files.
    
    * .x-sc_prohibit_tab_based_indentation: Delete file.
    * .x-update-copyright: Likewise.
    * Makefile.am (syntax_check_exceptions): Delete rule.
    * cfg.mk (exclude_file_name_regexp): Move exemptions here.
    (local-checks-to-skip): Re-enable copyright check.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 2273b387014b4aa8acde4587a192b9bd6d4c0fac
Author: Eric Blake <address@hidden>
Date:   Sat Dec 22 07:10:32 2012 -0700

    build: update to latest gnulib
    
    * gnulib: Update to latest.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 .x-sc_prohibit_tab_based_indentation |    5 --
 .x-update-copyright                  |    1 -
 ChangeLog                            |   19 +++++
 Makefile.am                          |    6 +--
 cfg.mk                               |    7 ++-
 gnulib                               |    2 +-
 src/Makefile.am                      |    3 +-
 src/debug.c                          |    2 -
 src/m4.h                             |  127 ++++++++++++++++++----------------
 9 files changed, 94 insertions(+), 78 deletions(-)
 delete mode 100644 .x-sc_prohibit_tab_based_indentation
 delete mode 100644 .x-update-copyright

diff --git a/.x-sc_prohibit_tab_based_indentation 
b/.x-sc_prohibit_tab_based_indentation
deleted file mode 100644
index bd9127e..0000000
--- a/.x-sc_prohibit_tab_based_indentation
+++ /dev/null
@@ -1,5 +0,0 @@
-^GNUMakefile$
-Makefile\.am$
-\.mk$
-^HACKING$
-ChangeLog.*
diff --git a/.x-update-copyright b/.x-update-copyright
deleted file mode 100644
index 725ba40..0000000
--- a/.x-update-copyright
+++ /dev/null
@@ -1 +0,0 @@
-m4/gnulib-cache.m4
diff --git a/ChangeLog b/ChangeLog
index c415f70..adbe5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-12-22  Eric Blake  <address@hidden>
+
+       maint: enable tight_scope syntax check
+       * src/Makefile.am (m4_SOURCES): Move m4.h...
+       (noinst_HEADERS): ...into separate listing for syntax check.
+       * src/m4.h: Add 'extern' to function declarations.
+       (expansion_level): Declare extern variable here...
+       * src/debug.c: ...not here.
+
+       maint: move syntax check exemptions into cfg.mk
+       * .x-sc_prohibit_tab_based_indentation: Delete file.
+       * .x-update-copyright: Likewise.
+       * Makefile.am (syntax_check_exceptions): Delete rule.
+       * cfg.mk (exclude_file_name_regexp): Move exemptions here.
+       (local-checks-to-skip): Re-enable copyright check.
+
+       build: update to latest gnulib
+       * gnulib: Update to latest.
+
 2012-11-19  Eric Blake  <address@hidden>
 
        build: avoid problematic gcc 4.4 warnings
diff --git a/Makefile.am b/Makefile.am
index 1556fd0..2e077f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,12 +21,8 @@
 
 SUBDIRS = . examples lib src doc checks tests
 
-syntax_check_exceptions =              \
-  .x-sc_prohibit_tab_based_indentation \
-  .x-update-copyright
-
 EXTRA_DIST = bootstrap c-boxes.el cfg.mk maint.mk \
-       .prev-version .version m4/gnulib-cache.m4 $(syntax_check_exceptions)
+       .prev-version .version m4/gnulib-cache.m4
 DISTCLEANFILES = stamp-h
 ## maintainer-clean should remove as much as possible that ./bootstrap can
 ## recreate.  In the m4 directory, keep only gnulib-cache.m4.
diff --git a/cfg.mk b/cfg.mk
index 31de2de..6be77f2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -28,8 +28,6 @@ local-checks-to-skip =
 local-checks-to-skip += sc_bindtextdomain
 # M4 intentionally uses a coding style that compiles under C++.
 local-checks-to-skip += sc_cast_of_x_alloc_return_value
-# sc_copyright_check is currently broken for multi-line copyrights.
-local-checks-to-skip += sc_copyright_check
 
 # Our files include "m4.h", which in turn includes <config.h> first.
 config_h_header = "m4\.h"
@@ -42,3 +40,8 @@ sc_prohibit_tab_based_indentation:
  @re='^ *    '                                               \
  msg='TAB in indentation; use only spaces'                   \
    $(_prohibit_regexp)
+
+# List all syntax-check exemptions:
+exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
+  (^(GNU)?Makefile(\.am)?|\.mk|^HACKING|^ChangeLog.*)$$
+exclude_file_name_regexp--update-copyright = ^m4/gnulib-cache.m4$$
diff --git a/gnulib b/gnulib
index fd9f1ac..baaadca 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit fd9f1acededd74f8cd095e657528aa8fad183536
+Subproject commit baaadca1f6d5a37debf88b2562b57a4589d4eca7
diff --git a/src/Makefile.am b/src/Makefile.am
index 750a3a9..b23fc56 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@ AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 bin_PROGRAMS = m4
-m4_SOURCES = m4.h m4.c builtin.c debug.c eval.c format.c freeze.c input.c \
+noinst_HEADERS = m4.h
+m4_SOURCES = m4.c builtin.c debug.c eval.c format.c freeze.c input.c \
 macro.c output.c path.c symtab.c
 m4_LDADD = ../lib/libm4.a $(LIBM4_LIBDEPS) $(LIBCSTACK) $(LIBTHREAD)
diff --git a/src/debug.c b/src/debug.c
index 747bf79..71a16a6 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -30,8 +30,6 @@ FILE *debug = NULL;
 /* Obstack for trace messages.  */
 static struct obstack trace;
 
-extern int expansion_level;
-
 static void debug_set_file (FILE *);
 
 /*----------------------------------.
diff --git a/src/m4.h b/src/m4.h
index 8ddb9da..2e2ef61 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -139,9 +139,9 @@ extern const char *user_word_regexp;    /* -W */
 /* Error handling.  */
 extern int retcode;
 
-void m4_error (int, int, const char *, ...) M4_GNUC_PRINTF(3, 4);
-void m4_error_at_line (int, int, const char *, int,
-                       const char *, ...) M4_GNUC_PRINTF(5, 6);
+extern void m4_error (int, int, const char *, ...) M4_GNUC_PRINTF(3, 4);
+extern void m4_error_at_line (int, int, const char *, int,
+                              const char *, ...) M4_GNUC_PRINTF(5, 6);
 
 #define M4ERROR(Arglist) (m4_error Arglist)
 #define M4ERROR_AT_LINE(Arglist) (m4_error_at_line Arglist)
@@ -231,15 +231,15 @@ extern FILE *debug;
     }                                                           \
   while (0)
 
-void debug_init (void);
-int debug_decode (const char *);
-void debug_flush_files (void);
-bool debug_set_output (const char *);
-void debug_message_prefix (void);
+extern void debug_init (void);
+extern int debug_decode (const char *);
+extern void debug_flush_files (void);
+extern bool debug_set_output (const char *);
+extern void debug_message_prefix (void);
 
-void trace_prepre (const char *, int);
-void trace_pre (const char *, int, int, token_data **);
-void trace_post (const char *, int, int, const char *);
+extern void trace_prepre (const char *, int);
+extern void trace_pre (const char *, int, int, token_data **);
+extern void trace_post (const char *, int, int, const char *);
 
 /* File: input.c  --- lexical definitions.  */
 
@@ -292,50 +292,52 @@ struct token_data
 typedef enum token_type token_type;
 typedef enum token_data_type token_data_type;
 
-void input_init (void);
-token_type peek_token (void);
-token_type next_token (token_data *, int *);
-void skip_line (void);
+extern void input_init (void);
+extern token_type peek_token (void);
+extern token_type next_token (token_data *, int *);
+extern void skip_line (void);
 
 /* push back input */
-void push_file (FILE *, const char *, bool);
-void push_macro (builtin_func *);
-struct obstack *push_string_init (void);
-const char *push_string_finish (void);
-void push_wrapup (const char *);
-bool pop_wrapup (void);
+extern void push_file (FILE *, const char *, bool);
+extern void push_macro (builtin_func *);
+extern struct obstack *push_string_init (void);
+extern const char *push_string_finish (void);
+extern void push_wrapup (const char *);
+extern bool pop_wrapup (void);
 
 /* current input file, and line */
 extern const char *current_file;
 extern int current_line;
 
 /* left and right quote, begin and end comment */
-extern STRING bcomm, ecomm;
-extern STRING lquote, rquote;
+extern STRING bcomm;
+extern STRING ecomm;
+extern STRING lquote;
+extern STRING rquote;
 
 #define DEF_LQUOTE "`"
 #define DEF_RQUOTE "\'"
 #define DEF_BCOMM "#"
 #define DEF_ECOMM "\n"
 
-void set_quotes (const char *, const char *);
-void set_comment (const char *, const char *);
+extern void set_quotes (const char *, const char *);
+extern void set_comment (const char *, const char *);
 #ifdef ENABLE_CHANGEWORD
-void set_word_regexp (const char *);
+extern void set_word_regexp (const char *);
 #endif
 
 /* File: output.c --- output functions.  */
 extern int current_diversion;
 extern int output_current_line;
 
-void output_init (void);
-void output_exit (void);
-void output_text (const char *, int);
-void shipout_text (struct obstack *, const char *, int, int);
-void make_diversion (int);
-void insert_diversion (int);
-void insert_file (FILE *);
-void freeze_diversions (FILE *);
+extern void output_init (void);
+extern void output_exit (void);
+extern void output_text (const char *, int);
+extern void shipout_text (struct obstack *, const char *, int, int);
+extern void make_diversion (int);
+extern void insert_diversion (int);
+extern void insert_file (FILE *);
+extern void freeze_diversions (FILE *);
 
 /* File symtab.c  --- symbol table definitions.  */
 
@@ -384,15 +386,17 @@ typedef void hack_symbol (symbol *, void *);
 
 extern symbol **symtab;
 
-void free_symbol (symbol *sym);
-void symtab_init (void);
-symbol *lookup_symbol (const char *, symbol_lookup);
-void hack_all_symbols (hack_symbol *, void *);
+extern void free_symbol (symbol *sym);
+extern void symtab_init (void);
+extern symbol *lookup_symbol (const char *, symbol_lookup);
+extern void hack_all_symbols (hack_symbol *, void *);
 
 /* File: macro.c  --- macro expansion.  */
 
-void expand_input (void);
-void call_macro (symbol *, int, token_data **, struct obstack *);
+extern int expansion_level;
+
+extern void expand_input (void);
+extern void call_macro (symbol *, int, token_data **, struct obstack *);
 
 /* File: builtin.c  --- builtins.  */
 
@@ -422,39 +426,40 @@ struct re_registers;
    syntax (new in 2.0).  */
 #define DEFAULT_MACRO_SEQUENCE "\\$\\({[^}]*}\\|[0-9][0-9]+\\)"
 
-void builtin_init (void);
-void define_builtin (const char *, const builtin *, symbol_lookup);
-void set_macro_sequence (const char *);
-void free_macro_sequence (void);
-void define_user_macro (const char *, const char *, symbol_lookup);
-void undivert_all (void);
-void expand_user_macro (struct obstack *, symbol *, int, token_data **);
-void m4_placeholder (struct obstack *, int, token_data **);
-void init_pattern_buffer (struct re_pattern_buffer *, struct re_registers *);
-const char *ntoa (int32_t, int);
-
-const builtin *find_builtin_by_addr (builtin_func *);
-const builtin *find_builtin_by_name (const char *);
+extern void builtin_init (void);
+extern void define_builtin (const char *, const builtin *, symbol_lookup);
+extern void set_macro_sequence (const char *);
+extern void free_macro_sequence (void);
+extern void define_user_macro (const char *, const char *, symbol_lookup);
+extern void undivert_all (void);
+extern void expand_user_macro (struct obstack *, symbol *, int, token_data **);
+extern void m4_placeholder (struct obstack *, int, token_data **);
+extern void init_pattern_buffer (struct re_pattern_buffer *,
+                                 struct re_registers *);
+extern const char *ntoa (int32_t, int);
+
+extern const builtin *find_builtin_by_addr (builtin_func *);
+extern const builtin *find_builtin_by_name (const char *);
 
 /* File: path.c  --- path search for include files.  */
 
-void include_init (void);
-void include_env_init (void);
-void add_include_directory (const char *);
-FILE *m4_path_search (const char *, char **);
+extern void include_init (void);
+extern void include_env_init (void);
+extern void add_include_directory (const char *);
+extern FILE *m4_path_search (const char *, char **);
 
 /* File: eval.c  --- expression evaluation.  */
 
-bool evaluate (const char *, int32_t *);
+extern bool evaluate (const char *, int32_t *);
 
 /* File: format.c  --- printf like formatting.  */
 
-void expand_format (struct obstack *, int, token_data **);
+extern void expand_format (struct obstack *, int, token_data **);
 
 /* File: freeze.c --- frozen state files.  */
 
-void produce_frozen_state (const char *);
-void reload_frozen_state (const char *);
+extern void produce_frozen_state (const char *);
+extern void reload_frozen_state (const char *);
 
 /* Debugging the memory allocator.  */
 


hooks/post-receive
-- 
GNU M4 source repository