gccrs: converter: Const conversion to tokenstream

Make the conversion to tokenstream accept a const pointer vector instead
of a simple pointer vector because no changes are made to the original
tokens.

gcc/rust/ChangeLog:

	* util/rust-token-converter.cc (dispatch_float_literals): Accept
	const_TokenPtr instead of TokenPtr.
	(dispatch_integer_literals): Likewise.
	(convert): Accept vector of const_TokenPtr instead of a vector
	of TokenPtr.
	* util/rust-token-converter.h (convert): Likewise.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

diff --git a/gcc/rust/util/rust-token-converter.cc b/gcc/rust/util/rust-token-converter.cc
index 468769364bb880f8977eab95b4380e0121abf356..711c89d08257f98f498343515c9edef3ef51112f 100644 (file)
--- a/gcc/rust/util/rust-token-converter.cc
+++ b/gcc/rust/util/rust-token-converter.cc
@@ -31,7 +31,7 @@ pop_group (std::vector<ProcMacro::TokenStream> &streams,
 }
 
 static void
-dispatch_float_literals (ProcMacro::TokenStream &ts, TokenPtr &token)
+dispatch_float_literals (ProcMacro::TokenStream &ts, const_TokenPtr &token)
 {
   std::string::size_type sz;
   auto str = token->as_string ();
@@ -55,7 +55,7 @@ dispatch_float_literals (ProcMacro::TokenStream &ts, TokenPtr &token)
 }
 
 static void
-dispatch_integer_literals (ProcMacro::TokenStream &ts, TokenPtr &token)
+dispatch_integer_literals (ProcMacro::TokenStream &ts, const_TokenPtr &token)
 {
   std::string::size_type sz;
   auto str = token->as_string ();
@@ -122,7 +122,7 @@ dispatch_integer_literals (ProcMacro::TokenStream &ts, TokenPtr &token)
 }
 
 ProcMacro::TokenStream
-convert (std::vector<TokenPtr> tokens)
+convert (std::vector<const_TokenPtr> tokens)
 {
   std::vector<ProcMacro::TokenStream> trees;
   trees.push_back (ProcMacro::TokenStream::make_tokenstream ());

diff --git a/gcc/rust/util/rust-token-converter.h b/gcc/rust/util/rust-token-converter.h
index cb8b3dbfa0921afa87dc7c821aa21df85915c693..2e05d5d123c1e49fbd40e50b94d6484d16e78c35 100644 (file)
--- a/gcc/rust/util/rust-token-converter.h
+++ b/gcc/rust/util/rust-token-converter.h
@@ -24,7 +24,7 @@
 namespace Rust {
 
 ProcMacro::TokenStream
-convert (std::vector<TokenPtr> tokens);
+convert (std::vector<const_TokenPtr> tokens);
 
 std::vector<const_TokenPtr>
 convert (ProcMacro::TokenStream ts);