Merge branch 'master' of github.com:urbit/urbit

This commit is contained in:
C. Guy Yarvin 2014-04-15 18:36:43 -07:00
commit 2e0dbf2ecf

View File

@ -3693,9 +3693,9 @@
|= [old=* new=*] ^- udon |= [old=* new=*] ^- udon
:- pum :- pum
?+ pum ~|(%unsupported !!) ?+ pum ~|(%unsupported !!)
%a [%a old new] %a [%d (nude old new)]
%b =+ [hel=(cue ((hard ,@) old)) hev=(cue ((hard ,@) new))] :: %b =+ [hel=(cue ((hard ,@) old)) hev=(cue ((hard ,@) new))]
[%a old new] :: [%d (nude hel hev)]
%c =+ [hel=(lore ((hard ,@) old)) hev=(lore ((hard ,@) new))] %c =+ [hel=(lore ((hard ,@) old)) hev=(lore ((hard ,@) new))]
[%c (lusk hel hev (loss hel hev))] [%c (lusk hel hev (loss hel hev))]
== ==
@ -3799,6 +3799,7 @@
?+ -.q.don ~|(%unsupported !!) ?+ -.q.don ~|(%unsupported !!)
%a q.p.q.don %a q.p.q.don
%c (lurk ((hard (list)) src) p.q.don) %c (lurk ((hard (list)) src) p.q.don)
%d (lure src p.q.don)
== ==
:: ::
%c %c
@ -3810,6 +3811,15 @@
== ==
== ==
:: ::
++ lure :: apply tree diff
|= [a=* b=upas]
^- *
?^ -.b
[$(b -.b) $(b +.b)]
?+ -.b ~|(%unsupported !!)
%0 .*(a [0 p.b])
%1 .*(a [1 p.b])
==
++ limp :: invert patch ++ limp :: invert patch
|= don=udon ^- udon |= don=udon ^- udon
:- p.don :- p.don