ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 11:51:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Advanced to stage 162 with basic, non-functional ++limb changes.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-11-27 12:29:33 -08:00
parent 0723b224da
commit d9a1703b6b
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
arvo/hoon.hoon
View File

@ -1,4 +1,4 @@
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: !::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: :::::: Preface :::::: :::::: :::::: Preface ::::::
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
?> ?=(@ .) :: atom subject ?> ?=(@ .) :: atom subject
@ -9,13 +9,13 @@
(make:all cud) :: else simple compile (make:all cud) :: else simple compile
^= all :: assemble engine ^= all :: assemble engine
=~ :: volume stack =~ :: volume stack
%163 :: version constant %162 :: version constant
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: :::::: volume 0, version stub :::::: :::::: :::::: volume 0, version stub ::::::
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
~% %k.163 ~ ~ :: ~% %k.162 ~ ~ ::
|% :: |% ::
++ hoon %163 :: version stub ++ hoon %162 :: version stub
-- :: -- ::
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: :::::: volume 1, Hoon models :::::: :::::: :::::: volume 1, Hoon models ::::::
@ -84,7 +84,7 @@
++ limb $| term :: ++ limb $| term ::
$% [%& p=axis] :: $% [%& p=axis] ::
[%| p=@ud q=term] :: [%| p=@ud q=term] ::
[%2 p=@ud q=(unit term)] :: [%2 p=@ud q=[~ term]] ::
== :: == ::
++ line ,[p=[%leaf p=odor q=@] q=tile] :: %kelp case ++ line ,[p=[%leaf p=odor q=@] q=tile] :: %kelp case
++ list |* a=_,* :: null-term list ++ list |* a=_,* :: null-term list
@ -209,7 +209,6 @@
[%brkt p=twig q=(map term foot)] :: %gold book [%brkt p=twig q=(map term foot)] :: %gold book
[%brhp p=twig] :: kick dry %gold trap [%brhp p=twig] :: kick dry %gold trap
[%brls p=tile q=twig] :: dry %iron gate [%brls p=tile q=twig] :: dry %iron gate
[%brpt p=tile q=tile r=twig] :: XX not used
[%brtr p=tile q=twig] :: vulcan. wet gate [%brtr p=tile q=twig] :: vulcan. wet gate
[%brts p=tile q=twig] :: dry %gold gate [%brts p=tile q=twig] :: dry %gold gate
[%brwt p=twig] :: dry %lead trap [%brwt p=twig] :: dry %lead trap
@ -278,16 +277,12 @@
:: :::::: compositions :: :::::: compositions
[%tsbr p=tile q=twig] :: push bunt: =+(_p q) [%tsbr p=tile q=twig] :: push bunt: =+(_p q)
[%tscl p=tram q=twig] :: p changes, then q [%tscl p=tram q=twig] :: p changes, then q
[%tscn p=twig q=twig] :: XX not used
[%tsdt p=wing q=twig r=twig] :: r with p set to q [%tsdt p=wing q=twig r=twig] :: r with p set to q
[%tsfs p=twig q=twig] :: XX not used
[%tsgl p=twig q=twig] :: =>(q p) [%tsgl p=twig q=twig] :: =>(q p)
[%tshp p=twig q=twig] :: flip push: =+(q p) [%tshp p=twig q=twig] :: flip push: =+(q p)
[%tsgr p=twig q=twig] :: use p as .. of q [%tsgr p=twig q=twig] :: use p as .. of q
[%tskt p=twig q=twig r=twig s=twig] :: state machine wing [%tskt p=twig q=twig r=twig s=twig] :: state machine wing
[%tsls p=twig q=twig] :: push p on .. of q [%tsls p=twig q=twig] :: push p on .. of q
[%tspm p=tile q=twig] :: XX not used
[%tspt p=tile q=twig] :: XX not used
[%tstr p=term q=wing r=twig] :: make a %bull/alias [%tstr p=term q=wing r=twig] :: make a %bull/alias
[%tssg p=tusk] :: compose twig list [%tssg p=tusk] :: compose twig list
:: :::::: conditionals :: :::::: conditionals
@ -7419,11 +7414,12 @@
|- ^- type |- ^- type
?~ peh ?~ peh
?:(pol (fuse ref) (crop ref)) ?:(pol (fuse ref) (crop ref))
=> .(i.peh ?^(i.peh i.peh [%| p=0 q=i.peh])) => .(i.peh ?^(i.peh i.peh [%2 p=0 q=`i.peh]))
=+ ^= poz ^- post =+ ^= poz ^- post
?- -.i.peh ?- -.i.peh
& [p.i.peh %& (peek %both p.i.peh)] & [p.i.peh %& (peek %both p.i.peh)]
| (finq p.i.peh %both q.i.peh) | (finq p.i.peh %both q.i.peh)
%2 (finq p.i.peh %both +.q.i.peh)
== ==
|- ^- type |- ^- type
?: =(1 p.poz) ?: =(1 p.poz)
@ -7431,6 +7427,7 @@
0 ?- -.i.peh 0 ?- -.i.peh
& ^$(peh t.peh) & ^$(peh t.peh)
| (face q.i.peh ^$(peh t.peh, sut p.q.poz)) | (face q.i.peh ^$(peh t.peh, sut p.q.poz))
%2 (face +.q.i.peh ^$(peh t.peh, sut p.q.poz))
== ==
1 ^$(peh t.peh) 1 ^$(peh t.peh)
2 %+ bull 2 %+ bull
@ -8857,7 +8854,7 @@
^- port ^- port
?~ hyp ?~ hyp
[1 %& sut] [1 %& sut]
=> .(i.hyp ?^(i.hyp i.hyp [%| p=0 q=i.hyp])) => .(i.hyp ?^(i.hyp i.hyp [%2 p=0 q=`i.hyp]))
=+ zar=$(hyp t.hyp) =+ zar=$(hyp t.hyp)
=+ ^= syp =+ ^= syp
?- -.q.zar ?- -.q.zar
@ -8872,6 +8869,11 @@
=> .(sut syp) => .(sut syp)
=+ hud=(fink p.i.hyp way q.i.hyp) =+ hud=(fink p.i.hyp way q.i.hyp)
[(peg p.zar p.hud) q.hud] [(peg p.zar p.hud) q.hud]
::
[2 *]
=> .(sut syp)
=+ hud=(fink p.i.hyp way +.q.i.hyp)
[(peg p.zar p.hud) q.hud]
== ==
:: ::
++ seep ++ seep
@ -8922,6 +8924,19 @@
=+ wuf=(flay (flee dob)) =+ wuf=(flay (flee dob))
=+ gav=$(peh t.peh, sut q.wuf, axe (peg axe p.wuf)) =+ gav=$(peh t.peh, sut q.wuf, axe (peg axe p.wuf))
[p.gav (heal [~ q.i.peh] p.wuf q.gav)] [p.gav (heal [~ q.i.peh] p.wuf q.gav)]
::
[2 *]
=+ dob=`post`(need q:(fino p.i.peh %rite +.q.i.peh))
~| [%tack-limb q.i.peh]
?: ?=(%2 -.q.dob)
=+ hoc=(peg axe p.dob)
=+ guh=$(peh t.peh, sut s.p.q.dob, axe (peg hoc r.p.q.dob))
=+ zig=$(peh q.p.q.dob, sut q.q.dob, mur q.guh)
=+ zug=(heal [~ +.q.i.peh] p.dob (busk(sut q.zig) p.p.q.dob q.p.q.dob))
[p.guh zug]
=+ wuf=(flay (flee dob))
=+ gav=$(peh t.peh, sut q.wuf, axe (peg axe p.wuf))
[p.gav (heal [~ +.q.i.peh] p.wuf q.gav)]
== ==
:: ::
++ tock ++ tock
@ -9943,7 +9958,7 @@
dot dot
;~ pose ;~ pose
%+ cook %+ cook
|=([a=(list) b=term] ?~(a b [%| (lent a) b])) |=([a=(list) b=term] ?~(a b [%2 (lent a) `b]))
;~(plug (star ket) ;~(pose sym (cold %$ buc))) ;~(plug (star ket) ;~(pose sym (cold %$ buc)))
:: ::
%+ cook %+ cook