pub mirrored_enums: HashMap<String, &'a syn::ItemEnum>,
/// Traits which are mapped as a pointer + jump table
pub traits: HashMap<String, &'a syn::ItemTrait>,
+ /// Aliases from paths to some other Type
+ pub type_aliases: HashMap<String, syn::Type>,
/// Template continer types defined, map from mangled type name -> whether a destructor fn
/// exists.
///
} 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;
+ Some(p.segments.iter().enumerate().map(|(idx, seg)| {
+ format!("{}{}", if idx == 0 { "" } else { "::" }, seg.ident)
+ }).collect())
} else if let Some(id) = p.get_ident() {
self.maybe_resolve_ident(id)
} else {
let mut seg_iter = p.segments.iter();
let first_seg = seg_iter.next().unwrap();
let remaining: String = seg_iter.map(|seg| {
- if let syn::PathArguments::None = seg.arguments {
- format!("{}", seg.ident)
- } else {
- format!("{}", seg.ident)
- }
+ format!("::{}", seg.ident)
}).collect();
if let Some(imp) = self.imports.get(&first_seg.ident) {
if remaining != "" {
- Some(imp.clone() + "::" + &remaining)
+ Some(imp.clone() + &remaining)
} else {
Some(imp.clone())
}
ptr_for_ref, tupleconv, prefix, sliceconv, path_lookup, decl_lookup);
},
syn::Type::Path(p) => {
- if p.qself.is_some() || p.path.leading_colon.is_some() {
+ if p.qself.is_some() {
unimplemented!();
}
let resolved_path = self.resolve_path(&p.path, generics);
- if let Some(c_type) = path_lookup(&resolved_path, is_ref, ptr_for_ref) {
+ if let Some(aliased_type) = self.crate_types.type_aliases.get(&resolved_path) {
+ return self.write_conversion_inline_intern(w, aliased_type, None, is_ref, is_mut, ptr_for_ref, tupleconv, prefix, sliceconv, path_lookup, decl_lookup);
+ } else 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() {
decl_lookup(w, &DeclType::StructImported, &resolved_path, is_ref, is_mut);
}
},
syn::Type::Path(p) => {
- if p.qself.is_some() || p.path.leading_colon.is_some() {
+ if p.qself.is_some() {
unimplemented!();
}
let resolved_path = self.resolve_path(&p.path, generics);
+ if let Some(aliased_type) = self.crate_types.type_aliases.get(&resolved_path) {
+ return self.write_conversion_new_var_intern(w, ident, var, aliased_type, None, is_ref, ptr_for_ref, to_c, path_lookup, container_lookup, var_prefix, var_suffix);
+ }
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| {
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(w, gen, None, false, false, false);
+ assert!(self.write_c_type_intern(w, gen, None, false, false, false));
}
writeln!(w, ") -> {} {{", mangled_container).unwrap();
writeln!(w, "\t{} {{", mangled_container).unwrap();
} 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, 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 {
- let cty = self.c_type_from_path(&resolved, true, true).expect("Template generics should be opaque or have a predefined mapping");
- w.write(cty.as_bytes()).unwrap();
- }
- } else { unimplemented!(); }
+ if self.crate_types.opaques.get(&resolved).is_some() {
+ write!(w, "crate::{}", resolved).unwrap();
+ } else {
+ let cty = self.c_type_from_path(&resolved, true, true).expect("Template generics should be opaque or have a predefined mapping");
+ w.write(cty.as_bytes()).unwrap();
+ }
} else { unimplemented!(); }
} else if let syn::Type::Array(a_arg) = t {
if let syn::Type::Path(p_arg) = &*a_arg.elem {
self.write_c_mangled_container_path_intern(w2, Self::path_to_generic_args(&$p_arg.path),
generics, &subtype, is_ref, is_mut, ptr_for_ref, true);
}
- } else if let Some(id) = single_ident_generic_path_to_ident(&$p_arg.path) {
+ } else {
+ let id = &&$p_arg.path.segments.iter().rev().next().unwrap().ident;
write!(w, "{}", id).unwrap();
write!(mangled_type, "{}", id).unwrap();
if let Some(w2) = $extra_write as Option<&mut Vec<u8>> {
write!(w2, "{}", id).unwrap();
}
- } else { return false; }
+ }
}
}
if let syn::Type::Tuple(tuple) = arg {
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() {
+ if p.qself.is_some() {
return false;
}
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), generics, &full_path, is_ref, is_mut, ptr_for_ref);
}
+ if let Some(aliased_type) = self.crate_types.type_aliases.get(&full_path).cloned() {
+ return self.write_c_type_intern(w, &aliased_type, None, is_ref, is_mut, ptr_for_ref);
+ }
}
- if p.path.leading_colon.is_some() { return false; }
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(w, &*r.elem, generics, true, r.mutability.is_some(), ptr_for_ref)
},
syn::Type::Array(a) => {