From: Joel E. Denny Date: Tue, 19 May 2009 21:51:05 +0000 (-0400) Subject: Handle a trailing `:' in a user-supplied C++ namespace better. X-Git-Tag: v2.4.1a~47 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/a17352a9da91a6f413e608964b9bbc3e471f8125 Handle a trailing `:' in a user-supplied C++ namespace better. * data/c++.m4 (b4_namespace_close): Don't let it be printed among the closing braces here. This fix might make the generated code easier to debug, but otherwise it should be insignificant because a trailing `:' is a C++ error already. (cherry picked from commit 8c221795affd367ac106161610d42fc94633e3fd) --- diff --git a/ChangeLog b/ChangeLog index 8f644c4a..7d0d5c15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-05-19 Joel E. Denny + + Handle a trailing `:' in a user-supplied C++ namespace better. + * data/c++.m4 (b4_namespace_close): Don't let it be printed + among the closing braces here. This fix might make the + generated code easier to debug, but otherwise it should be + insignificant because a trailing `:' is a C++ error already. + 2009-05-11 Akim Demaille doc: use C++ headers. diff --git a/data/c++.m4 b/data/c++.m4 index 593390d6..e82e98b3 100644 --- a/data/c++.m4 +++ b/data/c++.m4 @@ -74,7 +74,7 @@ m4_define([b4_namespace_open], m4_define([b4_namespace_close], [b4_user_code([b4_percent_define_get_syncline([[namespace]]) -m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref), +m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]), [^\(.\)[ ]*\(::\)?\([^][:]\|:[^][:]\)*], [\1])), [::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])])