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 crates/macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,10 @@ pub fn php_const(_args: TokenStream, input: TokenStream) -> TokenStream {
/// # fn main() {}
/// ```
#[proc_macro_attribute]
pub fn php_module(args: TokenStream, input: TokenStream) -> TokenStream {
pub fn php_module(_args: TokenStream, input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as ItemFn);

module::parser(args.into(), input)
module::parser(input)
.unwrap_or_else(|e| e.to_compile_error())
.into()
}
Expand Down
20 changes: 8 additions & 12 deletions crates/macros/src/module.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
use darling::{ast::NestedMeta, FromMeta};
use darling::FromAttributes;
use proc_macro2::{Ident, TokenStream};
use quote::quote;
use syn::{ItemFn, Signature};

use crate::prelude::*;

#[derive(Debug, Default, FromMeta)]
#[darling(default)]
pub struct ModuleArgs {
/// Optional function that will be called when the module starts up.
#[derive(FromAttributes, Default, Debug)]
#[darling(default, attributes(php))]
pub(crate) struct PhpModuleAttribute {
startup: Option<Ident>,
}

pub fn parser(args: TokenStream, input: ItemFn) -> Result<TokenStream> {
let meta = NestedMeta::parse_meta_list(args)?;
let opts = match ModuleArgs::from_list(&meta) {
Ok(opts) => opts,
Err(e) => bail!(input => "Failed to parse attribute options: {:?}", e),
};
pub fn parser(input: ItemFn) -> Result<TokenStream> {
let ItemFn { sig, block, .. } = input;
let Signature { output, inputs, .. } = sig;
let stmts = &block.stmts;
let startup = if let Some(startup) = opts.startup {

let attr = PhpModuleAttribute::from_attributes(&input.attrs)?;
let startup = if let Some(startup) = attr.startup {
quote! { #startup(ty, mod_num) }
} else {
quote! { 0i32 }
Expand Down
3 changes: 2 additions & 1 deletion examples/hello_world.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ fn startup(_ty: i32, mod_num: i32) -> i32 {
0
}

#[php_module(startup = "startup")]
#[php_module]
#[php(startup = startup)]
pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
module
.class::<TestClass>()
Expand Down
6 changes: 4 additions & 2 deletions guide/src/ini-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ pub fn startup(ty: i32, mod_num: i32) -> i32 {
0
}

#[php_module(startup = "startup")]
#[php_module]
#[php(startup = "startup")]
pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
module
}
Expand All @@ -54,7 +55,8 @@ pub fn startup(ty: i32, mod_num: i32) -> i32 {
0
}

#[php_module(startup = "startup")]
#[php_module]
#[php(startup = "startup")]
pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
module
}
Expand Down
6 changes: 4 additions & 2 deletions guide/src/migration-guides/v0.14.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ register functions, classes, constants and startup function when declaring
the module.

```rs
#[php_module(startup = "startup_function")]
#[php_module]
#[php(startup = "startup_function")]
pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
module
.class::<TestClass>()
Expand Down Expand Up @@ -174,7 +175,8 @@ fn startup_function(ty: i32, mod_num: i32) -> i32 {
0
}

#[php_module(startup = "startup_function")]
#[php_module]
#[php(startup = "startup_function")]
pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
module
}
Expand Down
Loading