diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-07-26 16:44:59 +0200 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2023-07-27 12:25:20 +0000 |
| commit | 1074c90c8057cfb5c55a6e3f863a5413c34b75c8 (patch) | |
| tree | df2e424ee40e536b9ae001dfa67c3fcf346446b9 | |
| parent | ddce1d9e9e783af7e14a99f112c86d006ca0ee02 (diff) | |
| download | gcc-1074c90c8057cfb5c55a6e3f863a5413c34b75c8.zip gcc-1074c90c8057cfb5c55a6e3f863a5413c34b75c8.tar.gz gcc-1074c90c8057cfb5c55a6e3f863a5413c34b75c8.tar.bz2 | |
proc_macro: Rename from_string callback symbol
The symbol had a different convention from rust standard naming
convention (?) hence the change before adding new callback.
gcc/rust/ChangeLog:
* expand/rust-proc-macro.cc (load_macros_array): Symbol rename.
ChangeLog:
* libgrust/libproc_macro/proc_macro.cc (Procmacro::make_bang):
Change symbol name.
* libgrust/libproc_macro/registration.h: Likewise.
* libgrust/libproc_macro/tokenstream.cc (TokenStream::make_tokenstream): Likewise.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/expand/rust-proc-macro.cc | 4 | ||||
| -rw-r--r-- | libgrust/libproc_macro/proc_macro.cc | 2 | ||||
| -rw-r--r-- | libgrust/libproc_macro/registration.h | 2 | ||||
| -rw-r--r-- | libgrust/libproc_macro/tokenstream.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gcc/rust/expand/rust-proc-macro.cc b/gcc/rust/expand/rust-proc-macro.cc index acd7f71..7843ead 100644 --- a/gcc/rust/expand/rust-proc-macro.cc +++ b/gcc/rust/expand/rust-proc-macro.cc @@ -26,7 +26,7 @@ namespace Rust { const std::string PROC_MACRO_DECL_PREFIX = "__gccrs_proc_macro_decls_"; -ProcMacro::TokenStream +static ProcMacro::TokenStream tokenstream_from_string (std::string &data, bool &lex_error) { // FIXME: Insert location pointing to call site in tokens @@ -92,7 +92,7 @@ load_macros_array (std::string path) return nullptr; } - if (!REGISTER_CALLBACK (handle, __gccrs_pm_callback_from_str_fn, + if (!REGISTER_CALLBACK (handle, __gccrs_proc_macro_from_str_fn, tokenstream_from_string)) return nullptr; diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_macro/proc_macro.cc index effe717..a404691 100644 --- a/libgrust/libproc_macro/proc_macro.cc +++ b/libgrust/libproc_macro/proc_macro.cc @@ -51,4 +51,4 @@ Procmacro::make_bang (const char *name, BangMacro macro) } // namespace ProcMacro -ProcMacro::from_str_function_t __gccrs_pm_callback_from_str_fn = nullptr; +ProcMacro::from_str_function_t __gccrs_proc_macro_from_str_fn = nullptr; diff --git a/libgrust/libproc_macro/registration.h b/libgrust/libproc_macro/registration.h index bba69b1..5cefc37 100644 --- a/libgrust/libproc_macro/registration.h +++ b/libgrust/libproc_macro/registration.h @@ -32,6 +32,6 @@ using from_str_function_t = ProcMacro::TokenStream (*) (std::string &, bool &); } // namespace ProcMacro -extern "C" ProcMacro::from_str_function_t __gccrs_pm_callback_from_str_fn; +extern "C" ProcMacro::from_str_function_t __gccrs_proc_macro_from_str_fn; #endif /* !REGISTRATION_H */ diff --git a/libgrust/libproc_macro/tokenstream.cc b/libgrust/libproc_macro/tokenstream.cc index 5d9abb6..0f7f1f2 100644 --- a/libgrust/libproc_macro/tokenstream.cc +++ b/libgrust/libproc_macro/tokenstream.cc @@ -49,7 +49,7 @@ TokenStream::make_tokenstream (std::uint64_t capacity) TokenStream TokenStream::make_tokenstream (std::string &source, bool &has_error) { - return __gccrs_pm_callback_from_str_fn (source, has_error); + return __gccrs_proc_macro_from_str_fn (source, has_error); } void |