From 765f559de1edcc4935c3e3f7bd10553ec1641132 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Mon, 3 Feb 2025 17:41:34 +0200 Subject: feat(zkvms_host_io): Implement foreach_private_input_field and foreach_public_input_field macros --- zkvms_host_io/input_macros/src/lib.rs | 42 ++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) (limited to 'zkvms_host_io/input_macros/src/lib.rs') diff --git a/zkvms_host_io/input_macros/src/lib.rs b/zkvms_host_io/input_macros/src/lib.rs index 49cff80..868c755 100644 --- a/zkvms_host_io/input_macros/src/lib.rs +++ b/zkvms_host_io/input_macros/src/lib.rs @@ -65,16 +65,46 @@ pub fn generate_output_type_input_struct(_: TokenStream) -> TokenStream { (output_type + &public_input_type + &private_input_type + &struct_def).parse::().unwrap() } -#[proc_macro] -pub fn foreach_input_field(item: TokenStream) -> TokenStream { - let (args, _) = get_types(); - let arg_patterns = args_divide(&args).0; - +fn foreach_field(item: TokenStream, fields: Vec) -> TokenStream { let expr = format!("{}", item); let mut out = String::new(); - for field in arg_patterns { + for field in fields { // Unquoted yield is a keyword, so it is not allowed as field name out += &expr.replace(".yield", &format!(".{field}")); } out.parse::().unwrap() } + +#[proc_macro] +pub fn foreach_input_field(item: TokenStream) -> TokenStream { + let (args, _) = get_types(); + let arg_patterns = args_divide(&args).0; + + foreach_field(item, arg_patterns) +} + +#[proc_macro] +pub fn foreach_public_input_field(item: TokenStream) -> TokenStream { + let (args, _) = get_types(); + + let public_inputs = toml::from_str::( + include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml")) + ) + .unwrap(); + let public_patterns = args_divide_public(&args, &public_inputs.keys().collect()).0.0; + + foreach_field(item, public_patterns) +} + +#[proc_macro] +pub fn foreach_private_input_field(item: TokenStream) -> TokenStream { + let (args, _) = get_types(); + + let public_inputs = toml::from_str::( + include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml")) + ) + .unwrap(); + let private_patterns = args_divide_public(&args, &public_inputs.keys().collect()).1.0; + + foreach_field(item, private_patterns) +} -- cgit v1.2.3