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

Some fixes (not completely tested).

Browse Source 
Note: There are printfs to remove from ames later.
This commit is contained in:
Jared Hance 2014-05-22 10:00:51 -04:00
parent daba34d0b0
commit 9171b6a183
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arvo/ames.hoon
View File

@ -32,7 +32,7 @@
|= [new=deed old=deed] |= [new=deed old=deed]
^- & ^- &
?> (melt new old) ?> (melt new old)
?> =((shaf %meld (sham q.new)) (need (sure:as:(haul r.q.old) *code p.new))) ?> =((shaf %meld (sham q.new)) (need (sure:as:(hail r.q.old) *code p.new)))
%& %&
:: ::
++ melt :: proper connect ++ melt :: proper connect
@ -67,7 +67,7 @@
|= wed=deed |= wed=deed
^- & ^- &
?> =+ rac=(clan r.p.q.wed) ?> =+ rac=(clan r.p.q.wed)
=+ loy=(haul r.q.wed) =+ loy=(hail r.q.wed)
?> =(0 p.p.q.wed) ?> =(0 p.p.q.wed)
?> =(fig:ex:loy ?+(rac !! %czar (zeno r.p.q.wed), %pawn r.p.q.wed)) ?> =(fig:ex:loy ?+(rac !! %czar (zeno r.p.q.wed), %pawn r.p.q.wed))
?> =((shaf %self (sham q.wed)) (need (sure:as:loy *code p.wed))) ?> =((shaf %self (sham q.wed)) (need (sure:as:loy *code p.wed)))
@ -79,9 +79,13 @@
?> ?& |- ^- ? ?> ?& |- ^- ?
?~ mac & ?~ mac &
?> ?& ?=(^ law) ?> ?& ?=(^ law)
~& [%law `@ux`r.q.i.law]
~& [%mac `@ux`q.i.mac]
~& [%wear (wear q.i.mac)]
~& [%pub `@ux`pub:ex:(wear q.i.mac)]
(lth p.p.q.i.law 9) :: 9-lives rule (lth p.p.q.i.law 9) :: 9-lives rule
=(p.p.q.i.law p.i.mac) =(p.p.q.i.law p.i.mac)
=(r.q.i.law pub:ex:(weur q.i.mac)) =(r.q.i.law pub:ex:(wear q.i.mac))
== ==
$(mac t.mac, law t.law) $(mac t.mac, law t.law)
== ==
@ -109,7 +113,7 @@
^- @uvH ^- @ ^- @uvH ^- @
%+ snag zar %+ snag zar
^- (list ,@uw) ^- (list ,@uw)
:~ 0wN.Kdp5k.p5ncD.4Wsih.bFQFu :: 0, ~zod, Tlon (gleba) :~ 0wB.kk54d.O2AH3.sAK-5.w3v6G :: 0, ~zod, Tlon (gleba)
0w0 :: 1, ~nec, Curtis Yarvin (sator) 0w0 :: 1, ~nec, Curtis Yarvin (sator)
0w0 :: 2, ~bud, Charles Songhurst (angelus) 0w0 :: 2, ~bud, Charles Songhurst (angelus)
0w0 :: 3, ~wes, Tamares Group (angelus) 0w0 :: 3, ~wes, Tamares Group (angelus)
@ -442,7 +446,7 @@
?~ lew.wod.dur !! ?~ lew.wod.dur !!
:+ p.p.q.i.lew.wod.dur :+ p.p.q.i.lew.wod.dur
q.q.i.lew.wod.dur q.q.i.lew.wod.dur
(haul r.q.i.lew.wod.dur) (hail r.q.i.lew.wod.dur)
:: ::
++ clon ++ clon
^- life ^- life
@ -698,7 +702,7 @@
|- ^- (list ship) |- ^- (list ship)
?:((lth our 256) ~ =+(seg=(sein our) [seg $(our seg)])) ?:((lth our 256) ~ =+(seg=(sein our) [seg $(our seg)]))
:: ::
(turn mac |=([p=life q=ring] [p q (weur q)])) (turn mac |=([p=life q=ring] [p q (wear q)]))
wil wil
~ ~
~ ~
@ -947,13 +951,13 @@
:- p :- p
%= q %= q
val val
(turn val.q |=([p=life q=ring r=acru] [p q (weur q)])) (turn val.q |=([p=life q=ring r=acru] [p q (wear q)]))
== ==
== ==
++ come :: come:am ++ come :: come:am
|= [ges=(unit ,@t) wid=@ bur=@] :: instantiate pawn |= [ges=(unit ,@t) wid=@ bur=@] :: instantiate pawn
^- [p=[p=ship q=@uvG] q=furt] ^- [p=[p=ship q=@uvG] q=furt]
=+ loy=(bruw wid bur) =+ loy=(brew wid bur)
=+ rig=sec:ex:loy =+ rig=sec:ex:loy
=+ our=`@p`fig:ex:loy =+ our=`@p`fig:ex:loy
=+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy] =+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy]
@ -969,7 +973,7 @@
++ czar :: czar:am ++ czar :: czar:am
|= [our=ship ger=@uw] :: instantiate emperor |= [our=ship ger=@uw] :: instantiate emperor
^- [p=(list boon) q=furt] ^- [p=(list boon) q=furt]
=+ loy=(bruw 2.048 ger) =+ loy=(brew 2.048 ger)
?> =(fig:ex:loy (zeno our)) ?> =(fig:ex:loy (zeno our))
=+ mac=`mace`[[0 sec:ex:loy] ~] =+ mac=`mace`[[0 sec:ex:loy] ~]
=+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub:ex:loy] =+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub:ex:loy]