Require template argument list to not be preceded by whitespace

This is a better solution for #695

Now `S: @struct <T> type` just works and does the expected thing

Author: hsutter

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.2.1   Build 8928:1101
+cppfront compiler v0.2.1   Build 8928:1119
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"8928:1101"
+"8928:1119"

source/parse.h

@@ -6128,10 +6128,15 @@ class parser
         auto n = std::make_unique<unqualified_id_node>();
 
         n->identifier = &curr();
+        auto one_past_identifier_end_pos = curr().position();
+        one_past_identifier_end_pos.colno += curr().length();
         next();
 
         //  Handle the template-argument-list if there is one
-        if (curr().type() == lexeme::Less)
+        if (
+            curr().type() == lexeme::Less
+            && curr().position() == one_past_identifier_end_pos
+            )
         {
             //  Remember current position, in case this < is isn't a template argument list
             auto start_pos = pos;

source/reflect.h

@@ -718,13 +718,6 @@ auto print(cpp2::in<meta::type_declaration> t) -> void;
 namespace cpp2 {
 
 
-//-----------------------------------------------------------------------
-//
-//  Now finish the rest of the parser definition
-//
-//-----------------------------------------------------------------------
-//
-
 auto parser::apply_type_metafunctions( declaration_node& n )
     -> bool
 {
@@ -1774,7 +1767,7 @@ auto print(cpp2::in<meta::type_declaration> t) -> void
             && !(CPP2_UFCS_0(arguments_were_used, rtype)))) 
 
         {
-            error(name + " did not use its template arguments - did you mean to write '" + name + "<" + cpp2::assert_in_bounds(args, 0) + ": type>' ?");
+            error(name + " did not use its template arguments - did you mean to write '" + name + " <" + cpp2::assert_in_bounds(args, 0) + "> type' (with the spaces)?");
             return false; 
         }
     }

source/reflect.h2

@@ -1271,7 +1271,7 @@ apply_metafunctions: (
             && !rtype.arguments_were_used()
             ) 
         {
-            error( name + " did not use its template arguments - did you mean to write '" + name + "<" + args[0] + ": type>' ?");
+            error( name + " did not use its template arguments - did you mean to write '" + name + " <" + args[0] + "> type' (with the spaces)?");
             return false;
         }
     }
@@ -1287,13 +1287,6 @@ apply_metafunctions: (
 namespace cpp2 {
 
 
-//-----------------------------------------------------------------------
-//
-//  Now finish the rest of the parser definition
-//
-//-----------------------------------------------------------------------
-//
-
 auto parser::apply_type_metafunctions( declaration_node& n )
     -> bool
 {