Skip to content

Extension names as CStrs #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Ralith wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Extension names as CStrs #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
[dependencies]
xml = { package = "xml-rs", version = "0.8" }
quote = "1.0"
syn = { version = "2.0", default-features = false, features = ["derive", "printing"] }
syn = { version = "2.0.101", default-features = false, features = ["derive", "printing"] }
proc-macro2 = "1.0"
heck = "0.5"
indexmap = "2"
Expand Down
44 changes: 22 additions & 22 deletions generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use indexmap::{IndexMap, IndexSet};
use proc_macro2::{Span, TokenStream};
use quote::quote;
use regex::Regex;
use syn::{Ident, LitByteStr, LitCStr};
use syn::{Ident, LitCStr};
use xml::{
attribute::OwnedAttribute,
reader::{EventReader, ParserConfig, XmlEvent},
Expand Down Expand Up @@ -1252,7 +1252,7 @@ impl Parser {
&format!("{}_EXTENSION_NAME", trimmed.to_uppercase()),
Span::call_site(),
);
let name_lit = byte_name(&ext.name);
let name_lit = c_name(&ext.name);
let version_ident =
Ident::new(&format!("{}_SPEC_VERSION", trimmed), Span::call_site());
let version_lit = ext.version;
Expand All @@ -1262,7 +1262,7 @@ impl Parser {
#conds
pub const #version_ident: u32 = #version_lit;
#conds
pub const #name_ident: &[u8] = #name_lit;
pub const #name_ident: &CStr = #name_lit;
}
})
});
Expand All @@ -1276,6 +1276,7 @@ impl Parser {
use std::fmt;
use std::mem::MaybeUninit;
use std::os::raw::{c_void, c_char};
use std::ffi::CStr;
use libc::{timespec, wchar_t};

use crate::support::*;
Expand Down Expand Up @@ -1418,7 +1419,7 @@ impl Parser {
#conds
impl #ty_ident {
pub const #version_ident: u32 = sys::#version_const;
pub const #name_ident: &'static [u8] = sys::#name_const;
pub const #name_ident: &'static CStr = sys::#name_const;
#load
}
});
Expand All @@ -1443,8 +1444,11 @@ impl Parser {
{ if self.#field_ident { out.push(raw::#ty_ident::NAME); } }
});
ext_set_inits.push(quote! {
#conds
raw::#ty_ident::NAME => { out.#field_ident = true; }
if name == raw::#ty_ident::NAME {
#conds {
out.#field_ident = true;
}
}
});
ext_set_fields.push(quote! {
#conds
Expand Down Expand Up @@ -1567,6 +1571,7 @@ impl Parser {
#![allow(clippy::wrong_self_convention, clippy::transmute_ptr_to_ptr, clippy::missing_transmute_annotations)]
use std::mem::MaybeUninit;
use std::iter::FromIterator;
use std::ffi::{CStr, CString};
pub use sys::{#(#reexports),*};
pub use sys::platform::{EGLenum, VkFilter, VkSamplerMipmapMode, VkSamplerAddressMode, VkComponentSwizzle};

Expand All @@ -1578,20 +1583,20 @@ impl Parser {
pub struct ExtensionSet {
#(#ext_set_fields)*
/// Extensions unknown to the high-level bindings
pub other: Vec<Vec<u8>>,
pub other: Vec<CString>,
}

/// Create a ExtensionSet from a list of nul-terminated extension names
impl<'a> FromIterator<&'a [u8]> for ExtensionSet {
impl<'a> FromIterator<&'a CStr> for ExtensionSet {
fn from_iter<I>(iter: I) -> Self
where
I: IntoIterator<Item = &'a [u8]>,
I: IntoIterator<Item = &'a CStr>,
{
let mut out = Self::default();
for name in iter {
match name {
#(#ext_set_inits)*
bytes => out.other.push(bytes.to_vec()),
#(#ext_set_inits else )*
{
out.other.push(name.into())
}
}
out
Expand All @@ -1608,7 +1613,7 @@ impl Parser {
.iter()
.collect::<std::collections::HashSet<_>>()
.difference(&other.other.iter().collect())
.map(|x| x.to_vec())
.map(|x| CString::clone(x))
.collect(),
}
}
Expand All @@ -1622,16 +1627,16 @@ impl Parser {
.iter()
.collect::<std::collections::HashSet<_>>()
.intersection(&other.other.iter().collect())
.map(|x| x.to_vec())
.map(|x| CString::clone(x))
.collect(),
}
}

/// Return names of supported extensions, as a `Vec` of nul terminated byte slices.
pub fn names(&self) -> Vec<&[u8]> {
pub fn names(&self) -> Vec<&CStr> {
let mut out = Vec::new();
#(#ext_set_names)*
out.extend(self.other.iter().map(|x| x.as_slice()));
out.extend(self.other.iter().map(|x| &**x));
out
}
}
Expand Down Expand Up @@ -1687,6 +1692,7 @@ impl Parser {

pub mod raw {
use std::mem;
use std::ffi::CStr;
use sys::pfn;
use crate::{Entry, Result};

Expand Down Expand Up @@ -2425,12 +2431,6 @@ fn split_ext_tag(name: &str) -> (&str, &str) {
(tag, &tail[1..])
}

fn byte_name(name: &str) -> LitByteStr {
let mut name = name.as_bytes().to_vec();
name.push(0);
LitByteStr::new(&name, Span::call_site())
}

fn c_name(name: &str) -> LitCStr {
LitCStr::new(&CString::new(name.as_bytes()).unwrap(), Span::call_site())
}
Expand Down
Loading
Loading