Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 23 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Generate getters and setters procedurally.

Annotate fields with `#[get]` to generate a getter method.

```rust
use ters::ters;

Expand All @@ -19,7 +20,26 @@ fn getters() {
}
```

Annotate fields with `#[get(deref)]` to generate a getter method that returns the dereferenced value.

```rust
use ters::ters;

#[ters]
struct Foo {
a: i32,
#[get(deref)]
b: bool,
}

fn getters() {
let foo = Foo { a: 42, b: true };
assert_eq!(foo.b(), true);
}
```

Annotate fields with `#[set]` to generate a setter method.

```rust
use ters::ters;

Expand All @@ -37,6 +57,7 @@ fn setters() {
```

Annotate fields with `#[get]` and `#[set]` to generate both a getter and a setter method.

```rust
use ters::ters;

Expand All @@ -57,7 +78,8 @@ fn getters_and_setters() {
```

Unannotated fields will not have generated getters or setters.
```rust

```rust,compile_fail,E0599
use ters::ters;

#[ters]
Expand Down
2 changes: 1 addition & 1 deletion macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ters-macros"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
description = "Supporting macros for the ters crate."
license = "MIT"
Expand Down
94 changes: 94 additions & 0 deletions macros/src/docs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
Generate getters and setters procedurally.

Annotate fields with `#[get]` to generate a getter method.

```rust,ignore
use ters::ters;

#[ters]
struct Foo {
a: i32,
#[get]
b: bool,
}

fn getters() {
let foo = Foo { a: 42, b: true };
assert_eq!(foo.b(), &true);
}
```

Annotate fields with `#[get(deref)]` to generate a getter method that returns the dereferenced value.

```rust,ignore
use ters::ters;

#[ters]
struct Foo {
a: i32,
#[get(deref)]
b: bool,
}

fn getters() {
let foo = Foo { a: 42, b: true };
assert_eq!(foo.b(), true);
}
```

Annotate fields with `#[set]` to generate a setter method.

```rust,ignore
use ters::ters;

#[ters]
struct Foo {
#[set]
a: i32,
b: bool,
}

fn setters() {
let mut foo = Foo { a: 42, b: true };
foo.set_a(31);
}
```

Annotate fields with `#[get]` and `#[set]` to generate both a getter and a setter method.

```rust,ignore
use ters::ters;

#[ters]
struct Foo {
#[get]
#[set]
a: i32,
b: bool,
}

fn getters_and_setters() {
let mut foo = Foo { a: 42, b: true };
assert_eq!(foo.a(), &42);
foo.set_a(31);
assert_eq!(foo.a(), &31);
}
```

Unannotated fields will not have generated getters or setters.

```rust,ignore
use ters::ters;

#[ters]
struct Foo {
a: i32,
#[get]
b: bool,
}

fn getters_not_generated() {
let foo = Foo { a: 42, b: true };
assert_eq!(foo.a(), &42); // this method doesn't exist
}
```
98 changes: 20 additions & 78 deletions macros/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,80 +1,8 @@
use proc_macro::TokenStream;
use quote::{format_ident, quote};
use syn::{parse_macro_input, ItemStruct};

/// Generate getters and setters procedurally.
///
/// Annotate fields with `#[get]` to generate a getter method.
/// ```ignore
/// use ters::ters;
///
/// #[ters]
/// struct Foo {
/// a: i32,
/// #[get]
/// b: bool,
/// }
///
/// fn getters() {
/// let foo = Foo { a: 42, b: true };
/// assert_eq!(foo.b(), &true);
/// }
/// ```
///
/// Annotate fields with `#[set]` to generate a setter method.
/// ```ignore
/// use ters::ters;
///
/// #[ters]
/// struct Foo {
/// #[set]
/// a: i32,
/// b: bool,
/// }
///
/// fn setters() {
/// let mut foo = Foo { a: 42, b: true };
/// foo.set_a(31);
/// }
/// ```
///
/// Annotate fields with `#[get]` and `#[set]` to generate both a getter and a setter method.
/// ```ignore
/// use ters::ters;
///
/// #[ters]
/// struct Foo {
/// #[get]
/// #[set]
/// a: i32,
/// b: bool,
/// }
///
/// fn getters_and_setters() {
/// let mut foo = Foo { a: 42, b: true };
/// assert_eq!(foo.a(), &42);
/// foo.set_a(31);
///
/// assert_eq!(foo.a(), &31);
/// }
/// ```
///
/// Unannotated fields will not have generated getters or setters.
/// ```ignore
/// use ters::ters;
///
/// #[ters]
/// struct Foo {
/// a: i32,
/// #[get]
/// b: bool,
/// }
///
/// fn getters_not_generated() {
/// let foo = Foo { a: 42, b: true };
/// assert_eq!(foo.a(), &42); // this method doesn't exist
/// }
/// ```
use syn::{parse_macro_input, Ident, ItemStruct};

#[doc = include_str!("docs.md")]
#[proc_macro_attribute]
pub fn ters(_args: TokenStream, tokens: TokenStream) -> TokenStream {
let item = parse_macro_input!(tokens as ItemStruct);
Expand All @@ -90,10 +18,17 @@ fn ters_inner(mut item: ItemStruct) -> proc_macro2::TokenStream {
for field in item.fields.iter_mut() {
let mut get = false;
let mut set = false;
let mut deref = false;

field.attrs.retain(|attr| {
if attr.path().is_ident("get") {
get = true;

// super dumb, gotta add error emission
if attr.parse_args::<Ident>().is_ok_and(|x| x.eq("deref")) {
deref = true
}

false
} else if attr.path().is_ident("set") {
set = true;
Expand All @@ -108,6 +43,7 @@ fn ters_inner(mut item: ItemStruct) -> proc_macro2::TokenStream {
field.ty.clone(),
get,
set,
deref,
field
.attrs
.iter()
Expand All @@ -124,21 +60,27 @@ fn ters_inner(mut item: ItemStruct) -> proc_macro2::TokenStream {

let accessors = fields
.iter()
.filter_map(|(ident, ty, get, set, docs)| {
.filter_map(|(ident, ty, get, set, deref, docs)| {
let set_ident = format_ident!("set_{ident}");
let str_ident = ident.to_string();

let mut body = quote! {};

if *get {
let (content, return_) = if *deref {
(quote! { self.#ident }, quote! { #ty })
} else {
(quote! { &self.#ident }, quote! { &#ty })
};

body.extend(quote! {
#[doc = "Getter for `"]
#[doc = #str_ident]
#[doc = "`.\n\n"]
#(#docs)*
#[inline]
pub fn #ident(&self) -> &#ty {
&self.#ident
pub fn #ident(&self) -> #return_ {
#content
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions ters/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "ters"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
description = "Generate getters and setters procedurally."
license = "MIT"
repository = "https://github.com/adinack/ters"

[dependencies]
ters-macros = { path = "../macros", version = "0.2.0" }
ters-macros = { path = "../macros", version = "0.2.1" }
Loading
Loading