Playing with sized arrays

googlefonts · Oct 20, 2022 · 523bd1a · 523bd1a
1 parent ffab7b7
commit 523bd1a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1,804 deletions.
diff --git a/font-codegen/src/fields.rs b/font-codegen/src/fields.rs
@@ -1053,9 +1053,15 @@ impl FieldType {
     pub(crate) fn cooked_type_tokens(&self) -> &syn::Ident {
         match &self {
             FieldType::Offset { typ, .. } | FieldType::Scalar { typ } => typ,
-            FieldType::Other { typ } => typ
-                .get_ident()
-                .expect("non-trivial custom types never cooked"),
+            FieldType::Other { typ } => {
+                match typ.get_ident() {
+                    Some(ident) => ident,
+                    None => {
+                        eprintln!("What do I do with {:#?}", self);
+                        panic!("Oh no");
+                    }
+                }
+            },
             FieldType::Array { .. }
             | FieldType::ComputedArray { .. }
             | FieldType::VarLenArray(_) => {

diff --git a/font-codegen/src/parsing.rs b/font-codegen/src/parsing.rs
@@ -2,14 +2,14 @@
 
 use std::collections::HashMap;
 
-use proc_macro2::{Span, TokenStream};
+use proc_macro2::{Span, TokenStream, Ident, Punct};
 use quote::{quote, ToTokens};
 use syn::{
     braced, bracketed, parenthesized,
     parse::{Parse, ParseStream},
     punctuated::Punctuated,
     spanned::Spanned,
-    token, Attribute, Token,
+    token, Attribute, Token
 };
 
 pub(crate) struct Items {
@@ -283,6 +283,10 @@ pub(crate) enum FieldType {
     },
     ComputedArray(CustomArray),
     VarLenArray(CustomArray),
+    SizedArray {
+        typ: syn::Ident,
+        len: syn::Ident,
+    }
 }
 
 /// A representation shared between computed & varlen arrays
@@ -587,6 +591,24 @@ impl Parse for Field {
 
 impl Parse for FieldType {
     fn parse(input: ParseStream) -> syn::Result<Self> {
+        if input.peek(token::Bracket) {
+            // An array. It should be Ident, Punct(;), Ident
+            let content;
+            bracketed!(content in input);
+
+            let array_type: Ident = content.parse()?;
+            let punct = content.parse::<Punct>()?;
+            if punct.as_char() != ';' {
+                return Err(syn::Error::new(punct.span(), "Invalid separator"));
+            }
+            let array_len: Ident = content.parse()?;
+
+            // Should be no further content
+            if !content.is_empty() {
+                return Err(syn::Error::new(content.span(), "Unexpected content"));
+            }
+            return Ok(FieldType::SizedArray { typ: array_type, len: array_len });
+        }
         if input.lookahead1().peek(token::Bracket) {
             let content;
             bracketed!(content in input);