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.

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

Restoring module name as attr/param for service_tables_macro #1076

Merged
merged 1 commit into from
Feb 27, 2025
Merged
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
32 changes: 29 additions & 3 deletions rust/psibase_macros/psibase-macros-lib/src/service_tables_macro.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
mod tables;

use darling::{ast::NestedMeta, Error, FromMeta};
use proc_macro2::TokenStream;
use proc_macro_error::{abort, emit_error};
use quote::quote;
use std::{collections::HashMap, str::FromStr};
use syn::{Ident, Item, ItemMod, Type};
use tables::{is_table_attr, process_service_tables};

pub fn service_tables_macro_impl(_attr: TokenStream, item: TokenStream) -> TokenStream {
let options_psibase_mod = String::from("psibase");
#[derive(Debug, FromMeta)]
#[darling(default)]
pub struct Options {
pub psibase_mod: String,
}

impl Default for Options {
fn default() -> Self {
Options {
psibase_mod: "psibase".into(),
}
}
}

pub fn service_tables_macro_impl(attr: TokenStream, item: TokenStream) -> TokenStream {
let attr_args = match NestedMeta::parse_meta_list(attr) {
Ok(v) => v,
Err(e) => {
return TokenStream::from(Error::from(e).write_errors());
}
};
let options: Options = match Options::from_list(&attr_args) {
Ok(val) => val,
Err(err) => {
return err.write_errors().into();
}
};
let psibase_mod = proc_macro2::TokenStream::from_str(&options.psibase_mod).unwrap();

let psibase_mod = proc_macro2::TokenStream::from_str(&options_psibase_mod).unwrap();
let item = syn::parse2::<syn::Item>(item).unwrap();
match item {
Item::Mod(impl_mod) => process_mod(&psibase_mod, impl_mod),
Expand Down