From: Joel E. Denny <jdenny@ces.clemson.edu>
Date: Wed, 20 May 2009 21:14:08 +0000 (-0400)
Subject: * data/c++.m4 (b4_namespace_close): Simplify slightly.
X-Git-Tag: v2.5_rc1~234
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/e7bfa8b7211e2a02f4cec6f122b3141ad2ca97fb

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

diff --git a/ChangeLog b/ChangeLog
index 87c37012..359363ff 100644
--- 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.
diff --git a/data/c++.m4 b/data/c++.m4
index e82e98b3..619db31f 100644
--- 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[ ]),
-                                    [^\(.\)[	 ]*\(::\)?\([^][:]\|:[^][:]\)*],
+                                    [^\(.\)[	 ]*\(::\)?\([^][:]\|:[^:]\)*],
                                     [\1])),
-             [::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])])
+             [::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])])
 
 
 # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)