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

(cherry picked from commit e7bfa8b721)
This commit is contained in:
Joel E. Denny
2009-05-20 17:14:08 -04:00
parent 4977e0a7d9
commit b987342bab
2 changed files with 6 additions and 2 deletions

View File

@@ -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.

View File

@@ -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[ ]),
[^\(.\)[ ]*\(::\)?\([^][:]\|:[^][:]\)*],
[^\(.\)[ ]*\(::\)?\([^][:]\|:[^:]\)*],
[\1])),
[::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])])
[::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])])
# b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)