}
assert_simple_bound(&trait_bound);
- if let Some(mut path) = types.maybe_resolve_path(&trait_bound.path) {
+ if let Some(mut path) = types.maybe_resolve_path(&trait_bound.path, None) {
if types.skip_path(&path) { continue; }
if non_lifetimes_processed { return false; }
non_lifetimes_processed = true;
if non_lifetimes_processed { return false; }
non_lifetimes_processed = true;
assert_simple_bound(&trait_bound);
- *gen = ("crate::".to_string() + &types.resolve_path(&trait_bound.path),
+ *gen = ("crate::".to_string() + &types.resolve_path(&trait_bound.path, None),
Some(&trait_bound.path));
}
}
},
"Option" => {
if let Some(syn::Type::Path(p)) = single_contained {
- if self.c_type_has_inner_from_path(&self.resolve_path(&p.path)) {
+ if self.c_type_has_inner_from_path(&self.resolve_path(&p.path, None)) {
if is_ref {
return Some(("if ", vec![
(".is_none() { std::ptr::null() } else { ".to_owned(), format!("({}.as_ref().unwrap())", var_access))
},
"Option" => {
if let Some(syn::Type::Path(p)) = single_contained {
- if self.c_type_has_inner_from_path(&self.resolve_path(&p.path)) {
+ if self.c_type_has_inner_from_path(&self.resolve_path(&p.path, None)) {
if is_ref {
return Some(("if ", vec![(".inner.is_null() { None } else { Some((*".to_string(), format!("{}", var_name))], ").clone()) }"))
} else {
} else { None }
}
- pub fn maybe_resolve_path(&self, p: &syn::Path) -> Option<String> {
+ pub fn maybe_resolve_path(&self, p_arg: &syn::Path, generics: Option<&GenericTypes>) -> Option<String> {
+ let p = if let Some(gen_types) = generics {
+ if let Some((_, synpath)) = gen_types.maybe_resolve_path(p_arg) {
+ synpath
+ } else { p_arg }
+ } else { p_arg };
+
if p.leading_colon.is_some() {
// At some point we may need this, but for now, its unused, so just fail.
return None;
} else { None }
}
}
- pub fn resolve_path(&self, p: &syn::Path) -> String {
- self.maybe_resolve_path(p).unwrap()
+ pub fn resolve_path(&self, p: &syn::Path, generics: Option<&GenericTypes>) -> String {
+ self.maybe_resolve_path(p, generics).unwrap()
}
// ***********************************
// ***********************************
fn write_rust_path<W: std::io::Write>(&self, w: &mut W, path: &syn::Path) {
- if let Some(resolved) = self.maybe_resolve_path(&path) {
+ if let Some(resolved) = self.maybe_resolve_path(&path, None) {
if self.is_primitive(&resolved) {
write!(w, "{}", path.get_ident().unwrap()).unwrap();
} else {
pub fn write_empty_rust_val<W: std::io::Write>(&self, w: &mut W, t: &syn::Type) {
match t {
syn::Type::Path(p) => {
- let resolved = self.resolve_path(&p.path);
+ let resolved = self.resolve_path(&p.path, None);
if self.crate_types.opaques.get(&resolved).is_some() {
write!(w, "crate::{} {{ inner: std::ptr::null_mut(), is_owned: true }}", resolved).unwrap();
} else {
pub fn write_empty_rust_val_check_suffix<W: std::io::Write>(&self, w: &mut W, t: &syn::Type) -> bool {
match t {
syn::Type::Path(p) => {
- let resolved = self.resolve_path(&p.path);
+ let resolved = self.resolve_path(&p.path, None);
if self.crate_types.opaques.get(&resolved).is_some() {
write!(w, ".inner.is_null()").unwrap();
false
match t {
syn::Type::Path(p) => {
if p.qself.is_some() { unimplemented!(); }
- if let Some(gen_types) = generics {
- if let Some(resolved) = gen_types.maybe_resolve_path(&p.path) {
- return self.skip_path(resolved.0);
- }
- }
- if let Some(full_path) = self.maybe_resolve_path(&p.path) {
+ if let Some(full_path) = self.maybe_resolve_path(&p.path, generics) {
self.skip_path(&full_path)
} else { false }
},
match t {
syn::Type::Path(p) => {
if p.qself.is_some() { unimplemented!(); }
- if let Some(gen_types) = generics {
- if let Some(resolved) = gen_types.maybe_resolve_path(&p.path) {
- write!(w, "{}", self.no_arg_path_to_rust(resolved.0)).unwrap();
- return;
- }
- }
- if let Some(full_path) = self.maybe_resolve_path(&p.path) {
+ if let Some(full_path) = self.maybe_resolve_path(&p.path, generics) {
write!(w, "{}", self.no_arg_path_to_rust(&full_path)).unwrap();
}
},
unimplemented!();
}
- if let Some(gen_types) = generics {
- if let Some((_, synpath)) = gen_types.maybe_resolve_path(&p.path) {
- let genpath = self.resolve_path(&synpath);
- assert!(!self.is_known_container(&genpath, is_ref) && !self.is_transparent_container(&genpath, is_ref));
- if let Some(c_type) = path_lookup(&genpath, is_ref, ptr_for_ref) {
- write!(w, "{}", c_type).unwrap();
- return;
- } else {
- let synident = single_ident_generic_path_to_ident(synpath).unwrap();
- if let Some(t) = self.crate_types.traits.get(&genpath) {
- decl_lookup(w, &DeclType::Trait(t), &genpath, is_ref, is_mut);
- return;
- } else if let Some(_) = self.imports.get(synident) {
- // crate_types lookup has to have succeeded:
- panic!("Failed to print inline conversion for {}", synident);
- } else if let Some(decl_type) = self.declared.get(synident) {
- decl_lookup(w, decl_type, &self.maybe_resolve_path(synpath).unwrap(), is_ref, is_mut);
- return;
- } else { unimplemented!(); }
- }
- }
- }
-
- let resolved_path = self.resolve_path(&p.path);
+ let resolved_path = self.resolve_path(&p.path, generics);
if let Some(c_type) = path_lookup(&resolved_path, is_ref, ptr_for_ref) {
write!(w, "{}", c_type).unwrap();
} else if self.crate_types.opaques.get(&resolved_path).is_some() {
} else if self.crate_types.mirrored_enums.get(&resolved_path).is_some() {
decl_lookup(w, &DeclType::MirroredEnum, &resolved_path, is_ref, is_mut);
} else if let Some(ident) = single_ident_generic_path_to_ident(&p.path) {
- if let Some(_) = self.imports.get(ident) {
+ if let Some(t) = self.crate_types.traits.get(&resolved_path) {
+ decl_lookup(w, &DeclType::Trait(t), &resolved_path, is_ref, is_mut);
+ return;
+ } else if let Some(_) = self.imports.get(ident) {
// crate_types lookup has to have succeeded:
panic!("Failed to print inline conversion for {}", ident);
} else if let Some(decl_type) = self.declared.get(ident) {
// We assume all slices contain only literals or references.
// This may result in some outputs not compiling.
if let syn::Type::Path(p) = &*s.elem {
- let resolved = self.resolve_path(&p.path);
+ let resolved = self.resolve_path(&p.path, generics);
assert!(self.is_primitive(&resolved));
write!(w, "{}", path_lookup("[u8]", is_ref, ptr_for_ref).unwrap()).unwrap();
} else if let syn::Type::Reference(r) = &*s.elem {
if let syn::Type::Path(p) = &*r.elem {
- write!(w, "{}", sliceconv(self.c_type_has_inner_from_path(&self.resolve_path(&p.path)))).unwrap();
+ write!(w, "{}", sliceconv(self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics)))).unwrap();
} else { unimplemented!(); }
} else { unimplemented!(); }
},
}
if let syn::Type::Reference(t) = ty {
if let syn::Type::Path(p) = &*t.elem {
- self.c_type_has_inner_from_path(&self.resolve_path(&p.path))
+ self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics))
} else { false }
} else if let syn::Type::Path(p) = ty {
- self.c_type_has_inner_from_path(&self.resolve_path(&p.path))
+ self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics))
} else { false }
} else { true };
if p.qself.is_some() || p.path.leading_colon.is_some() {
unimplemented!();
}
- if let Some(gen_types) = generics {
- if let Some(resolved) = gen_types.maybe_resolve_path(&p.path) {
- assert!(!self.is_known_container(&resolved.0, is_ref) && !self.is_transparent_container(&resolved.0, is_ref));
- if let Some((prefix, suffix)) = path_lookup(&resolved.0, is_ref) {
- write!(w, "let mut local_{} = {}{}{};", ident, prefix, var, suffix).unwrap();
- return true;
- } else { return false; }
- }
- }
- let resolved_path = self.resolve_path(&p.path);
+ let resolved_path = self.resolve_path(&p.path, generics);
if self.is_known_container(&resolved_path, is_ref) || self.is_transparent_container(&resolved_path, is_ref) {
if let syn::PathArguments::AngleBracketed(args) = &p.path.segments.iter().next().unwrap().arguments {
convert_container!(resolved_path, args.args.len(), || args.args.iter().map(|arg| {
},
syn::Type::Slice(s) => {
if let syn::Type::Path(p) = &*s.elem {
- let resolved = self.resolve_path(&p.path);
+ let resolved = self.resolve_path(&p.path, generics);
assert!(self.is_primitive(&resolved));
let slice_path = format!("[{}]", resolved);
if let Some((prefix, suffix)) = path_lookup(&slice_path, true) {
// Opaque types with inner pointers shouldn't ever create new stack
// variables, so we don't handle it and just assert that it doesn't
// here.
- assert!(!self.c_type_has_inner_from_path(&self.resolve_path(&p.path)));
+ assert!(!self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics)));
}
}
}
}
if let syn::Type::Reference(t) = elem {
if let syn::Type::Path(p) = &*t.elem {
- self.c_type_has_inner_from_path(&self.resolve_path(&p.path))
+ self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics))
} else { false }
} else if let syn::Type::Path(p) = elem {
- self.c_type_has_inner_from_path(&self.resolve_path(&p.path))
+ self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics))
} else { false }
};
if idx != 0 { write!(w, ", ").unwrap(); }
// *** C Container Type Equivalent and alias Printing ***
// ******************************************************
- fn write_template_constructor<W: std::io::Write>(&mut self, w: &mut W, container_type: &str, mangled_container: &str, args: &Vec<&syn::Type>, is_ref: bool) {
+ fn write_template_constructor<W: std::io::Write>(&mut self, w: &mut W, container_type: &str, mangled_container: &str, args: &Vec<&syn::Type>, generics: Option<&GenericTypes>, is_ref: bool) {
if container_type == "Result" {
assert_eq!(args.len(), 2);
macro_rules! write_fn {
($call: expr, $item: expr) => { {
write!(w, "#[no_mangle]\npub static {}_{}: extern \"C\" fn (", mangled_container, $call).unwrap();
if let syn::Type::Path(syn::TypePath { path, .. }) = $item {
- let resolved = self.resolve_path(path);
+ let resolved = self.resolve_path(path, generics);
if self.is_known_container(&resolved, is_ref) || self.is_transparent_container(&resolved, is_ref) {
- self.write_c_mangled_container_path_intern(w, Self::path_to_generic_args(path),
+ self.write_c_mangled_container_path_intern(w, Self::path_to_generic_args(path), generics,
&format!("{}", single_ident_generic_path_to_ident(path).unwrap()), is_ref, false, false, false);
} else {
self.write_template_generics(w, &mut [$item].iter().map(|t| *t), is_ref, true);
}
} else if let syn::Type::Tuple(syn::TypeTuple { elems, .. }) = $item {
- self.write_c_mangled_container_path_intern(w, elems.iter().collect(),
+ self.write_c_mangled_container_path_intern(w, elems.iter().collect(), generics,
&format!("{}Tuple", elems.len()), is_ref, false, false, false);
} else { unimplemented!(); }
write!(w, ") -> {} =\n\t{}::CResultTempl::<", mangled_container, Self::container_templ_path()).unwrap();
write!(w, "#[no_mangle]\npub extern \"C\" fn {}_new(", mangled_container).unwrap();
for (idx, gen) in args.iter().enumerate() {
write!(w, "{}{}: ", if idx != 0 { ", " } else { "" }, ('a' as u8 + idx as u8) as char).unwrap();
- self.write_c_type_intern(None, w, gen, false, false, false);
+ self.write_c_type_intern(w, gen, None, false, false, false);
}
writeln!(w, ") -> {} {{", mangled_container).unwrap();
writeln!(w, "\t{} {{", mangled_container).unwrap();
write!(w, ">").unwrap();
}
} else if let syn::Type::Path(p_arg) = t {
- let resolved_generic = self.resolve_path(&p_arg.path);
+ let resolved_generic = self.resolve_path(&p_arg.path, None);
if self.is_primitive(&resolved_generic) {
write!(w, "{}", resolved_generic).unwrap();
} else if let Some(c_type) = self.c_type_from_path(&resolved_generic, is_ref, false) {
}
} else if let syn::Type::Reference(r_arg) = t {
if let syn::Type::Path(p_arg) = &*r_arg.elem {
- let resolved = self.resolve_path(&p_arg.path);
+ let resolved = self.resolve_path(&p_arg.path, None);
if single_ident_generic_path_to_ident(&p_arg.path).is_some() {
if self.crate_types.opaques.get(&resolved).is_some() {
write!(w, "crate::{}", resolved).unwrap();
} else { unimplemented!(); }
} else if let syn::Type::Array(a_arg) = t {
if let syn::Type::Path(p_arg) = &*a_arg.elem {
- let resolved = self.resolve_path(&p_arg.path);
+ let resolved = self.resolve_path(&p_arg.path, None);
assert!(self.is_primitive(&resolved));
if let syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Int(len), .. }) = &a_arg.len {
write!(w, "{}",
}
}
}
- fn check_create_container(&mut self, mangled_container: String, container_type: &str, args: Vec<&syn::Type>, is_ref: bool) {
+ fn check_create_container(&mut self, mangled_container: String, container_type: &str, args: Vec<&syn::Type>, generics: Option<&GenericTypes>, is_ref: bool) {
if !self.crate_types.templates_defined.get(&mangled_container).is_some() {
self.crate_types.templates_defined.insert(mangled_container.clone(), true);
let mut created_container: Vec<u8> = Vec::new();
self.write_template_generics(&mut created_container, &mut args.iter().map(|t| *t), is_ref, true);
writeln!(&mut created_container, ">;").unwrap();
- self.write_template_constructor(&mut created_container, container_type, &mangled_container, &args, is_ref);
+ self.write_template_constructor(&mut created_container, container_type, &mangled_container, &args, generics, is_ref);
self.crate_types.template_file.write(&created_container).unwrap();
}
} else { unimplemented!(); }
}
fn write_c_mangled_container_path_intern<W: std::io::Write>
- (&mut self, w: &mut W, args: Vec<&syn::Type>, ident: &str, is_ref: bool, is_mut: bool, ptr_for_ref: bool, in_type: bool) -> bool {
+ (&mut self, w: &mut W, args: Vec<&syn::Type>, generics: Option<&GenericTypes>, ident: &str, is_ref: bool, is_mut: bool, ptr_for_ref: bool, in_type: bool) -> bool {
let mut mangled_type: Vec<u8> = Vec::new();
if !self.is_transparent_container(ident, is_ref) {
write!(w, "C{}_", ident).unwrap();
for arg in args.iter() {
macro_rules! write_path {
($p_arg: expr, $extra_write: expr) => {
- let subtype = self.resolve_path(&$p_arg.path);
+ let subtype = self.resolve_path(&$p_arg.path, generics);
if self.is_transparent_container(ident, is_ref) {
// We dont (yet) support primitives or containers inside transparent
// containers, so check for that first:
if self.is_known_container(&subtype, is_ref) { return false; }
if !in_type {
if self.c_type_has_inner_from_path(&subtype) {
- if !self.write_c_path_intern(w, &$p_arg.path, is_ref, is_mut, ptr_for_ref) { return false; }
+ if !self.write_c_path_intern(w, &$p_arg.path, generics, is_ref, is_mut, ptr_for_ref) { return false; }
} else {
- if !self.write_c_path_intern(w, &$p_arg.path, true, is_mut, true) { return false; }
+ if !self.write_c_path_intern(w, &$p_arg.path, generics, true, is_mut, true) { return false; }
}
} else {
if $p_arg.path.segments.len() == 1 {
}
}
} else if self.is_known_container(&subtype, is_ref) || self.is_transparent_container(&subtype, is_ref) {
- if !self.write_c_mangled_container_path_intern(w, Self::path_to_generic_args(&$p_arg.path),
+ if !self.write_c_mangled_container_path_intern(w, Self::path_to_generic_args(&$p_arg.path), generics,
&subtype, is_ref, is_mut, ptr_for_ref, true) {
return false;
}
self.write_c_mangled_container_path_intern(&mut mangled_type, Self::path_to_generic_args(&$p_arg.path),
- &subtype, is_ref, is_mut, ptr_for_ref, true);
+ generics, &subtype, is_ref, is_mut, ptr_for_ref, true);
if let Some(w2) = $extra_write as Option<&mut Vec<u8>> {
self.write_c_mangled_container_path_intern(w2, Self::path_to_generic_args(&$p_arg.path),
- &subtype, is_ref, is_mut, ptr_for_ref, true);
+ generics, &subtype, is_ref, is_mut, ptr_for_ref, true);
}
} else if let Some(id) = single_ident_generic_path_to_ident(&$p_arg.path) {
write!(w, "{}", id).unwrap();
write!(mangled_type, "Z").unwrap();
write!(mangled_tuple_type, "Z").unwrap();
self.check_create_container(String::from_utf8(mangled_tuple_type).unwrap(),
- &format!("{}Tuple", tuple.elems.len()), tuple.elems.iter().collect(), is_ref);
+ &format!("{}Tuple", tuple.elems.len()), tuple.elems.iter().collect(), generics, is_ref);
}
} else if let syn::Type::Path(p_arg) = arg {
write_path!(p_arg, None);
} else { return false; }
} else if let syn::Type::Array(a) = arg {
if let syn::Type::Path(p_arg) = &*a.elem {
- let resolved = self.resolve_path(&p_arg.path);
+ let resolved = self.resolve_path(&p_arg.path, generics);
if !self.is_primitive(&resolved) { return false; }
if let syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Int(len), .. }) = &a.len {
if self.c_type_from_path(&format!("[{}; {}]", resolved, len.base10_digits()), is_ref, ptr_for_ref).is_none() { return false; }
write!(mangled_type, "Z").unwrap();
// Make sure the type is actually defined:
- self.check_create_container(String::from_utf8(mangled_type).unwrap(), ident, args, is_ref);
+ self.check_create_container(String::from_utf8(mangled_type).unwrap(), ident, args, generics, is_ref);
true
}
- fn write_c_mangled_container_path<W: std::io::Write>(&mut self, w: &mut W, args: Vec<&syn::Type>, ident: &str, is_ref: bool, is_mut: bool, ptr_for_ref: bool) -> bool {
+ fn write_c_mangled_container_path<W: std::io::Write>(&mut self, w: &mut W, args: Vec<&syn::Type>, generics: Option<&GenericTypes>, ident: &str, is_ref: bool, is_mut: bool, ptr_for_ref: bool) -> bool {
if !self.is_transparent_container(ident, is_ref) {
write!(w, "{}::", Self::generated_container_path()).unwrap();
}
- self.write_c_mangled_container_path_intern(w, args, ident, is_ref, is_mut, ptr_for_ref, false)
+ self.write_c_mangled_container_path_intern(w, args, generics, ident, is_ref, is_mut, ptr_for_ref, false)
}
// **********************************
// *** C Type Equivalent Printing ***
// **********************************
- fn write_c_path_intern<W: std::io::Write>(&self, w: &mut W, path: &syn::Path, is_ref: bool, is_mut: bool, ptr_for_ref: bool) -> bool {
-//eprintln!("pcpi ({} {} {}): {:?}", is_ref, is_mut, ptr_for_ref, path);
- let full_path = match self.maybe_resolve_path(&path) {
+ fn write_c_path_intern<W: std::io::Write>(&self, w: &mut W, path: &syn::Path, generics: Option<&GenericTypes>, is_ref: bool, is_mut: bool, ptr_for_ref: bool) -> bool {
+ let full_path = match self.maybe_resolve_path(&path, generics) {
Some(path) => path, None => return false };
if let Some(c_type) = self.c_type_from_path(&full_path, is_ref, ptr_for_ref) {
write!(w, "{}", c_type).unwrap();
false
}
}
- fn write_c_type_intern<W: std::io::Write>(&mut self, generics: Option<&GenericTypes>, w: &mut W, t: &syn::Type, is_ref: bool, is_mut: bool, ptr_for_ref: bool) -> bool {
+ fn write_c_type_intern<W: std::io::Write>(&mut self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, is_mut: bool, ptr_for_ref: bool) -> bool {
match t {
syn::Type::Path(p) => {
if p.qself.is_some() || p.path.leading_colon.is_some() {
return false;
}
- if let Some(gen_types) = generics {
- if let Some(resolved) = gen_types.maybe_resolve_path(&p.path) {
- if self.is_known_container(&resolved.0, is_ref) { return false; }
- if self.is_transparent_container(&resolved.0, is_ref) { return false; }
- return self.write_c_path_intern(w, &resolved.1, is_ref, is_mut, ptr_for_ref);
- }
- }
- if let Some(full_path) = self.maybe_resolve_path(&p.path) {
+ if let Some(full_path) = self.maybe_resolve_path(&p.path, generics) {
if self.is_known_container(&full_path, is_ref) || self.is_transparent_container(&full_path, is_ref) {
- return self.write_c_mangled_container_path(w, Self::path_to_generic_args(&p.path), &full_path, is_ref, is_mut, ptr_for_ref);
+ return self.write_c_mangled_container_path(w, Self::path_to_generic_args(&p.path), generics, &full_path, is_ref, is_mut, ptr_for_ref);
}
}
if p.path.leading_colon.is_some() { return false; }
- self.write_c_path_intern(w, &p.path, is_ref, is_mut, ptr_for_ref)
+ self.write_c_path_intern(w, &p.path, generics, is_ref, is_mut, ptr_for_ref)
},
syn::Type::Reference(r) => {
if let Some(lft) = &r.lifetime {
if format!("{}", lft.ident) != "static" { return false; }
}
- self.write_c_type_intern(generics, w, &*r.elem, true, r.mutability.is_some(), ptr_for_ref)
+ self.write_c_type_intern(w, &*r.elem, generics, true, r.mutability.is_some(), ptr_for_ref)
},
syn::Type::Array(a) => {
if is_ref && is_mut {
write!(w, "*mut [").unwrap();
- if !self.write_c_type_intern(generics, w, &a.elem, false, false, ptr_for_ref) { return false; }
+ if !self.write_c_type_intern(w, &a.elem, generics, false, false, ptr_for_ref) { return false; }
} else if is_ref {
write!(w, "*const [").unwrap();
- if !self.write_c_type_intern(generics, w, &a.elem, false, false, ptr_for_ref) { return false; }
+ if !self.write_c_type_intern(w, &a.elem, generics, false, false, ptr_for_ref) { return false; }
} else {
let mut typecheck = Vec::new();
- if !self.write_c_type_intern(generics, &mut typecheck, &a.elem, false, false, ptr_for_ref) { return false; }
+ if !self.write_c_type_intern(&mut typecheck, &a.elem, generics, false, false, ptr_for_ref) { return false; }
if typecheck[..] != ['u' as u8, '8' as u8] { return false; }
}
if let syn::Expr::Lit(l) = &a.len {
syn::Type::Slice(s) => {
if !is_ref || is_mut { return false; }
if let syn::Type::Path(p) = &*s.elem {
- let resolved = self.resolve_path(&p.path);
+ let resolved = self.resolve_path(&p.path, generics);
if self.is_primitive(&resolved) {
write!(w, "{}::{}slice", Self::container_templ_path(), resolved).unwrap();
true
} else if let syn::Type::Reference(r) = &*s.elem {
if let syn::Type::Path(p) = &*r.elem {
// Slices with "real types" inside are mapped as the equivalent non-ref Vec
- let resolved = self.resolve_path(&p.path);
+ let resolved = self.resolve_path(&p.path, generics);
let mangled_container = if let Some(ident) = self.crate_types.opaques.get(&resolved) {
format!("CVec_{}Z", ident)
} else if let Some(en) = self.crate_types.mirrored_enums.get(&resolved) {
format!("CVec_{}Z", id)
} else { return false; };
write!(w, "{}::{}", Self::generated_container_path(), mangled_container).unwrap();
- self.check_create_container(mangled_container, "Vec", vec![&*r.elem], false);
+ self.check_create_container(mangled_container, "Vec", vec![&*r.elem], generics, false);
true
} else { false }
} else { false }
if t.elems.len() == 0 {
true
} else {
- self.write_c_mangled_container_path(w, t.elems.iter().collect(),
+ self.write_c_mangled_container_path(w, t.elems.iter().collect(), generics,
&format!("{}Tuple", t.elems.len()), is_ref, is_mut, ptr_for_ref)
}
},
}
}
pub fn write_c_type<W: std::io::Write>(&mut self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, ptr_for_ref: bool) {
- assert!(self.write_c_type_intern(generics, w, t, false, false, ptr_for_ref));
+ assert!(self.write_c_type_intern(w, t, generics, false, false, ptr_for_ref));
}
pub fn understood_c_path(&mut self, p: &syn::Path) -> bool {
if p.leading_colon.is_some() { return false; }
- self.write_c_path_intern(&mut std::io::sink(), p, false, false, false)
+ self.write_c_path_intern(&mut std::io::sink(), p, None, false, false, false)
}
pub fn understood_c_type(&mut self, t: &syn::Type, generics: Option<&GenericTypes>) -> bool {
- self.write_c_type_intern(generics, &mut std::io::sink(), t, false, false, false)
+ self.write_c_type_intern(&mut std::io::sink(), t, generics, false, false, false)
}
}
projects / rust-lightning / blobdiff