1 files changed, 11 insertions, 6 deletions
diff --git a/src/Language/Fiddle/Compiler/Backend/C.hs b/src/Language/Fiddle/Compiler/Backend/C.hs
index dd79bac..df31c8c 100644
--- a/src/Language/Fiddle/Compiler/Backend/C.hs
+++ b/src/Language/Fiddle/Compiler/Backend/C.hs
@@ -26,8 +26,8 @@ import Data.Text (Text)
 import qualified Data.Text as Text
 import Language.Fiddle.Ast
 import Language.Fiddle.Compiler.Backend
-import qualified Language.Fiddle.Compiler.Backend.Internal.FragTree as FragTree
 import Language.Fiddle.Compiler.Backend.Internal.FormattedWriter
+import qualified Language.Fiddle.Compiler.Backend.Internal.FragTree as FragTree
 import Language.Fiddle.Compiler.Backend.Internal.Writer
 import Language.Fiddle.Internal.UnitInterface
 import Language.Fiddle.Internal.UnitNumbers
@@ -77,7 +77,7 @@ newtype CFileState = CFileState
 
 requireInclude :: String -> M ()
 requireInclude file = do
-  b <- (Set.member file) <$> gets includedFiles
+  b <- gets (Set.member file . includedFiles)
   unless b $ do
     checkout hF $
       text $
@@ -283,8 +283,8 @@ writeRegSet
             tell $ Text.pack $ printf "  o->%s[%d] = in[%d];\n" fieldName i i
           tell "}\n\n"
 
-pattern DefinedBitsP :: String -> NonEmpty String -> N Bits -> RegisterBitsDecl Checked f a
-pattern DefinedBitsP bitsName bitsFullPath offset <-
+pattern DefinedBitsP :: String -> NonEmpty String -> N Bits -> RegisterBitsTypeRef Checked f a -> RegisterBitsDecl Checked f a
+pattern DefinedBitsP bitsName bitsFullPath offset typeRef <-
   ( DefinedBits
       { qBitsMetadata =
           Present
@@ -295,17 +295,22 @@ pattern DefinedBitsP bitsName bitsFullPath offset <-
                       { offset = offset
                       },
                 bitsFullPath = (NonEmpty.last &&& id -> (bitsName, bitsFullPath))
-              }
+              },
+        definedBitsTypeRef = typeRef
       }
     )
 
+-- | Decomposes a type ref into a type name (String) and a list of dimensions
+-- (in the case of being an array)
+-- decomposeBitsTypeRef :: RegisterBitsTypeRef Checked I A -> (String, [N Unitless])
+-- decomposeBitsTypeRef (RegisterBitsJustBits )
 writeRegisterBody :: StructName -> QRegMetadata True -> RegisterBody Checked I A -> M ()
 writeRegisterBody structName regmeta = walk_ registerWalk
   where
     registerWalk :: forall t. (Walk t, Typeable t) => t I A -> M ()
     registerWalk t = case () of
       ()
-        | (Just (DefinedBitsP bitsName fullPath offset)) <- castTS t ->
+        | (Just (DefinedBitsP bitsName fullPath offset typeRef)) <- castTS t ->
             text $
               Text.pack $
                 printf