alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Convert khronos_link! into a function

Browse source
This commit is contained in:
Aaron Loucks 2019-03-16 12:46:26 -04:00
parent e4bcda2fec
commit f1fd35350c
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
generator/src/lib.rs
View file

@ -17,6 +17,8 @@ use quote::Tokens;
use std::collections::{BTreeMap, HashMap, HashSet}; use std::collections::{BTreeMap, HashMap, HashSet};
use std::path::Path; use std::path::Path;
use syn::Ident; use syn::Ident;
use std::fmt::Display;
pub trait ExtensionExt {} pub trait ExtensionExt {}
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub enum CType { pub enum CType {
@ -85,11 +87,9 @@ named!(cfloat<&str, f32>,
terminated!(nom::float_s, char!('f')) terminated!(nom::float_s, char!('f'))
); );
macro_rules! khronos_link ( fn khronos_link<S: Display>(name: &S) -> Literal {
($name:expr) => { Literal::string(&format!("<https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/{name}.html>", name=name))
Literal::string(&format!("<https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/{name}.html>", name=$name))
} }
);
pub fn define_handle_macro() -> Tokens { pub fn define_handle_macro() -> Tokens {
quote! { quote! {
@ -715,7 +715,7 @@ fn generate_function_pointers<'a>(
let raw_names_ref = &raw_names; let raw_names_ref = &raw_names;
let names_left = &names; let names_left = &names;
let names_right = &names; let names_right = &names;
let khronos_links: Vec<_> = raw_names.iter().map(|name| khronos_link!(name)).collect(); let khronos_links: Vec<_> = raw_names.iter().map(|name| khronos_link(name)).collect();
let pfn_commands: Vec<_> = commands let pfn_commands: Vec<_> = commands
.iter() .iter()
@ -1022,7 +1022,7 @@ pub fn generate_extension<'a>(
pub fn generate_typedef(typedef: &vkxml::Typedef) -> Tokens { pub fn generate_typedef(typedef: &vkxml::Typedef) -> Tokens {
let typedef_name = to_type_tokens(&typedef.name, None); let typedef_name = to_type_tokens(&typedef.name, None);
let typedef_ty = to_type_tokens(&typedef.basetype, None); let typedef_ty = to_type_tokens(&typedef.basetype, None);
let khronos_link = khronos_link!(typedef.name); let khronos_link = khronos_link(&typedef.name);
quote! { quote! {
#[doc = #khronos_link] #[doc = #khronos_link]
pub type #typedef_name = #typedef_ty; pub type #typedef_name = #typedef_ty;
@ -1047,7 +1047,7 @@ pub fn generate_bitmask(
return None; return None;
}; };
bitflags_cache.insert(ident.clone()); bitflags_cache.insert(ident.clone());
let khronos_link = khronos_link!(bitmask.name); let khronos_link = khronos_link(&bitmask.name);
Some(quote! { Some(quote! {
#[repr(transparent)] #[repr(transparent)]
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
@ -1155,7 +1155,7 @@ pub fn generate_enum<'a>(
values.push(constant.variant_ident(&_enum.name)); values.push(constant.variant_ident(&_enum.name));
} }
let khronos_link = khronos_link!(_enum.name); let khronos_link = khronos_link(&_enum.name);
if name.contains("Bit") { if name.contains("Bit") {
let ident = Ident::from(_name.as_str()); let ident = Ident::from(_name.as_str());
@ -1783,7 +1783,7 @@ pub fn generate_struct(
} else { } else {
quote!() quote!()
}; };
let khronos_link = khronos_link!(_struct.name); let khronos_link = khronos_link(&_struct.name);
quote! { quote! {
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, #default_str #dbg_str #manual_derive_tokens)] #[derive(Copy, Clone, #default_str #dbg_str #manual_derive_tokens)]
@ -1801,7 +1801,7 @@ pub fn generate_handle(handle: &vkxml::Handle) -> Option<Tokens> {
if handle.name == "" { if handle.name == "" {
return None; return None;
} }
let khronos_link = khronos_link!(handle.name); let khronos_link = khronos_link(&handle.name);
let tokens = match handle.ty { let tokens = match handle.ty {
vkxml::HandleType::Dispatch => { vkxml::HandleType::Dispatch => {
let name = &handle.name[2..]; let name = &handle.name[2..];
@ -1832,7 +1832,7 @@ fn generate_funcptr(fnptr: &vkxml::FunctionPointer) -> Tokens {
#ident: #type_tokens #ident: #type_tokens
} }
}); });
let khronos_link = khronos_link!(fnptr.name); let khronos_link = khronos_link(&fnptr.name);
quote! { quote! {
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
#[doc = #khronos_link] #[doc = #khronos_link]
@ -1849,7 +1849,7 @@ fn generate_union(union: &vkxml::Union) -> Tokens {
pub #name: #ty pub #name: #ty
} }
}); });
let khronos_link = khronos_link!(union.name); let khronos_link = khronos_link(&union.name);
quote! { quote! {
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone)] #[derive(Copy, Clone)]