Skip to content
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

Features/lt refactoring #20

Merged
merged 7 commits into from
Sep 6, 2024
Merged

Features/lt refactoring #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09cf995
Lifetime refactoring in progress
Artem-Romanenia Sep 5, 2024
8cec72c
Lifetimes refactoring in progress
Artem-Romanenia Sep 5, 2024
83527b1
Lifetime refactoring in progress
Artem-Romanenia Sep 6, 2024
4c7ba48
Lifetime refactoring in progress
Artem-Romanenia Sep 6, 2024
5afad2d
Lifetime refactoring in progress
Artem-Romanenia Sep 6, 2024
213f3ba
Lifetime refactoring in progress
Artem-Romanenia Sep 6, 2024
0856680
Lifetime refactoring and tests
Artem-Romanenia Sep 6, 2024
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
12 changes: 9 additions & 3 deletions o2o-impl/src/attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use syn::parse::{Parse, ParseBuffer, ParseStream};
use syn::punctuated::Punctuated;
use syn::spanned::Spanned;
use syn::token::{Brace, Comma, Paren};
use syn::{braced, parenthesized, Attribute, Error, Ident, Member, Result, Token, WherePredicate};
use syn::{braced, parenthesized, Attribute, Error, GenericArgument, Ident, Member, Result, Token, WherePredicate};

use crate::ast::SynDataTypeMember;
use crate::kw;
Expand Down Expand Up @@ -78,6 +78,7 @@ pub(crate) struct TypePath {
pub span: Span,
pub path: TokenStream,
pub path_str: String,
pub generics: Option<Punctuated<GenericArgument, Token![,]>>,
pub nameless_tuple: bool,
}

Expand All @@ -87,6 +88,10 @@ impl From<syn::Path> for TypePath {
span: value.span(),
path: value.to_token_stream(),
path_str: value.to_token_stream().to_string(),
generics: match &value.segments.last().unwrap().arguments {
syn::PathArguments::AngleBracketed(a) => Some(a.args.clone()),
_ => None
},
nameless_tuple: false,
}
}
Expand All @@ -98,6 +103,7 @@ impl From<TokenStream> for TypePath {
span: value.span(),
path_str: value.to_string(),
path: value,
generics: None,
nameless_tuple: true,
}
}
Expand Down Expand Up @@ -551,7 +557,7 @@ fn parse_trait_instruction_param_inner_1<T: Parse>(input: &syn::parse::ParseBuff
Err(syn::Error::new(span(a), format!("Instruction parameter '{}' was already set.", name)))?
} else {
setter();
return Ok(true);
Ok(true)
}
}

Expand All @@ -567,7 +573,7 @@ fn parse_trait_instruction_param_inner_2<T: Parse, U>(input: &syn::parse::ParseB
Err(syn::Error::new(span(a), format!("Instruction parameter '{}' was already set.", name)))?
} else {
setter(content);
return Ok(true);
Ok(true)
}
}

Expand Down
134 changes: 54 additions & 80 deletions o2o-impl/src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,92 +1060,66 @@ struct QuoteTraitParams<'a> {
pub dst: &'a TokenStream,
pub src: &'a TokenStream,
pub gens: TokenStream,
pub gens_impl: TokenStream,
pub impl_gens: TokenStream,
pub where_clause: Option<TokenStream>,
pub r: Option<TokenStream>,
}

fn get_quote_trait_params<'a>(input: &DataType, ctx: &'a ImplContext) -> QuoteTraitParams<'a> {
let generics = input.get_generics();
let mut generics_impl = generics.clone();
let mut lifetimes: Vec<Lifetime> = vec![];

