1 files changed, 10 insertions, 3 deletions
diff --git a/src/Language/AST.hs b/src/Language/AST.hs
index 511723a..af5a5a2 100644
--- a/src/Language/AST.hs
+++ b/src/Language/AST.hs
@@ -19,6 +19,7 @@ import Data.Type.Equality
 import GHC.OverloadedLabels
 import GHC.TypeLits (Symbol, SSymbol, symbolSing, KnownSymbol, TypeError, ErrorMessage(Text))
 
+import Array
 import AST
 import Data
 
@@ -39,10 +40,13 @@ data NExpr env t where
   NECase :: NExpr env (TEither a b) -> Var name1 a -> NExpr ('(name1, a) : env) c -> Var name2 b -> NExpr ('(name2, b) : env) c -> NExpr env c
 
   -- array operations
+  NEConstArr :: Show (ScalRep t) => SNat n -> SScalTy t -> Array n (ScalRep t) -> NExpr env (TArr n (TScal t))
   NEBuild1 :: NExpr env TIx -> Var name TIx -> NExpr ('(name, TIx) : env) t -> NExpr env (TArr (S Z) t)
   NEBuild :: SNat n -> NExpr env (Tup (Replicate n TIx)) -> Var name (Tup (Replicate n TIx)) -> NExpr ('(name, Tup (Replicate n TIx)) : env) t -> NExpr env (TArr n t)
-  NEFold1 :: Var name1 t -> Var name2 t -> NExpr ('(name2, t) : '(name1, t) : env) t -> NExpr env (TArr (S n) t) -> NExpr env (TArr n t)
+  NEFold1Inner :: Var name1 t -> Var name2 t -> NExpr ('(name2, t) : '(name1, t) : env) t -> NExpr env (TArr (S n) t) -> NExpr env (TArr n t)
+  NESum1Inner :: ScalIsNumeric t ~ True => NExpr env (TArr (S n) (TScal t)) -> NExpr env (TArr n (TScal t))
   NEUnit :: NExpr env t -> NExpr env (TArr Z t)
+  NEReplicate1Inner :: NExpr env TIx -> NExpr env (TArr n t) -> NExpr env (TArr (S n) t)
 
   -- expression operations
   NEConst :: Show (ScalRep t) => SScalTy t -> ScalRep t -> NExpr env (TScal t)
@@ -64,7 +68,7 @@ type family Lookup name env where
 data Var name t = Var (SSymbol name) (STy t)
   deriving (Show)
 
-instance (t ~ TScal st, KnownScalTy st, Num (ScalRep st)) => Num (NExpr env t) where
+instance (t ~ TScal st, ScalIsNumeric st ~ True, KnownScalTy st, Num (ScalRep st)) => Num (NExpr env t) where
   a + b = NEOp (OAdd knownScalTy) (NEPair a b)
   a * b = NEOp (OMul knownScalTy) (NEPair a b)
   negate e = NEOp (ONeg knownScalTy) e
@@ -116,10 +120,13 @@ fromNamedExpr val = \case
   NEInr t e -> EInr ext t (go e)
   NECase e n1 a n2 b -> ECase ext (go e) (lambda val n1 a) (lambda val n2 b)
 
+  NEConstArr n t x -> EConstArr ext n t x
   NEBuild1 a n b -> EBuild1 ext (go a) (lambda val n b)
   NEBuild k a n b -> EBuild ext k (go a) (lambda val n b)
-  NEFold1 n1 n2 a b -> EFold1 ext (lambda2 val n1 n2 a) (go b)
+  NEFold1Inner n1 n2 a b -> EFold1Inner ext (lambda2 val n1 n2 a) (go b)
+  NESum1Inner e -> ESum1Inner ext (go e)
   NEUnit e -> EUnit ext (go e)
+  NEReplicate1Inner a b -> EReplicate1Inner ext (go a) (go b)
 
   NEConst t x -> EConst ext t x
   NEIdx0 e -> EIdx0 ext (go e)