Merge branch 'main' of https://github.com/hsutter/cppfront

Author: hsutter

source/parse.h

@@ -167,7 +167,7 @@ struct primary_expression_node
     auto is_literal() const
         -> bool;
 
-    auto template_arguments() const -> std::vector<template_argument>&;
+    auto template_arguments() const -> std::vector<template_argument> const&;
 
     auto get_token() const -> token const*;
 
@@ -1024,11 +1024,10 @@ struct template_argument
 
     auto to_string() const
         -> std::string;
-
-    //  So that template_arguments() accessors can return a reference to an empty arg list
-    static inline std::vector<template_argument> no_template_args;
 };
 
+// Used by functions that must return a reference to an empty arg list
+inline std::vector<template_argument> const no_template_args;
 
 struct unqualified_id_node
 {
@@ -1040,8 +1039,8 @@ struct unqualified_id_node
 
     std::vector<template_argument> template_args;
 
-    auto template_arguments()
-        -> std::vector<template_argument>&
+    auto template_arguments() const
+        -> std::vector<template_argument> const&
     {
         return template_args;
     }
@@ -1104,7 +1103,7 @@ struct qualified_id_node
     std::vector<term> ids;
 
     auto template_arguments() const
-        -> std::vector<template_argument>&
+        -> std::vector<template_argument> const&
     {
         return ids.back().id->template_arguments();
     }
@@ -1223,7 +1222,7 @@ struct type_id_node
     }
 
     auto template_arguments() const
-        -> std::vector<template_argument>&
+        -> std::vector<template_argument> const&
     {
         if (id.index() == unqualified) {
             return std::get<unqualified>(id)->template_arguments();
@@ -1467,7 +1466,7 @@ struct id_expression_node
     > id;
 
     auto template_arguments() const
-        -> std::vector<template_argument>&
+        -> std::vector<template_argument> const&
     {
         if (is_unqualified()) {
             return std::get<unqualified>(id)->template_arguments();
@@ -3691,13 +3690,13 @@ auto function_type_node::is_destructor() const
 
 
 auto primary_expression_node::template_arguments() const
-    -> std::vector<template_argument>&
+    -> std::vector<template_argument> const&
 {
     if (expr.index() == id_expression) {
         return std::get<id_expression>(expr)->template_arguments();
     }
     // else
-    return template_argument::no_template_args;
+    return no_template_args;
 }