fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: Simplify the FromVariants proc macro

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-04-17 10:09:08 -05:00 • committed by Marge Bot
parent fc3ef0a251
commit b448151925
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nouveau/compiler/nak_ir.rs
View file

@ -2190,7 +2190,7 @@ impl fmt::Display for OpFSOut {
}
}
#[derive(Display, DstsAsSlice, SrcsAsSlice, FromOps)]
#[derive(Display, DstsAsSlice, SrcsAsSlice, FromVariants)]
pub enum Op {
FAdd(OpFAdd),
FFma(OpFFma),

34
src/nouveau/compiler/nak_ir_proc.rs
View file

@ -10,8 +10,7 @@ extern crate quote;
extern crate syn;
use proc_macro::TokenStream;
use proc_macro2::{Span, TokenStream as TokenStream2, TokenTree};
use quote::ToTokens;
use proc_macro2::{Span, TokenStream as TokenStream2};
use syn::*;
fn count_type(ty: &Type, search_type: &str) -> TokenStream2 {
@ -198,36 +197,25 @@ pub fn enum_derive_display(input: TokenStream) -> TokenStream {
}
}
#[proc_macro_derive(FromOps)]
pub fn derive_from_ops(input: TokenStream) -> TokenStream {
let DeriveInput { data, .. } = parse_macro_input!(input);
#[proc_macro_derive(FromVariants)]
pub fn derive_from_variants(input: TokenStream) -> TokenStream {
let DeriveInput { ident, data, .. } = parse_macro_input!(input);
let enum_type = ident;
let mut impls = TokenStream2::new();
if let Data::Enum(e) = data {
for v in e.variants {
let (old_token, new_token) = match v.fields {
Fields::Unnamed(FieldsUnnamed { unnamed, .. }) => {
let mut tt: Vec<_> =
unnamed.to_token_stream().into_iter().collect();
let old_ident = match tt.pop() {
Some(TokenTree::Ident(ident)) => ident,
_ => panic!("Expected Op(OpFoo)"),
};
let new_ident = Ident::new(
&old_ident.to_string().replace("Op", ""),
old_ident.span(),
);
(old_ident, new_ident)
}
let var_ident = v.ident;
let from_type = match v.fields {
Fields::Unnamed(FieldsUnnamed { unnamed, .. }) => unnamed,
_ => panic!("Expected Op(OpFoo)"),
};
let quote = quote! {
impl From<#old_token> for crate::nak_ir::Op {
fn from (op: #old_token) -> crate::nak_ir::Op {
crate::nak_ir::Op::#new_token(op)
impl From<#from_type> for #enum_type {
fn from (op: #from_type) -> #enum_type {
#enum_type::#var_ident(op)
}
}
};