Skip to content

Add support for complex types #2

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

Open
cooolbros wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for complex types #2

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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ proc-macro = true
[dependencies]
quote = "1"
proc-macro2 = "1.0"
syn = "2.0.15"
syn = { version = "2.0.15", features = ["extra-traits"] }
35 changes: 23 additions & 12 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use proc_macro2::Ident;
use quote::{format_ident, quote};
use syn::parse::discouraged::Speculative;
use syn::parse::ParseStream;
use syn::{parse_macro_input, DataEnum, DeriveInput, Fields, Meta, Token};
use syn::{parse_macro_input, DataEnum, DeriveInput, Fields, Meta, Token, Type};

#[derive(Clone, Eq, PartialEq, Debug)]
enum GetterKind {
Expand Down Expand Up @@ -52,7 +52,7 @@ impl GetterKind {
struct CommonField {
kinds: Vec<GetterKind>,
field_name: Ident,
field_type: Ident,
field_type: Type,
resulting_name: Option<Ident>, // Can have a value only if one function is generated
}

Expand Down Expand Up @@ -336,7 +336,7 @@ fn generate_accessor(
enum_name: &Ident,
variants: &Vec<EnumVariantInfo>,
field_name: &Ident,
field_type: &Ident,
field_type: &Type,
ref_token: proc_macro2::TokenStream,
resulting_name: Ident,
) -> proc_macro2::TokenStream {
Expand Down Expand Up @@ -393,7 +393,7 @@ mod common_field_parsing_tests {
let parsed: CommonField = syn::parse2(tokens).expect("Failed to parse");

assert_eq!(parsed.field_name, "field1");
assert_eq!(parsed.field_type, "i32");
assert_eq!(parsed.field_type, parse_quote!(i32));
assert_eq!(parsed.kinds, vec![GetterKind::ReadOnly]);
assert!(parsed.resulting_name.is_none());
}
Expand All @@ -405,17 +405,28 @@ mod common_field_parsing_tests {

assert_eq!(parsed.field_name, "field1");
assert_eq!(parsed.resulting_name.unwrap(), "custom_name");
assert_eq!(parsed.field_type, "i32");
assert_eq!(parsed.field_type, parse_quote!(i32));
assert_eq!(parsed.kinds, vec![GetterKind::ReadOnly]);
}

#[test]
fn test_field_with_complex_type() {
let tokens = parse_quote! { field1: Option<(i32, [u8; 4])> };
let parsed: CommonField = syn::parse2(tokens).expect("Failed to parse");

assert_eq!(parsed.field_name, "field1");
assert_eq!(parsed.field_type, parse_quote!(Option<(i32, [u8; 4])>));
assert_eq!(parsed.kinds, vec![GetterKind::ReadOnly]);
assert!(parsed.resulting_name.is_none());
}

#[test]
fn test_mutable_field() {
let tokens = parse_quote! { mut field1: i32 };
let parsed: CommonField = syn::parse2(tokens).expect("Failed to parse");

assert_eq!(parsed.field_name, "field1");
assert_eq!(parsed.field_type, "i32");
assert_eq!(parsed.field_type, parse_quote!(i32));
assert_eq!(
parsed.kinds,
vec![GetterKind::ReadOnly, GetterKind::Mutable]
Expand All @@ -429,7 +440,7 @@ mod common_field_parsing_tests {
let parsed: CommonField = syn::parse2(tokens).expect("Failed to parse");

assert_eq!(parsed.field_name, "field1");
assert_eq!(parsed.field_type, "i32");
assert_eq!(parsed.field_type, parse_quote!(i32));
assert_eq!(parsed.kinds, vec![GetterKind::Owning]);
assert!(parsed.resulting_name.is_none());
}
Expand All @@ -440,7 +451,7 @@ mod common_field_parsing_tests {
let parsed: CommonField = syn::parse2(tokens).expect("Failed to parse");

assert_eq!(parsed.field_name, "field1");
assert_eq!(parsed.field_type, "i32");
assert_eq!(parsed.field_type, parse_quote!(i32));
assert_eq!(
parsed.kinds,
vec![
Expand Down Expand Up @@ -494,7 +505,7 @@ mod attributes_parse_tests {
let result = parse_common_fields_attributes(&input);
assert_eq!(result.len(), 1);
assert_eq!(result[0].field_name, "field1");
assert_eq!(result[0].field_type, "i32");
assert_eq!(result[0].field_type, parse_quote!(i32));
assert_eq!(result[0].kinds, vec![GetterKind::ReadOnly]);
}

Expand All @@ -514,11 +525,11 @@ mod attributes_parse_tests {
assert_eq!(result.len(), 2);

assert_eq!(result[0].field_name, "field1");
assert_eq!(result[0].field_type, "i32");
assert_eq!(result[0].field_type, parse_quote!(i32));
assert_eq!(result[0].kinds, vec![GetterKind::ReadOnly]);

assert_eq!(result[1].field_name, "field2");
assert_eq!(result[1].field_type, "String");
assert_eq!(result[1].field_type, parse_quote!(String));
assert_eq!(
result[1].kinds,
vec![GetterKind::ReadOnly, GetterKind::Mutable]
Expand All @@ -540,7 +551,7 @@ mod attributes_parse_tests {
assert_eq!(result.len(), 1);
assert_eq!(result[0].field_name, "field1");
assert_eq!(result[0].clone().resulting_name.unwrap(), "custom_name");
assert_eq!(result[0].field_type, "i32");
assert_eq!(result[0].field_type, parse_quote!(i32));
assert_eq!(result[0].kinds, vec![GetterKind::ReadOnly]);
}

Expand Down