fixup! ;fix:ui: fix thunk and other accumulations

Author: alerque

hledger-ui/Hledger/UI/UIScreens.hs

@@ -241,11 +241,12 @@ rsNew uopts d j acct forceinclusive =  -- XXX forcedefaultselection - whether to
     }
 
 -- | Update a register screen from these options, reporting date, and journal.
-rsUpdate :: UIOpts -> Day -> Journal -> RegisterScreenState -> RegisterScreenState
-rsUpdate uopts d j rss@RSS{_rssAccount, _rssForceInclusive, _rssList=oldlist} =
-  dbgui "rsUpdate"
+rsUpdate uopts d j rss@RSS{_rssAccount, _rssForceInclusive} =
+  dbgui "rsUpdate" $
   rss{_rssList=l'}
   where
+    -- Force evaluation of old list to allow GC
+    !oldlist = _rssList rss
     UIOpts{uoCliOpts=copts@CliOpts{reportspec_=rspec@ReportSpec{_rsReportOpts=ropts}}} = uopts
     -- gather arguments and queries
     -- XXX temp
@@ -309,7 +310,8 @@ rsUpdate uopts d j rss@RSS{_rssAccount, _rssForceInclusive, _rssList=oldlist} =
                             }
 
     -- build the new list widget
-    !l = list RegisterList (V.fromList $ displayitems ++ blankitems) 1
+    !itemsVector = V.fromList $ displayitems ++ blankitems
+    !l = list RegisterList itemsVector 1
 
     -- ensure the appropriate list item is selected:
     -- if forcedefaultselection is true, the last (latest) transaction;  XXX still needed ?

hledger-ui/Hledger/UI/UIState.hs

@@ -59,7 +59,7 @@ import Hledger
 import Hledger.Cli.CliOptions
 import Hledger.UI.UITypes
 import Hledger.UI.UIOptions (UIOpts(uoCliOpts))
-import Hledger.UI.UIScreens (screenUpdate)
+import Hledger.UI.UIScreens
 import Hledger.UI.UIUtils (showScreenId, showScreenStack)
 
 -- | Make an initial UI state with the given options, journal,
@@ -369,8 +369,15 @@ resetScreens d ui@UIState{astartupopts=origopts, ajournal=j, aScreen=s,aPrevScre
 -- XXX Currently this does not properly regenerate the transaction screen or error screen,
 -- which depend on state from their parent(s); those screens' handlers must do additional work, which is fragile.
 regenerateScreens :: Journal -> Day -> UIState -> UIState
-regenerateScreens j d ui@UIState{aopts=opts, aScreen=s,aPrevScreens=ss} =
-  let !newScreen = screenUpdate opts d j s
-      !newPrevScreens = map (screenUpdate opts d j) ss
-      !newJournal = j
-  in ui{ajournal=newJournal, aScreen=newScreen, aPrevScreens=newPrevScreens}
+regenerateScreens j d ui@UIState{aScreen=s} = 
+  let !ui' = ui{ajournal=j, aScreen=s'}
+      !s' = case s of
+        MS mss -> MS $! msUpdate mss
+        AS ass -> AS $! asUpdate (aopts ui') d j ass
+        CS ass -> CS $! csUpdate (aopts ui') d j ass
+        BS ass -> BS $! bsUpdate (aopts ui') d j ass
+        IS ass -> IS $! isUpdate (aopts ui') d j ass
+        RS rss -> RS $! rsUpdate (aopts ui') d j rss
+        TS tss -> TS $! tsUpdate tss
+        ES _   -> s
+  in ui'