wip

Author: phi-gamma

gcc/rust/parse/rust-parse-impl.hxx

@@ -1667,7 +1667,7 @@ Parser<ManagedTokenSource>::parse_function_qualifiers ()
 template <typename ManagedTokenSource>
 tl::expected<AST::FunctionQualifiers, Parse::Error::Node>
 Parser<ManagedTokenSource>::function_qualifiers_from_keywords (
-  location_t locus, std::vector<TokenId> keywords, std::string abi)
+  location_t locus, const std::vector<TokenId> keywords, std::string abi)
 {
   Default default_status = Default::No;
   Async async_status = Async::No;
@@ -1812,62 +1812,65 @@ Parser<ManagedTokenSource>::ensure_function_qualifier_order (
       const size_t priority = token_priority (token_id);
       if (priority <= last_priority)
 	{
-	  auto qualifiers_to_str = [] (const std::vector<TokenId> &token_ids) {
-	    std::ostringstream ss;
+	  emit_function_qualifier_order_error_msg (locus, found_order);
+	  return false;
+	}
 
-	    for (auto id : token_ids)
-	      {
-		if (ss.tellp () != 0)
-		  ss << ' ';
+      last_priority = priority;
+    }
 
-		if (id == IDENTIFIER)
-		  ss << Values::WeakKeywords::DEFAULT;
-		else
-		  ss << token_id_keyword_string (id);
-	      }
+  return true;
+}
 
-	    return ss.str ();
-	  };
+template <typename ManagedTokenSource>
+void
+Parser<ManagedTokenSource>::emit_function_qualifier_order_error_msg (
+  location_t locus, const std::vector<TokenId> &found_order)
+{
+  std::vector<TokenId> expected_order
+    = {IDENTIFIER, CONST, ASYNC, UNSAFE, EXTERN_KW};
 
-	  std::vector<TokenId> expected_order
-	    = {IDENTIFIER, CONST, ASYNC, UNSAFE, EXTERN_KW};
+  // we only keep the qualifiers actually used in the offending code
+  std::vector<TokenId>::iterator token_id = expected_order.begin ();
+  while (token_id != expected_order.end ())
+    {
+      if (std::find (found_order.cbegin (), found_order.cend (), *token_id)
+	  == found_order.cend ())
+	{
+	  token_id = expected_order.erase (token_id);
+	}
+      else
+	{
+	  ++token_id;
+	}
+    }
 
-	  // we only keep the qualifiers actually used in the offending code
-	  std::vector<TokenId>::const_iterator token_id
-	    = expected_order.cbegin ();
-	  while (token_id != expected_order.cend ())
-	    {
-	      if (std::find (found_order.cbegin (), found_order.cend (),
-			     *token_id)
-		  == found_order.cend ())
-		{
-		  token_id = expected_order.erase (token_id);
-		}
-	      else
-		{
-		  ++token_id;
-		}
-	    }
+  auto qualifiers_to_str = [] (const std::vector<TokenId> &token_ids) {
+    std::ostringstream ss;
 
-	  const std::string found_qualifiers = qualifiers_to_str (found_order);
-	  const std::string expected_qualifiers
-	    = qualifiers_to_str (expected_order);
+    for (auto id : token_ids)
+      {
+	if (ss.tellp () != 0)
+	  ss << ' ';
 
-	  location_t error_locus
-	    = make_location (locus, locus, lexer.peek_token ()->get_locus ());
-	  Error error (
-	    error_locus,
-	    "invalid order of function qualifiers; found %qs, expected %qs",
-	    found_qualifiers.c_str (), expected_qualifiers.c_str ());
-	  add_error (std::move (error));
+	if (id == IDENTIFIER)
+	  ss << Values::WeakKeywords::DEFAULT;
+	else
+	  ss << token_id_keyword_string (id);
+      }
 
-	  return false;
-	}
+    return ss.str ();
+  };
 
-      last_priority = priority;
-    }
+  const std::string found_qualifiers = qualifiers_to_str (found_order);
+  const std::string expected_qualifiers = qualifiers_to_str (expected_order);
 
-  return true;
+  location_t error_locus
+    = make_location (locus, locus, lexer.peek_token ()->get_locus ());
+  Error error (error_locus,
+	       "invalid order of function qualifiers; found %qs, expected %qs",
+	       found_qualifiers.c_str (), expected_qualifiers.c_str ());
+  add_error (std::move (error));
 }
 
 // Parses generic (lifetime or type) params inside angle brackets (optional).

gcc/rust/parse/rust-parse.h

@@ -375,6 +375,8 @@ template <typename ManagedTokenSource> class Parser
   function_qualifiers_from_keywords (location_t locus,
 				     std::vector<TokenId> keywords,
 				     std::string abi);
+  void emit_function_qualifier_order_error_msg (
+    location_t locus, const std::vector<TokenId> &found_order);
 
   std::vector<std::unique_ptr<AST::GenericParam>>
   parse_generic_params_in_angles ();