From: Akim Demaille <demaille@gostai.com> Date: Wed, 31 Dec 2008 10:42:31 +0000 (+0100) Subject: Remove trailing blanks. X-Git-Tag: v2.7.90~949 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/4524c55bcfc69d0ecb0e1b35dac035d44153c576?hp=6ceccee88de88243c82259402b5677dc73f55042 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 ef97e9b1..a3d1da56 100644 --- 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 35c54199..bf1f1a22 100644 --- 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 51460fa3..fa1dfd36 100644 --- 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 b89a4233..11ed606d 100644 --- 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 7a20cbb3..6a547fce 100644 --- 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'