diff options
| author | Tom Smeding <tom@tomsmeding.com> | 2024-09-13 23:07:04 +0200 |
|---|---|---|
| committer | Tom Smeding <tom@tomsmeding.com> | 2024-09-13 23:07:04 +0200 |
| commit | 94938d648e021d2ace0f3b7bf383d256449d619f (patch) | |
| tree | ef077de27b08027c7117761c3efc7d29b7ad3d56 /src/AST/Count.hs | |
| parent | 3d8a6cca424fc5279c43a266900160feb28aa715 (diff) | |
WIP better zero/plus, fixing Accum (...)
The accumulator implementation was wrong because it forgot (in accumAdd)
to take into account that values may be variably-sized. Furthermore, it
was also complexity-inefficient because it did not build up a sparse
value. Thus let's go for the Haskell-interpreter-equivalent of what a
real, fast, compiled implementation would do: just a tree with mutable
variables. In practice one can decide to indeed flatten parts of that
tree, i.e. using a tree representation for nested pairs is bad, but that
should have been done _before_ execution and for _all_ occurrences of
that type fragment, not live at runtime by the accumulator
implementation.
Diffstat (limited to 'src/AST/Count.hs')
| -rw-r--r-- | src/AST/Count.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/AST/Count.hs b/src/AST/Count.hs index 6a00e83..40a46f6 100644 --- a/src/AST/Count.hs +++ b/src/AST/Count.hs @@ -46,6 +46,7 @@ Occ l1 r1 <||> Occ l2 r2 = Occ (l1 <> l2) (max r1 r2) -- | This code is executed many times scaleMany :: Occ -> Occ +scaleMany (Occ l Zero) = Occ l Zero scaleMany (Occ l _) = Occ l Many occCount :: Idx env a -> Expr x env t -> Occ @@ -124,6 +125,8 @@ occCountGeneral onehot unpush alter many = go WId EOp _ _ e -> re e EWith a b -> re a <> re1 b EAccum _ a b e -> re a <> re b <> re e + EZero _ -> mempty + EPlus _ a b -> re a <> re b EError{} -> mempty where re :: Monoid (r env') => Expr x env' t'' -> r env' |