Remove trailing blanks.

The epilogue has its own ending \n, no need to add another.

	* data/glr.c, data/lalr1.java, data/yacc.c: dnl when outputing the
	epilogue.
	* data/glr.cc: dnl when extending the epilogue.
	Remove stray "private:".

diff --git a/ChangeLog b/ChangeLog
index ef97e9b1d96683e09e3034e31de22472ca4a0d8b..a3d1da56406b81a8b0f0c0f599c75041b68027e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-02-19  Akim Demaille  <demaille@gostai.com>
+
+       Remove trailing blanks.
+       The epilogue has its own ending 
+       , no need to add another.
+       
+       * data/glr.c, data/lalr1.java, data/yacc.c: dnl when outputing the
+       epilogue.
+       * data/glr.cc: dnl when extending the epilogue.
+       Remove stray "private:".
+
 2009-02-19  Akim Demaille  <demaille@gostai.com>
 
        Use b4_c_modern.

diff --git a/data/glr.c b/data/glr.c
index 35c541998f8840f0ca9b49ca56ce5e1e9222edcc..bf1f1a225c0c53980c5f42dad40c5b3dc081719e 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -158,7 +158,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison GLR parsers in C],
-  [2002, 2003, 2004, 2005, 2006])
+             [2002, 2003, 2004, 2005, 2006])
 [
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 
@@ -2575,9 +2575,7 @@ yypdumpstack (yyGLRStack* yystackp)
   YYFPRINTF (stderr, "\n");
 }
 #endif
-]
-
-b4_epilogue
+]b4_epilogue[]dnl
 dnl
 dnl glr.cc produces its own header.
 dnl
@@ -2585,7 +2583,7 @@ m4_if(b4_skeleton, ["glr.c"],
 [b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C],
-  [2002, 2003, 2004, 2005, 2006])
+             [2002, 2003, 2004, 2005, 2006])
 
 b4_shared_declarations
 
@@ -2595,5 +2593,5 @@ b4_pure_if([],
 b4_locations_if([b4_pure_if([],
 [extern YYLTYPE ]b4_prefix[lloc;])
 ])
-])])
+])])[]dnl
 m4_divert_pop(0)

diff --git a/data/glr.cc b/data/glr.cc
index 51460fa3b92c07fcfd9fe77f571fdd037bca911a..fa1dfd366c10da2ce9616fcdbd841860a851e6da 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -199,7 +199,6 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 #endif
 ]m4_popdef([b4_parse_param])dnl
 b4_namespace_close[
-
 ]])
 
 
@@ -311,14 +310,11 @@ b4_user_stype
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);
 
-  private:
-
   public:
     /// Report a syntax error.
     /// \param loc    where the syntax error is found.
     /// \param msg    a description of the syntax error.
     virtual void error (const location_type& loc, const std::string& msg);
-  private:
 
 #if YYDEBUG
   public:
@@ -342,7 +338,6 @@ b4_user_stype
     std::ostream* yycdebug_;
 #endif
 
-
     /// \brief Reclaim the memory associated to a symbol.
     /// \param yymsg        Why this token is reclaimed.
     /// \param yytype       The symbol type.

diff --git a/data/lalr1.java b/data/lalr1.java
index b89a4233521954eca62a7cbe2c930a736f7a3458..11ed606dbf087782f4ea0e04560cf04f0926cef4 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -826,5 +826,5 @@ b4_percent_code_get[]dnl
 
 }
 
-b4_epilogue
+b4_epilogue[]dnl
 m4_divert_pop(0)dnl

diff --git a/data/yacc.c b/data/yacc.c
index 7a20cbb31e1b0d7f7f64cfc5ce9085c8e0f9e279..6a547fce3e352c0ab5e5296abb2df3d40222ba6a 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1596,8 +1596,7 @@ yypushreturn:
   return YYID (yyresult);
 }
 
-
-]b4_epilogue
+]b4_epilogue[]dnl
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Interface for Bison's Yacc-like parsers in C])dnl'