glr2.cc: beware of types with angle brackets

Akim Demaille <[email protected]> Sun, 24 Jan 2021 09:53:42 +0100

Newsgroups	gmane.comp.parsers.bison.patches
Message-ID	<[email protected]>

commit f6e890b5306fb7f44a3e913a4504d504c0ea6acf
Author: Akim Demaille <[email protected]>
Date:   Sun Jan 24 09:37:35 2021 +0100

    glr2.cc: beware of types with angle brackets
    
    For C++98, avoid "yyval.as<std::list<int>>".
    
    * data/skeletons/glr2.cc (b4_call_merger): Add spaces within "<...>".

diff --git a/data/skeletons/glr2.cc b/data/skeletons/glr2.cc
index a674617f6..10956c9e8 100644
--- a/data/skeletons/glr2.cc
+++ b/data/skeletons/glr2.cc
@@ -143,7 +143,7 @@ b4_dollar_popdef[]dnl
 m4_define([b4_call_merger],
 [b4_case([$1],
          [    b4_symbol_if([$3], [has_type],
-                           [b4_variant_if([yy0.as<b4_symbol($3, type)> () = $2 (yy0.as<b4_symbol($3, type)>(), yy1.as<b4_symbol($3, type)>());],
+                           [b4_variant_if([yy0.as< b4_symbol($3, type) > () = $2 (yy0.as< b4_symbol($3, type) >(), yy1.as< b4_symbol($3, type) >());],
                                           [yy0.b4_symbol($3, slot) = $2 (yy0, yy1);])],
                            [yy0 = $2 (yy0, yy1);])])])