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

Recursive solver #372

Merged
merged 50 commits into from
Apr 15, 2020
Merged

Recursive solver #372

merged 50 commits into from
Apr 15, 2020

Commits on Apr 15, 2020

  1. Add back the code for the recursive solver (not yet building)

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    126bf6f View commit details
    Browse the repository at this point in the history

  2. Getting past name resolution errors

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9bb94d1 View commit details
    Browse the repository at this point in the history

  3. Fix many errors

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    6fc0808 View commit details
    Browse the repository at this point in the history

  4. Fix more errors

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    b10ae55 View commit details
    Browse the repository at this point in the history

  5. Fix another error

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d9e1a55 View commit details
    Browse the repository at this point in the history

  6. Fix another error

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    22bfbc0 View commit details
    Browse the repository at this point in the history

  7. Fix the next error, method resolution succeeds

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    8209476 View commit details
    Browse the repository at this point in the history

  8. Fix remaining errors

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    311eb33 View commit details
    Browse the repository at this point in the history

  9. Add recursive solver to SolverChoice

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    298c3b9 View commit details
    Browse the repository at this point in the history

  10. Temporary: Use recursive solver by default in tests

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d3267cf View commit details
    Browse the repository at this point in the history

  11. Delete unused file

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    52dc02a View commit details
    Browse the repository at this point in the history

  12. Fix dyn_Foo_Bar failure

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    faae7fd View commit details
    Browse the repository at this point in the history

  13. Clause priorities (WIP)

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    30fe8c5 View commit details
    Browse the repository at this point in the history

  14. Disable currently non-existent caching

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    64c9215 View commit details
    Browse the repository at this point in the history

  15. Check for input equality

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9ee8178 View commit details
    Browse the repository at this point in the history

  16. Ignore tests currently overflowing/infinitely looping (REMOVE AGAIN)

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    27bc264 View commit details
    Browse the repository at this point in the history

  17. Projection equality test is fixed

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    47a473c View commit details
    Browse the repository at this point in the history

  18. Sort constraints in tests 

    The actual order of the constraints doesn't matter, I think; and the recursive
solver puts them into a HashSet, so the order may vary.
    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9c27db6 View commit details
    Browse the repository at this point in the history

  19. Implement floundering for too-general goals, like the SLG solver

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    fa6dd01 View commit details
    Browse the repository at this point in the history

  20. Truncate goals like in the SLG solver

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    a81d345 View commit details
    Browse the repository at this point in the history

  21. Revert "Ignore tests currently overflowing/infinitely looping (REMOVE… 

    … AGAIN)"

This reverts commit 66332f8.
    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d8ed629 View commit details
    Browse the repository at this point in the history

  22. Add back the old caching for now

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    3e8c1ae View commit details
    Browse the repository at this point in the history

  23. Keep track of clause priority for longer to avoid infinite loop

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    de95b37 View commit details
    Browse the repository at this point in the history

  24. Flounder for AliasEq with unspecific self type as well

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9ab02e2 View commit details
    Browse the repository at this point in the history

  25. Rebase fixes

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    e661d85 View commit details
    Browse the repository at this point in the history

  26. Truncate when adding obligations to avoid messing up the progress ass… 

    …umption

... in the fulfill loop.
    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    7e48a62 View commit details
    Browse the repository at this point in the history

  27. Rebase fixes

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    04b57da View commit details
    Browse the repository at this point in the history

  28. Undo floundering for AliasEq, it's not the right approach

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    b1453e5 View commit details
    Browse the repository at this point in the history

  29. Move floundering logic to program_clauses

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    3a074e4 View commit details
    Browse the repository at this point in the history

  30. Run tests with both solvers by default

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    ea15431 View commit details
    Browse the repository at this point in the history

  31. Fix futures_ambiguity test

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    62b0da6 View commit details
    Browse the repository at this point in the history

  32. Make program_clauses_for_env add the actual env clauses as well 

    The `program_clauses_for_env` function only added elaborated clauses, not the
actual clauses from the environment. Instead, both solvers added the clauses
afterwards. It seems easier to just add the direct clauses as well.
    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9374586 View commit details
    Browse the repository at this point in the history

  33. Rebase fixes

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    27f9ef7 View commit details
    Browse the repository at this point in the history

  34. Use Floundered error in program_clauses

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    60b3892 View commit details
    Browse the repository at this point in the history

  35. Make the prioritization code slightly nicer

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    835fa68 View commit details
    Browse the repository at this point in the history

  36. Add another test

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9166f3e View commit details
    Browse the repository at this point in the history

  37. Move generalizer to its own module

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    2d193f3 View commit details
    Browse the repository at this point in the history

  38. Add back Normalize floundering

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d69da2f View commit details
    Browse the repository at this point in the history

  39. Increase hard-coded max size to 30

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    31d6f2a View commit details
    Browse the repository at this point in the history

  40. Add some more tests

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    f6c1623 View commit details
    Browse the repository at this point in the history

  41. Don't inherit clause priority in implications 

    So if we had some implication A => B, if the solution for A had low priority, we
also made B low priority. After some testing, I don't think this is right.
    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    0abdef9 View commit details
    Browse the repository at this point in the history

  42. Remove AliasTy::type_parameters

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    2316ca6 View commit details
    Browse the repository at this point in the history

  43. Address some review comments 

     - bring back tests I commented out
 - add a few comments
 - add an is_var helper
    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    8fcad2f View commit details
    Browse the repository at this point in the history

  44. ensure all tests run for recursive solve

    @nikomatsakis @flodiebold
    nikomatsakis authored and flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    5768375 View commit details
    Browse the repository at this point in the history

  45. don't silently ignore recursive solver

    @nikomatsakis @flodiebold
    nikomatsakis authored and flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    13b66f1 View commit details
    Browse the repository at this point in the history

  46. Move recursive module from mod.rs to recursive.rs

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    72be500 View commit details
    Browse the repository at this point in the history

  47. add some more projection tests

    @nikomatsakis @flodiebold
    nikomatsakis authored and flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    a952c87 View commit details
    Browse the repository at this point in the history

  48. Rebase fixes; flounder instead of truncating, like SLG

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    77f262f View commit details
    Browse the repository at this point in the history

  49. Use combine_with_priorities when combining answers from cycles as well

    @flodiebold
    flodiebold committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    b032df6 View commit details
    Browse the repository at this point in the history

  50. cite chalk#399 in the fixme

    @nikomatsakis
    nikomatsakis committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    2aa90be View commit details
    Browse the repository at this point in the history