[CakeML-dev] .lem files in the semantics

Scott Owens S.A.Owens at kent.ac.uk
Thu Dec 8 14:23:55 UTC 2016


> On 2016/12/07, at 22:44, Ramana Kumar <Ramana.Kumar at cl.cam.ac.uk> wrote:
> 
> I would like to merge the FFI names pull request (which Johannes
> mentioned - is that ok with you Scott?) but apart from that the
> moratorium sounds fine, presuming it's not for very long. I read it
> primarily as impetus to get env-refactor merged as soon as possible…

Yeah. Also, if you do need to make a change, then if you coordinate with me, we can make sure to get the conflicts solved correctly.

> What's left to be done before the merge?

Inferencer proofs are currently cheated. The translator doesn’t work. modLang and conLang need tweaking. I’ll be working on the latter.

Scott

> 
> On 8 December 2016 at 03:21, Johannes Åman Pohjola <pohjola at chalmers.se> wrote:
>> I will happily abide by this moratorium, with one exception: some minor
>> changes to .lem files on the isse159 branch, that I hope to make a pull
>> request for very soon. The change to the .lem files is basically just to
>> replace nums with strings wherever they represent FFI indexes, which I hope
>> is innocent enough to cause you little additional merging pain.
>> 
>> /Johannes
>> 
>> 
>> 
>> On 2016-12-07 16:57, Scott Owens wrote:
>>> 
>>> Can we put a moratorium on modifying the .lem files of the master branch
>>> until after the env-refactor branch is merged. Merging master into
>>> env-refactor creates a bunch of conflicts when this has happened. It is
>>> especially bad for the .lem files in the proofs subdirectory where the
>>> env-refactor branch no longer uses .lem files. The changes are at a real
>>> risk of being lost as the only practical way to resolve the conflicts is
>>> with a git checkout —ours followed by an attempt to re-apply the changes.
>>> 
>>> Scott
>>> _______________________________________________
>>> Developers mailing list
>>> Developers at cakeml.org
>>> https://lists.cakeml.org/listinfo/developers
>> 
>> 
>> 
>> _______________________________________________
>> Developers mailing list
>> Developers at cakeml.org
>> https://lists.cakeml.org/listinfo/developers
> 
> _______________________________________________
> Developers mailing list
> Developers at cakeml.org
> https://lists.cakeml.org/listinfo/developers



More information about the Developers mailing list