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 9ae746fe6b8d3fd29d3a80c47fe6eeb1403fe521..31217ab047a589bfbf7406a21c19f61e70a29a92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-19  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       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-19  Akim Demaille  <demaille@gostai.com>
 
        remove useless variable.
 2009-05-19  Akim Demaille  <demaille@gostai.com>
 
        remove useless variable.

diff --git a/data/c++.m4 b/data/c++.m4
index c43a4df25d7de5e5447ba2a2e35f652829c19ae1..22ba5314fd9e683ba6462b5db9257e0c02394635 100644 (file)
--- 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_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])])
                                     [^\(.\)[    ]*\(::\)?\([^][:]\|:[^][:]\)*],
                                     [\1])),
              [::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])])