From: Philippe E. <ph...@us...> - 2003-08-12 07:06:24
|
Update of /cvsroot/oprofile/oprofile/libregex In directory sc8-pr-cvs1:/tmp/cvs-serv10306/libregex Modified Files: mangled-name.txt stl.pat.in Log Message: libregex/stl.pat.in: minor fix/improvments Index: mangled-name.txt =================================================================== RCS file: /cvsroot/oprofile/oprofile/libregex/mangled-name.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- mangled-name.txt 19 May 2003 14:52:08 -0000 1.5 +++ mangled-name.txt 12 Aug 2003 06:39:02 -0000 1.6 @@ -97,9 +97,18 @@ _Rb_tree<pair<string const, image_name>> _Rb_tree<int, int, _Identity<int>, less<int>, allocator<int> > _Rb_tree<int, int, int> +_Rb_tree<string, pair<string const, int const>, _Select1st<pair<string const, int const>>, less<string>, allocator<int const>> +_Rb_tree<string, pair<string const, int const>, string const> + _Select1st<pair<int const, long> > int const +_Select1st<pair<int const, long const> > +int const + +_Select1st<pair<string const, split_sample_filename const>> +string const + _Identity<int> int @@ -109,10 +118,10 @@ int # 2.95 map/multimap _Rb_tree<int, pair<int const, long>, _Select1st<pair<int const, long> >, less<int>, allocator<long> > -_Rb_tree<int, pair<int const, long>, int const> +_Rb_tree<int, pair<int const, long>, int const> # 3.2 map/multimap _Rb_tree<int, pair<int const, long>, _Select1st<pair<int const, long> >, less<int>, allocator<pair<int const, long> > > -_Rb_tree<int, pair<int const, long>, int const> +_Rb_tree<int, pair<int const, long>, int const> _List_base<string, allocator<string>> _List_base<string> Index: stl.pat.in =================================================================== RCS file: /cvsroot/oprofile/oprofile/libregex/stl.pat.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- stl.pat.in 1 Aug 2003 16:17:34 -0000 1.5 +++ stl.pat.in 12 Aug 2003 06:39:02 -0000 1.6 @@ -70,18 +70,18 @@ $typename = "(${typename}[ ]*\**|unsigne "\<_Rb_tree<${typename}, \1, _Identity<\1>, ${typename}, allocator<\1>>" = "_Rb_tree<\1, \1, _Identity<\1>, \7>" "_Rb_tree<${typename}, \1, _Identity<\1>, less<\1>>" = "_Rb_tree<\1, \1, _Identity<\1>>" # 2.95 map/multimap implementation -"\<_Rb_tree<${typename}, pair<\1 const, ${typename}>, _Select1st<pair<\1 const, \7>>, less<\1>, allocator<\7>>" = "_Rb_tree<\1, pair<\1 const, \7>, _Select1st<pair<\1 const, \7>>, less<\1>>" +"\<_Rb_tree<${typename}, pair<\1 const, (${typename}( const)?)>, _Select1st<pair<\1 const, \7>>, less<\1>, allocator<\7>>" = "_Rb_tree<\1, pair<\1 const, \7>, _Select1st<pair<\1 const, \7>>, less<\1>>" # 3.2 map/multimap implementation -"\<_Rb_tree<${typename}, pair<\1 const, ${typename}>, _Select1st<pair<\1 const, \7>>, less<\1>, allocator<pair<\1 const, \7>>>" = "_Rb_tree<\1, pair<\1 const, \7>, _Select1st<pair<\1 const, \7>>, less<\1>>" +"\<_Rb_tree<${typename}, pair<\1 const, ${typename}>, _Select1st<pair<\1 const, \7>>, less<\1>, allocator<pair<\1 const, \7>>>" = "_Rb_tree<\1, pair<\1 const, \7>, _Select1st<pair<\1 const, \7>>, less<\1>>" # now we can shrink default comparator. -"\<_Rb_tree<${typename}, pair<\1 const, ${typename}>, _Select1st<pair<\1 const, \7>>, less<\1>>" = "_Rb_tree<\1, pair<\1 const, \7>, _Select1st<pair<\1 const, \7>>>" +"\<_Rb_tree<${typename}, pair<\1 const, (${typename}( const)?)>, _Select1st<pair<\1 const, \7>>, less<\1>>" = "_Rb_tree<\1, pair<\1 const, \7>, _Select1st<pair<\1 const, \7>>>" # get rid of _Select1st and _Identity -# FIXME: the presence od _Identity<> and _Select1st<> was allowing to quickly +# FIXME: the presence od _Identity<> and _Select1st<> allowed to quickly # differentiate a set or a map, the rule now to differentiate them is: # second parameter to _Rb_tree* is a pair<> ==> map else set<>. Either we need # to document this or remove _Identity and _Select1st pattern "\<_Identity<${typename}>" = "\1" -"\<_Select1st<pair<${typename} const, ${typename}>>" = "\1 const" +"\<_Select1st<pair<${typename} const, ${typename}( const)?>>" = "\1 const" "\<_List_base<${typename}, allocator<\1>>" = "_List_base<\1>" @@ -137,8 +137,9 @@ $iosfwd_name = "\<basic_(string|ios|(str "\<fpos<__mbstate_t>" = "streampos" # locale -"\<(money|time|num)_put<${typename}, ostreambuf_iterator<\2>>" = "\1_put<\2>" -"\<(money|time|num)_get<${typename}, istreambuf_iterator<\2>>" = "\1_get<\2>" +# strictly speaking this accept num_put<..., istream_iterator<...> > or +# num_get<..., ostream_iterator<...> > but this can't compile so no big deal +"\<(money|time|num)_(put|get)<${typename}, (i|o)streambuf_iterator<\3>>" = "\1_\2<\3>" "\<moneypunct(_byname)?<${typename}, \(bool\)0>" = "moneypunct\1<\2>" # 3.2 algorithm |