Avoid trailing spaces.

	* data/c.m4: b4_comment(TEXT): Don't indent empty lines.
	* data/lalr1.cc: Don't indent before rule and symbol actions, as
	they can be empty, and anyway this incorrectly indents the first
	action.

diff --git a/ChangeLog b/ChangeLog
index ed87b06d6afa550d43e35b0e110e6eeac33088e5..e3c3e0e5e5273bb7019c90c8f8fda6b2aa39669e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-10  Akim Demaille  <demaille@gostai.com>
+
+       Avoid trailing spaces.
+       * data/c.m4: b4_comment(TEXT): Don't indent empty lines.
+       * data/lalr1.cc: Don't indent before rule and symbol actions, as
+       they can be empty, and anyway this incorrectly indents the first
+       action.
+
 2008-11-10  Akim Demaille  <demaille@gostai.com>
 
        Comment changes.

diff --git a/data/c.m4 b/data/c.m4
index 46ced82655c748f8b567cda4eac3ab98ad8dd8d8..430a5573290aa1ef7a91b00584f4be6c827d3ef2 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -23,9 +23,12 @@
 
 # b4_comment(TEXT)
 # ----------------
+# Put TEXT in comment.  Avoid trailing spaces: don't indent empty lines.
+# Avoid adding indentation to the first line, as the indentation comes
+# from "/*".  That's why we don't patsubst([$1], [^\(.\)], [   \1]).
 m4_define([b4_comment], [/* m4_bpatsubst([$1], [
-], [
-   ])  */])
+\(.\)], [
+   \1])  */])
 
 # b4_identification
 # -----------------

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 578e24f4171bafda243c22c5f0f54b16d07416c7..c5433435dae960def37b7807e5323863375b77b7 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -884,8 +884,8 @@ b4_percent_code_get[]dnl
         << yysym.location << ": ";
     switch (yytype)
       {
-]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
-[       default:
+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))[
+       default:
          break;
       }
     yyo << ')';
@@ -1105,7 +1105,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
     YY_REDUCE_PRINT (yyn);
     switch (yyn)
       {
-       ]b4_user_actions[
+]b4_user_actions[
        default:
           break;
       }