Parse struct name in complex_init input as string

Author: Avaneesh-axiom

book/src/custom-extensions/algebra.md

@@ -80,7 +80,7 @@ moduli_init! {
     "21888242871839275222246405745257275088696311157297823662689037894645226208583"
 }
 complex_init! {
-    Bn254Fp2 { mod_idx = 0 },
+    "Bn254Fp2" { mod_idx = 0 },
 }
 */
 ```

examples/algebra/src/main.rs

@@ -28,7 +28,7 @@ moduli_init! {
 // The order of these structs does not matter,
 // given that we specify the `mod_idx` parameters properly.
 openvm_algebra_complex_macros::complex_init! {
-    Complex1 { mod_idx = 0 }, Complex2 { mod_idx = 1 },
+    "Complex1" { mod_idx = 0 }, "Complex2" { mod_idx = 1 },
 }
 */
 

extensions/algebra/circuit/src/fp2_extension.rs

@@ -62,7 +62,7 @@ impl Fp2Extension {
             .iter()
             .map(|(name, modulus)| {
                 format!(
-                    "{} {{ mod_idx = {} }}",
+                    "\"{}\" {{ mod_idx = {} }}",
                     name,
                     get_index_of_modulus(modulus, modular_config)
                 )

extensions/algebra/complex-macros/README.md

@@ -22,7 +22,7 @@ openvm_algebra_moduli_macros::moduli_init!(
 );
 
 openvm_algebra_complex_macros::complex_init! {
-    Complex { mod_idx = 0 },
+    "Complex" { mod_idx = 0 },
 }
 */
 
@@ -39,7 +39,7 @@ The crate provides two macros: `complex_declare!` and `complex_init!`. The signa
 
 - `complex_declare!` receives comma-separated list of moduli classes descriptions. Each description looks like `ComplexStruct { mod_type = ModulusName }`. Here `ModulusName` is the name of any struct that implements `trait IntMod` -- in particular, the ones created by `moduli_declare!` do, and `ComplexStruct` is the name for the complex arithmetic struct to create.
 
-- `complex_init!` receives comma-separated list of struct descriptions. Each description looks like `ComplexStruct { mod_idx = idx }`. Here `ComplexStruct` is the name of the complex struct used in `complex_declare!`, and `idx` is the index of the modulus **in the `moduli_init!` macro**.
+- `complex_init!` receives comma-separated list of struct descriptions. Each description looks like `"ComplexStruct" { mod_idx = idx }`. Here `ComplexStruct` is the name of the complex struct used in `complex_declare!`, and `idx` is the index of the modulus **in the `moduli_init!` macro**.
 
 What happens under the hood:
 
@@ -96,7 +96,7 @@ complex_declare! {
 pub type Fp2 = Bn254Fp2;
 
 complex_init! {
-    Fp2 { mod_idx = 0 },
+    "Fp2" { mod_idx = 0 },
 }
 ```
 

extensions/algebra/complex-macros/src/lib.rs

@@ -1,10 +1,12 @@
 extern crate proc_macro;
 
-use openvm_macros_common::MacroArgs;
+use openvm_macros_common::{MacroArgs, Param};
 use proc_macro::TokenStream;
 use syn::{
     parse::{Parse, ParseStream},
-    parse_macro_input, Expr, ExprPath, Path, Token,
+    parse_macro_input,
+    punctuated::Punctuated,
+    Expr, ExprPath, LitStr, Path, Token,
 };
 
 /// This macro is used to declare the complex extension fields.
@@ -529,6 +531,38 @@ pub fn complex_declare(input: TokenStream) -> TokenStream {
     TokenStream::from_iter(output)
 }
 
+// Override the MacroArgs struct to use LitStr for item names instead of Ident.
+// This removes the need to import the complex struct when using the complex_init macro.
+struct ComplexInitArgs {
+    pub items: Vec<ComplexInitItem>,
+}
+
+struct ComplexInitItem {
+    pub name: LitStr,
+    pub params: Punctuated<Param, Token![,]>,
+}
+
+impl Parse for ComplexInitArgs {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        Ok(ComplexInitArgs {
+            items: input
+                .parse_terminated(ComplexInitItem::parse, Token![,])?
+                .into_iter()
+                .collect(),
+        })
+    }
+}
+
+impl Parse for ComplexInitItem {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let name = input.parse()?;
+        let content;
+        syn::braced!(content in input);
+        let params = content.parse_terminated(Param::parse, Token![,])?;
+        Ok(ComplexInitItem { name, params })
+    }
+}
+
 /// This macro is used to initialize the complex extension fields.
 /// It must be called after `moduli_init!` is called.
 ///
