On 2015/11/14 21:39, Jérémie Courrèges-Anglas wrote: > > I'll commit this tomorrow unless I hear objections.
I think it's the least bad option for now. The regex problem is solved with this... Index: patches/patch-data_c++_m4 =================================================================== RCS file: patches/patch-data_c++_m4 diff -N patches/patch-data_c++_m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-data_c++_m4 14 Nov 2015 21:00:09 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ +--- data/c++.m4.orig Sat Nov 14 20:54:33 2015 ++++ data/c++.m4 Sat Nov 14 20:56:33 2015 +@@ -100,9 +100,9 @@ m4_define([b4_namespace_open], + m4_define([b4_namespace_close], + [b4_user_code([b4_percent_define_get_syncline([[api.namespace]]) + m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]), +- [^\(.\)[ ]*\(::\)?\([^][:]\|:[^:]\)*], ++ [^\(.\)[ ]*\(::\)?\([^]:[]\|:[^:]\)*], + [\1])), +- [::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])]) ++ [::\([^]:[]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])]) + + + # b4_token_enums ... but then we run into problems with this from m4sugar m4_translit(m4_dquote(m4_format(m4_dquote(m4_for( ,1,255,,[[%c]]))m4_for([i],1,255,,[,i]))), [$*-], [*$])-) "null definition" ... m4_for itself is earlier in the file but I think that may require m4 scuba gear to dissect ;) Anyway I'm OK with this update with the changes we talked about offlist, but if anyone has ideas about either ways to change m4sugar to work better with our m4, or ways to change m4 to support it, it would be very nice...
