openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2025-02-23 01:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1150 from dtolnay/cxxname

Browse Source 
Support cxx_name containing name that is Rust keyword
This commit is contained in:
David Tolnay 2023-01-07 12:07:53 -08:00 committed by GitHub
commit a72a40902b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syntax/names.rs
View File

@ -3,7 +3,8 @@ use crate::syntax::{Lifetimes, NamedType, Pair, Symbol};
use proc_macro2::{Ident, Span};
use std::fmt::{self, Display};
use std::iter;
use syn::parse::{Error, Result};
use syn::ext::IdentExt;
use syn::parse::{Error, Parser, Result};
use syn::punctuated::Punctuated;
#[derive(Clone)]
@ -41,7 +42,7 @@ impl ForeignName {
pub fn parse(text: &str, span: Span) -> Result<Self> {
// TODO: support C++ names containing whitespace (`unsigned int`) or
// non-alphanumeric characters (`operator++`).
match syn::parse_str::<Ident>(text) {
match Ident::parse_any.parse_str(text) {
Ok(ident) => {
let text = ident.to_string();
Ok(ForeignName { text })

1
tests/ffi/lib.rs
View File

@ -43,6 +43,7 @@ pub mod ffi {
#[namespace = "A"]
#[derive(Copy, Clone, Default)]
struct AShared {
#[cxx_name = "type"]
z: usize,
}

10
tests/ffi/tests.cc
View File

@ -86,7 +86,9 @@ std::unique_ptr<::H::H> c_return_ns_unique_ptr() {
const size_t &c_return_ref(const Shared &shared) { return shared.z; }
const size_t &c_return_ns_ref(const ::A::AShared &shared) { return shared.z; }
const size_t &c_return_ns_ref(const ::A::AShared &shared) {
return shared.type;
}
const size_t &c_return_nested_ns_ref(const ::A::B::ABShared &shared) {
return shared.z;
@ -240,7 +242,7 @@ void c_take_shared(Shared shared) {
}
void c_take_ns_shared(::A::AShared shared) {
if (shared.z == 2020) {
if (shared.type == 2020) {
cxx_test_suite_set_correct();
}
}
@ -397,7 +399,7 @@ void c_take_rust_vec_shared(rust::Vec<Shared> v) {
void c_take_rust_vec_ns_shared(rust::Vec<::A::AShared> v) {
uint32_t sum = 0;
for (auto i : v) {
sum += i.z;
sum += i.type;
}
if (sum == 2021) {
cxx_test_suite_set_correct();
@ -916,7 +918,7 @@ void ns_c_take_trivial(::tests::D d) {
}
void ns_c_take_ns_shared(::A::AShared shared) {
if (shared.z == 2020) {
if (shared.type == 2020) {
cxx_test_suite_set_correct();
}
}