@@ -543,14 +577,14 @@ pub fn complex_declare(input: TokenStream) -> TokenStream {
 /// the `moduli_init!` macro (not `moduli_declare!`).
 #[proc_macro]
 pub fn complex_init(input: TokenStream) -> TokenStream {
-    let MacroArgs { items } = parse_macro_input!(input as MacroArgs);
+    let ComplexInitArgs { items } = parse_macro_input!(input as ComplexInitArgs);
 
     let mut externs = Vec::new();
 
     let span = proc_macro::Span::call_site();
 
     for (complex_idx, item) in items.into_iter().enumerate() {
-        let struct_name = item.name.to_string();
+        let struct_name = item.name.value();
         let struct_name = syn::Ident::new(&struct_name, span.into());
         let mut intmod_idx: Option<usize> = None;
         for param in item.params {

extensions/algebra/tests/programs/openvm_init_complex_redundant_modulus.rs

@@ -1,3 +1,3 @@
 // This file is automatically generated by cargo openvm. Do not rename or edit.
 openvm_algebra_guest::moduli_macros::moduli_init! { "998244353", "1000000007", "1000000009", "987898789" }
-openvm_algebra_guest::complex_macros::complex_init! { Complex2 { mod_idx = 2 } }
+openvm_algebra_guest::complex_macros::complex_init! { "Complex2" { mod_idx = 2 } }

extensions/algebra/tests/programs/openvm_init_complex_secp256k1.rs

@@ -1,3 +1,3 @@
 // This file is automatically generated by cargo openvm. Do not rename or edit.
 openvm_algebra_guest::moduli_macros::moduli_init! { "115792089237316195423570985008687907853269984665640564039457584007908834671663" }
-openvm_algebra_guest::complex_macros::complex_init! { Complex { mod_idx = 0 } }
+openvm_algebra_guest::complex_macros::complex_init! { "Complex" { mod_idx = 0 } }

extensions/algebra/tests/programs/openvm_init_complex_two_moduli.rs

@@ -1,3 +1,3 @@
 // This file is automatically generated by cargo openvm. Do not rename or edit.
 openvm_algebra_guest::moduli_macros::moduli_init! { "998244353", "1000000007" }
-openvm_algebra_guest::complex_macros::complex_init! { Complex1 { mod_idx = 0 }, Complex2 { mod_idx = 1 } }
+openvm_algebra_guest::complex_macros::complex_init! { "Complex1" { mod_idx = 0 }, "Complex2" { mod_idx = 1 } }

guest-libs/pairing/tests/programs/openvm_init_bls_ec_bls12_381.rs

@@ -1,3 +1,4 @@
 // This file is automatically generated by cargo openvm. Do not rename or edit.
 openvm_algebra_guest::moduli_macros::moduli_init! { "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787", "52435875175126190479447740508185965837690552500527637822603658699938581184513" }
 openvm_ecc_guest::sw_macros::sw_init! { Bls12_381G1Affine }
+openvm_ecc_guest::te_macros::te_init! {  }

guest-libs/pairing/tests/programs/openvm_init_bls_final_exp_hint_bls12_381.rs

@@ -1,4 +1,5 @@
 // This file is automatically generated by cargo openvm. Do not rename or edit.
 openvm_algebra_guest::moduli_macros::moduli_init! { "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787" }
-openvm_algebra_guest::complex_macros::complex_init! { Bls12_381Fp2 { mod_idx = 0 } }
+openvm_algebra_guest::complex_macros::complex_init! { "Bls12_381Fp2" { mod_idx = 0 } }
 openvm_ecc_guest::sw_macros::sw_init! {  }
+openvm_ecc_guest::te_macros::te_init! {  }