Compile: Emit structs in proper order

1 files changed, 13 insertions, 17 deletions

diff --git a/src/AST.hs b/src/AST.hs
index 99c0681..e22d11f 100644
--- a/src/AST.hs
+++ b/src/AST.hs
@@ -292,23 +292,19 @@ extOf = \case
   EOneHot x _ _ _ _ -> x
   EError x _ _ -> x
 
--- unSNat :: SNat n -> Nat
--- unSNat SZ = Z
--- unSNat (SS n) = S (unSNat n)
-
--- unSTy :: STy t -> Ty
--- unSTy = \case
---   STNil -> TNil
---   STPair a b -> TPair (unSTy a) (unSTy b)
---   STEither a b -> TEither (unSTy a) (unSTy b)
---   STMaybe t -> TMaybe (unSTy t)
---   STArr n t -> TArr (unSNat n) (unSTy t)
---   STScal t -> TScal (unSScalTy t)
---   STAccum t -> TAccum (unSTy t)
-
--- unSEnv :: SList STy env -> [Ty]
--- unSEnv SNil = []
--- unSEnv (SCons t l) = unSTy t : unSEnv l
+unSTy :: STy t -> Ty
+unSTy = \case
+  STNil -> TNil
+  STPair a b -> TPair (unSTy a) (unSTy b)
+  STEither a b -> TEither (unSTy a) (unSTy b)
+  STMaybe t -> TMaybe (unSTy t)
+  STArr n t -> TArr (unSNat n) (unSTy t)
+  STScal t -> TScal (unSScalTy t)
+  STAccum t -> TAccum (unSTy t)
+
+unSEnv :: SList STy env -> [Ty]
+unSEnv SNil = []
+unSEnv (SCons t l) = unSTy t : unSEnv l
 
 unSScalTy :: SScalTy t -> ScalTy
 unSScalTy = \case