accessors

Author: burrbull

src/generate/peripheral.rs

@@ -231,9 +231,8 @@ pub struct ArrayAccessor {
     pub i: syn::LitInt,
 }
 
-impl ArrayAccessor {
-    pub fn to_tokens(&self, method: bool) -> TokenStream {
-        let parens = method.then(|| quote! {()});
+impl ToTokens for ArrayAccessor {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
         let doc = &self.doc;
         let name = &self.name;
         let ty = &self.ty;
@@ -243,9 +242,10 @@ impl ArrayAccessor {
             #[doc = #doc]
             #[inline(always)]
             pub fn #name(&self) -> &#ty {
-                &self.#basename #parens[#i]
+                &self.#basename()[#i]
             }
         }
+        .to_tokens(tokens);
     }
 }
 
@@ -527,11 +527,11 @@ fn register_or_cluster_block(
                 reg_block_field.offset,
                 &reg_block_field.description,
             );
+            let name = &reg_block_field.syn_field.ident;
+            let ty = &reg_block_field.syn_field.ty;
+            let offset = reg_block_field.offset as usize;
 
             if is_region_a_union {
-                let name = &reg_block_field.syn_field.ident;
-                let ty = &reg_block_field.syn_field.ty;
-                let offset = reg_block_field.offset as usize;
                 accessors.extend(quote! {
                     #[doc = #comment]
                     #[inline(always)]
@@ -548,13 +548,17 @@ fn register_or_cluster_block(
 
                 reg_block_field.syn_field.to_tokens(&mut region_rbfs);
                 Punct::new(',', Spacing::Alone).to_tokens(&mut region_rbfs);
+                accessors.extend(quote! {
+                    #[doc = #comment]
+                    #[inline(always)]
+                    pub fn #name(&self) -> &#ty {
+                        &self.#name
+                    }
+                });
+            }
+            for a in &reg_block_field.accessors {
+                a.to_tokens(&mut accessors);
             }
-            accessors.extend(
-                reg_block_field
-                    .accessors
-                    .iter()
-                    .map(|a| a.to_tokens(is_region_a_union)),
-            );
         }
 
         if !is_region_a_union {
@@ -1066,10 +1070,19 @@ fn cluster_block(
 
 fn new_syn_field(ident: Ident, ty: syn::Type) -> syn::Field {
     let span = Span::call_site();
+    let mut segments = Punctuated::new();
+    segments.push(path_segment(Ident::new("crate", span)));
+    let crate_path = syn::Path {
+        leading_colon: None,
+        segments,
+    };
     syn::Field {
         ident: Some(ident),
-        vis: syn::Visibility::Public(syn::VisPublic {
+        vis: syn::Visibility::Restricted(syn::VisRestricted {
             pub_token: Token![pub](span),
+            paren_token: Default::default(),
+            in_token: None,
+            path: Box::new(crate_path),
         }),
         attrs: vec![],
         colon_token: Some(Token![:](span)),