Migrate to accumulators (mostly removing EVM code)

1 files changed, 10 insertions, 8 deletions

diff --git a/src/AST/Count.hs b/src/AST/Count.hs
index de04b5f..f66b809 100644
--- a/src/AST/Count.hs
+++ b/src/AST/Count.hs
@@ -1,7 +1,12 @@
-{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE LambdaCase #-}
 module AST.Count where
 
+import GHC.Generics (Generic, Generically(..))
+
 import AST
 import Data
 
@@ -18,9 +23,8 @@ instance Monoid Count where
 
 data Occ = Occ { _occLexical :: Count
                , _occRuntime :: Count }
-  deriving (Eq)
-instance Semigroup Occ where Occ a b <> Occ c d = Occ (a <> c) (b <> d)
-instance Monoid Occ    where mempty = Occ mempty mempty
+  deriving (Eq, Generic)
+  deriving (Semigroup, Monoid) via Generically Occ
 
 -- | One of the two branches is taken
 (<||>) :: Occ -> Occ -> Occ
@@ -49,8 +53,6 @@ occCount idx = \case
   EIdx1 _ a b -> occCount idx a <> occCount idx b
   EIdx _ e es -> occCount idx e <> foldMap (occCount idx) es
   EOp _ _ e -> occCount idx e
-  EMOne _ _ e -> occCount idx e
-  EMScope e -> occCount idx e
-  EMReturn _ e -> occCount idx e
-  EMBind a b -> occCount idx a <> occCount (IS idx) b
+  EWith a b -> occCount idx a <> occCount (IS idx) b
+  EAccum a b e -> occCount idx a <> occCount idx b <> occCount idx e
   EError{} -> mempty