if let Ok(dst_ty) = parse2::<syn::TypePath>(ctx.dst_ty.clone()) {
// The idea is to check if all lifetimes of the dst are included in the input generics or not.
// If not, we will add the missing ones to the input generics.

let dst_generics = match &dst_ty.path.segments.last().unwrap().arguments {
PathArguments::None => syn::punctuated::Punctuated::new(),
PathArguments::AngleBracketed(args) => args.args.clone(),
PathArguments::Parenthesized(_) => {
unimplemented!("Only Struct<T> syntax is supported")
}
};
let mut impl_gens = input.get_generics().clone();

let this_side_lts: Vec<&Lifetime> = input.get_generics().params.iter().filter_map(|g| match g {
GenericParam::Lifetime(l) => Some(&l.lifetime),
_ => None
}).collect();

let other_side_lts: Vec<&Lifetime> = ctx.struct_attr.ty.generics.as_ref().map(|g| g.iter().filter_map(|g| match g {
GenericArgument::Lifetime(l) => Some(l),
_ => None
}).collect()).unwrap_or_default();

let ref_lts = ctx.kind.is_ref().then_some(
if ctx.kind.is_from() { this_side_lts } else { other_side_lts.clone() }
).unwrap_or_default();

for lt in other_side_lts {
let missing_lt = impl_gens.params.iter().all(|param| {
if let GenericParam::Lifetime(param) = param {
&param.lifetime != lt
} else { false }
});

for dst_generic in dst_generics {
if let GenericArgument::Lifetime(arg) = &dst_generic {
lifetimes.push(parse_quote!(#dst_generic));
if generics.params.iter().all(|param| {
if let GenericParam::Lifetime(param) = param {
&param.lifetime != arg
} else {
// Skip any other generic param
false
}
}) {
generics_impl.params.push(parse_quote!(#dst_generic));
}
}
if missing_lt {
let gen = GenericArgument::Lifetime(lt.clone());
impl_gens.params.push(parse_quote!(#gen));
}
}

// If there is at least one lifetime in generics, we add a new lifetime `'o2o` and add a bound `'o2o: 'a + 'b`.
let (gens_impl, where_clause, r) = if ctx.kind.is_ref() {
// If lifetime is empty, we assume that lifetime generics come from the other structure (src <-> dst).
let lifetimes: Vec<_> = if lifetimes.is_empty() { generics.lifetimes().map(|params| params.lifetime.clone()).collect() } else { lifetimes };

let mut where_clause = input.get_attrs().where_attr(&ctx.struct_attr.ty).map(|x| x.where_clause.clone());

let r = if !lifetimes.is_empty() {
generics_impl.params.push(parse_quote!('o2o));
let mut where_clause_punctuated = where_clause.unwrap_or_default();
where_clause_punctuated.push(parse_quote!('o2o: #( #lifetimes )+*));
where_clause = Some(where_clause_punctuated);
Some(quote!(&'o2o))
} else {
Some(quote!(&))
};

(generics_impl.to_token_stream(), where_clause.map(|where_clause| quote!(where #where_clause)), r)
} else {
(
input.get_generics().to_token_stream(),
input.get_attrs().where_attr(&ctx.struct_attr.ty).map(|x| {
let where_clause = x.where_clause.to_token_stream();
quote!(where #where_clause)
}),
ctx.kind.is_ref().then_some(quote!(&)),
)
};
if !ref_lts.is_empty() {
impl_gens.params.push(parse_quote!('o2o: #( #ref_lts )+*));
}

QuoteTraitParams {
attr: ctx.struct_attr.attribute.as_ref(),
impl_attr: ctx.struct_attr.impl_attribute.as_ref(),
inner_attr: ctx.struct_attr.inner_attribute.as_ref(),
dst: ctx.dst_ty,
src: ctx.src_ty,
gens: generics.to_token_stream(),
gens_impl,
where_clause,
r,
QuoteTraitParams {
attr: ctx.struct_attr.attribute.as_ref(),
impl_attr: ctx.struct_attr.impl_attribute.as_ref(),
inner_attr: ctx.struct_attr.inner_attribute.as_ref(),
dst: ctx.dst_ty,
src: ctx.src_ty,
gens: input.get_generics().to_token_stream(),
impl_gens: impl_gens.to_token_stream(),
where_clause: input.get_attrs().where_attr(&ctx.struct_attr.ty).map(|x| {
let where_clause = &x.where_clause;
quote!(where #where_clause)
}),
r: ctx.kind.is_ref().then_some(if ref_lts.is_empty() { quote!(&) } else { quote!(&'o2o) })
}
}

fn quote_from_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenStream>, init: TokenStream) -> TokenStream {
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, gens_impl, where_clause, r } = get_quote_trait_params(input, ctx);
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, impl_gens, where_clause, r } = get_quote_trait_params(input, ctx);
quote! {
#impl_attr
impl #gens_impl ::core::convert::From<#r #src> for #dst #gens #where_clause {
impl #impl_gens ::core::convert::From<#r #src> for #dst #gens #where_clause {
#attr
fn from(value: #r #src) -> #dst #gens {
#inner_attr
Expand All @@ -1157,11 +1131,11 @@ fn quote_from_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenS
}

fn quote_try_from_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenStream>, init: TokenStream) -> TokenStream {
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, gens_impl, where_clause, r } = get_quote_trait_params(input, ctx);
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, impl_gens, where_clause, r } = get_quote_trait_params(input, ctx);
let err_ty = &ctx.struct_attr.err_ty.as_ref().unwrap().path;
quote! {
#impl_attr
impl #gens_impl ::core::convert::TryFrom<#r #src> for #dst #gens #where_clause {
impl #impl_gens ::core::convert::TryFrom<#r #src> for #dst #gens #where_clause {
type Error = #err_ty;
#attr
fn try_from(value: #r #src) -> Result<#dst #gens, #err_ty> {
Expand All @@ -1174,7 +1148,7 @@ fn quote_try_from_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<To
}

fn quote_into_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenStream>, init: TokenStream, post_init: Option<TokenStream>) -> TokenStream {
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, gens_impl, where_clause, r } = get_quote_trait_params(input, ctx);
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, impl_gens, where_clause, r } = get_quote_trait_params(input, ctx);

let body = match post_init {
Some(post_init) => quote! {
Expand All @@ -1191,7 +1165,7 @@ fn quote_into_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenS

quote! {
#impl_attr
impl #gens_impl ::core::convert::Into<#dst> for #r #src #gens #where_clause {
impl #impl_gens ::core::convert::Into<#dst> for #r #src #gens #where_clause {
#attr
fn into(self) -> #dst {
#inner_attr
Expand All @@ -1202,7 +1176,7 @@ fn quote_into_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenS
}

fn quote_try_into_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenStream>, init: TokenStream, post_init: Option<TokenStream>) -> TokenStream {
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, gens_impl, where_clause, r } = get_quote_trait_params(input, ctx);
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, impl_gens, where_clause, r } = get_quote_trait_params(input, ctx);
let err_ty = &ctx.struct_attr.err_ty.as_ref().unwrap().path;

let body = match post_init {
Expand All @@ -1220,7 +1194,7 @@ fn quote_try_into_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<To

quote! {
#impl_attr
impl #gens_impl ::core::convert::TryInto<#dst> for #r #src #gens #where_clause {
impl #impl_gens ::core::convert::TryInto<#dst> for #r #src #gens #where_clause {
type Error = #err_ty;
#attr
fn try_into(self) -> Result<#dst, #err_ty> {
Expand All @@ -1232,10 +1206,10 @@ fn quote_try_into_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<To
}

fn quote_into_existing_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenStream>, init: TokenStream, post_init: Option<TokenStream>) -> TokenStream {
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, gens_impl, where_clause, r } = get_quote_trait_params(input, ctx);
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, impl_gens, where_clause, r } = get_quote_trait_params(input, ctx);
quote! {
#impl_attr
impl #gens_impl o2o::traits::IntoExisting<#dst> for #r #src #gens #where_clause {
impl #impl_gens o2o::traits::IntoExisting<#dst> for #r #src #gens #where_clause {
#attr
fn into_existing(self, other: &mut #dst) {
#inner_attr
Expand All @@ -1248,11 +1222,11 @@ fn quote_into_existing_trait(input: &DataType, ctx: &ImplContext, pre_init: Opti
}

fn quote_try_into_existing_trait(input: &DataType, ctx: &ImplContext, pre_init: Option<TokenStream>, init: TokenStream, post_init: Option<TokenStream>) -> TokenStream {
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, gens_impl, where_clause, r } = get_quote_trait_params(input, ctx);
let QuoteTraitParams { attr, impl_attr, inner_attr, dst, src, gens, impl_gens, where_clause, r } = get_quote_trait_params(input, ctx);
let err_ty = &ctx.struct_attr.err_ty.as_ref().unwrap().path;
quote! {
#impl_attr
impl #gens_impl o2o::traits::TryIntoExisting<#dst> for #r #src #gens #where_clause {
impl #impl_gens o2o::traits::TryIntoExisting<#dst> for #r #src #gens #where_clause {
type Error = #err_ty;
#attr
fn try_into_existing(self, other: &mut #dst) -> Result<(), #err_ty> {
Expand Down
Loading