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

Add ptr types

Browse source
This commit is contained in:
Maik Klein 2018-03-10 10:47:02 +01:00
parent 9d31e95f94
commit 86068db713
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/Cargo.toml
View file

@ -5,6 +5,12 @@ authors = ["Maik Klein <maikklein@googlemail.com>"]
[dependencies] [dependencies]
vkxml = {git = "https://github.com/maikklein/vkxml"} vkxml = {git = "https://github.com/maikklein/vkxml"}
quote = "0.4.2"
syn = "0.12.14"
heck = "0.3.0" heck = "0.3.0"
[dependencies.quote]
version = "0.4.2"
[dependencies.syn]
vesion = "0.12.14"
features = ["full", "extra-traits"]

25
generator/src/lib.rs
View file

@ -8,6 +8,7 @@ extern crate quote;
extern crate syn; extern crate syn;
pub extern crate vkxml; pub extern crate vkxml;
use quote::Tokens;
use heck::SnakeCase; use heck::SnakeCase;
use syn::Ident; use syn::Ident;
@ -56,7 +57,7 @@ pub trait FieldExt {
fn param_ident(&self) -> Ident; fn param_ident(&self) -> Ident;
/// Returns the basetype ident and removes the 'Vk' prefix /// Returns the basetype ident and removes the 'Vk' prefix
fn type_ident(&self) -> Ident; fn type_tokens(&self) -> Tokens;
} }
impl FieldExt for vkxml::Field { impl FieldExt for vkxml::Field {
@ -69,7 +70,7 @@ impl FieldExt for vkxml::Field {
Ident::from(name_corrected.to_snake_case().as_str()) Ident::from(name_corrected.to_snake_case().as_str())
} }
fn type_ident(&self) -> Ident { fn type_tokens(&self) -> Tokens {
let new_name = match self.basetype.as_str() { let new_name = match self.basetype.as_str() {
"void" => "c_void", "void" => "c_void",
"char" => "c_char", "char" => "c_char",
@ -84,7 +85,17 @@ impl FieldExt for vkxml::Field {
} }
} }
}; };
Ident::from(new_name) let ptr_name = self.reference
.as_ref()
.map(|reference| match *reference {
vkxml::ReferenceType::Pointer => "*mut",
vkxml::ReferenceType::PointerToPointer => "*mut",
vkxml::ReferenceType::PointerToConstPointer => "*const",
})
.unwrap_or("");
let ty: syn::Type =
syn::parse_str(&format!("{} {}", ptr_name, new_name)).expect("parse field");
quote!{#ty}
} }
} }
use std::collections::HashMap; use std::collections::HashMap;
@ -101,7 +112,7 @@ fn generate_function_pointers(ident: Ident, commands: &[&vkxml::Command]) -> quo
let names_left = &names; let names_left = &names;
let names_right = &names; let names_right = &names;
let params: Vec<Vec<(Ident, Ident)>> = commands let params: Vec<Vec<(Ident, Tokens)>> = commands
.iter() .iter()
.map(|cmd| { .map(|cmd| {
let fn_name_raw = cmd.name.as_str(); let fn_name_raw = cmd.name.as_str();
@ -110,7 +121,7 @@ fn generate_function_pointers(ident: Ident, commands: &[&vkxml::Command]) -> quo
.iter() .iter()
.map(|field| { .map(|field| {
let name = field.param_ident(); let name = field.param_ident();
let ty = field.type_ident(); let ty = field.type_tokens();
(name, ty) (name, ty)
}) })
.collect(); .collect();
@ -131,7 +142,7 @@ fn generate_function_pointers(ident: Ident, commands: &[&vkxml::Command]) -> quo
let expanded_params: Vec<_> = params let expanded_params: Vec<_> = params
.iter() .iter()
.map(|inner_params| { .map(|inner_params| {
let inner_params_iter = inner_params.iter().map(|&(param_name, param_ty)| { let inner_params_iter = inner_params.iter().map(|&(ref param_name, ref param_ty)| {
quote!{#param_name: #param_ty} quote!{#param_name: #param_ty}
}); });
quote!{ quote!{
@ -144,7 +155,7 @@ fn generate_function_pointers(ident: Ident, commands: &[&vkxml::Command]) -> quo
let params_ref = &params; let params_ref = &params;
let return_types: Vec<_> = commands let return_types: Vec<_> = commands
.iter() .iter()
.map(|cmd| cmd.return_type.type_ident()) .map(|cmd| cmd.return_type.type_tokens())
.collect(); .collect();
let return_types_ref = &return_types; let return_types_ref = &return_types;
quote!{ quote!{