* data/c++.m4 (b4_namespace_close): Simplify slightly.

diff --git a/ChangeLog b/ChangeLog
index 87c37012b496a0a2b03683b8e11e7546948c92ce..359363ffa11f3b6a593091f1028f1cdb4444c661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-20  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * data/c++.m4 (b4_namespace_close): Simplify slightly.
+

 2009-05-19  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Handle a trailing `:' in a user-supplied C++ namespace better.
 2009-05-19  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Handle a trailing `:' in a user-supplied C++ namespace better.

diff --git a/data/c++.m4 b/data/c++.m4
index e82e98b30510b8cfc8d068e4272bf7fdc5ee15b2..619db31f0e3d40dce4f51cd79fc7a0bac9559a30 100644 (file)
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -75,9 +75,9 @@ 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_define([b4_namespace_close],
 [b4_user_code([b4_percent_define_get_syncline([[namespace]])
 m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]),

-                                    [^\(.\)[    ]*\(::\)?\([^][:]\|:[^][:]\)*],
+                                    [^\(.\)[    ]*\(::\)?\([^][:]\|:[^:]\)*],

                                     [\1])),
                                     [\1])),

-             [::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])])
+             [::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])])

 
 
 # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
 
 
 # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)