Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix Reflex.Profiled infinite recursion for merge incremental #389

Merged
merged 2 commits into from
Feb 5, 2020
Merged

Fix Reflex.Profiled infinite recursion for merge incremental #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85edd63
Fix infinite loop in Reflex Profiled
matthewbauer Feb 4, 2020
f2e34d4
Add changelog for 85edd63dfdca1224d4b11cda331228b6f4fd06fc
matthewbauer Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Revision history for reflex

## 0.6.5

* Fix a bug in the Reflex Profiled transformer where
`Reflex.Class.mergeIncrementalG` and
`Reflex.Class.mergeIncrementalWithMoveG` implementations referenced
itself instead of the inner transformed timeline, causing an
infinite loop.

## 0.6.4

* Support GHC 8.8
Expand Down
4 changes: 2 additions & 2 deletions src/Reflex/Profiled.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ instance Reflex t => Reflex (ProfiledTimeline t) where
updated (Dynamic_Profiled d) = coerce $ profileEvent $ updated d
unsafeBuildDynamic (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildDynamic a0 a'
unsafeBuildIncremental (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildIncremental a0 a'
mergeIncrementalG nt = (Event_Profiled . coerce) #. mergeIncrementalG nt
mergeIncrementalWithMoveG nt = (Event_Profiled . coerce) #. mergeIncrementalWithMoveG nt
mergeIncrementalG nt res = Event_Profiled $ mergeIncrementalG (coerce nt) (coerce res)
mergeIncrementalWithMoveG nt res = Event_Profiled $ mergeIncrementalWithMoveG (coerce nt) (coerce res)
currentIncremental (Incremental_Profiled i) = coerce $ currentIncremental i
updatedIncremental (Incremental_Profiled i) = coerce $ profileEvent $ updatedIncremental i
incrementalToDynamic (Incremental_Profiled i) = coerce $ incrementalToDynamic i
Expand Down