Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Combination of #1 and #2 #10

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from
Open

WIP: Combination of #1 and #2 #10

wants to merge 34 commits into from
+940 −24

Commits on Oct 8, 2019

  1. add a couple of types for working with patches

    @danbornside
    danbornside committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    d66d5e9 View commit details
    Browse the repository at this point in the history

  2. Update src/Reflex/Patch/Patchable.hs 

    Co-Authored-By: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
    @danbornside @alexfmpe
    danbornside and alexfmpe committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    732cb14 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. Merge branch 'develop' into patch-dmap-reset

    @Ericson2314
    Ericson2314 authored Dec 9, 2019
    Configuration menu
    Copy the full SHA
    b742380 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Merge remote-tracking branch 'patch/develop' into patch-dmap-reset

    @Ericson2314
    Ericson2314 committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    0918153 View commit details
    Browse the repository at this point in the history

  2. Add change log entry

    @Ericson2314
    Ericson2314 committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    0ec95ff View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2020

  1. Merge remote-tracking branch 'origin/patch-dmap-reset' into dpatch-ma… 

    …p-inner-patch
    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    a74f716 View commit details
    Browse the repository at this point in the history

  2. Get rid of entirely-_ pattern in Group instances 

    Do this without changing strictness using ~.
    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    cf7b8fb View commit details
    Browse the repository at this point in the history

  3. Add notion of heterogenous patch

    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    7fd18c0 View commit details
    Browse the repository at this point in the history

  4. WIP: Patch in PatchDMapWithMove's From_Move 

    This makes it match the new PatchMapWithMove, and obviates
PatchDMapWithReset.
    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    aa7311b View commit details
    Browse the repository at this point in the history

  5. Try making the "to" field at a potentially different index 

    This isn't good enough. I think there is a bug in that we don't store
enough information in the two field: we need both inner patches with the
join so we can combine them together. In the non-dependent case, nothing
stops us from making this misake, but in the dependent case we would
need to use a `Category` instance on the inner move patches. We plainly
aren't combining two inner patches in the double move case, and the
types let us know.
    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    d72221c View commit details
    Browse the repository at this point in the history

  6. WIP Generalize DMap patching

    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    f78dd16 View commit details
    Browse the repository at this point in the history

  7. Over the hill

    @Ericson2314
    Ericson2314 committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    69a7ab8 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2020

  1. Get everything type checking again

    @Ericson2314
    Ericson2314 committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    3f037af View commit details
    Browse the repository at this point in the history

  2. Export Data.Patch.DMapWithMove.By

    @Ericson2314
    Ericson2314 committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    6b8b77b View commit details
    Browse the repository at this point in the history

  3. Remove PatchDMapWithReset now that it has been accounted for

    @Ericson2314
    Ericson2314 committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    ab5bd5d View commit details
    Browse the repository at this point in the history

  4. Add decidably empty things

    @Ericson2314
    Ericson2314 committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    c99f2d2 View commit details
    Browse the repository at this point in the history

  5. Appease hlint

    @Ericson2314
    Ericson2314 committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    98634c9 View commit details
    Browse the repository at this point in the history

  6. Remove Patchable 

    I'm not sure it is a good idea in general, so I am putting in another
library instead.
    @Ericson2314
    Ericson2314 committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    5a13577 View commit details
    Browse the repository at this point in the history

  7. Update ChangeLog.md

    @Ericson2314
    Ericson2314 authored Jan 12, 2020
    Configuration menu
    Copy the full SHA
    08f13f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. Merge branch 'develop' of github.com:reflex-frp/patch into dpatch-map… 

    …-inner-patch
    @Ericson2314
    Ericson2314 committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    6fcf213 View commit details
    Browse the repository at this point in the history

  2. WIP make old in terms of new

    @Ericson2314
    Ericson2314 committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    c3cac44 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'patch-map-inner-patch' into dpatch-map-inner-patch

    @Ericson2314
    Ericson2314 committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    584334f View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Merge branch 'patch-map-inner-patch-desugar' into dpatch-map-inner-patch

    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    6ef716a View commit details
    Browse the repository at this point in the history

  2. Restore the old DMapWithMove, 

    New one is called `DMapWithPatchingMove`
    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    ac8f411 View commit details
    Browse the repository at this point in the history

  3. DMapWithPatchingnMove: Restore old algo 

    This is the one that doesn't store patches on the "to" side.
    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    48711bc View commit details
    Browse the repository at this point in the history

  4. Simplify type of "To" 

    Now that it doesn't contain patches, it doesn't need so many params.
    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    8e3015a View commit details
    Browse the repository at this point in the history

  5. Simplify type of fixup

    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    4da27a8 View commit details
    Browse the repository at this point in the history

  6. Delete old code and format a bit

    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    76f010e View commit details
    Browse the repository at this point in the history

  7. Put back Cat.DecidablyEmpty

    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    efb8a9b View commit details
    Browse the repository at this point in the history

  8. Remove redundant geq

    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    62bd0fc View commit details
    Browse the repository at this point in the history

  9. Simplify 

    Expanded some thing fighting the type checker, can put back now.
    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    055f256 View commit details
    Browse the repository at this point in the history

  10. Improve error

    @Ericson2314
    Ericson2314 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    76033e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. Merge remote-tracking branch 'origin/develop' into HEAD

    @Ericson2314
    Ericson2314 committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    ccd725a View commit details
    Browse the repository at this point in the history

  2. Replace Proxy3 with something more appropriate

    @Ericson2314
    Ericson2314 committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    873bad6 View commit details
    Browse the repository at this point in the history