wilbowma / cur

A less devious proof assistant
BSD 2-Clause "Simplified" License
222 stars 18 forks source link

merge turnstile-core and related branches into master #112

Closed stchang closed 4 years ago

stchang commented 4 years ago

Opening this, but dont merge. Ready to merge!

This pr combines:

So this includes all the additional work from your turnstile-core, as well as everything from popl2020-artifact except define-z3-axiom (to avoid dependency on rosette).

The tests should now pass with macrotypes master so after this merge, users should use cur master along with macrotypes master

stchang commented 4 years ago

Ready to merge!

stchang commented 4 years ago

I decided to leave all the commits bc I realized the fine-grained history is useful. I already did a lot of squashing while developing.

wilbowma commented 4 years ago

Okay! I'll press the big red (green) button!

stchang commented 4 years ago

fingers crossed

wilbowma commented 4 years ago

Okay merged! Does this work with macrotypes/turnstile master now?

stchang commented 4 years ago

yup. woohoo!

wilbowma commented 4 years ago

Huzzah! Thanks for all the work!