ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 08:34:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp'

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
pcmonk 2014-07-07 16:56:44 -07:00
commit b2f5a36cae
4 changed files with 91 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arvo/ames.hoon
View File

@ -51,9 +51,6 @@
$? $: %a :: from %ames $? $: %a :: from %ames
$% [%went p=ship q=cape] :: $% [%went p=ship q=cape] ::
== == :: == == ::
$: %g :: from %gall
$% [%rasp p=(unit (pair logo noun))] ::
== == ::
$: @tas :: $: @tas ::
$% [%crud p=@tas q=(list tank)] :: by any $% [%crud p=@tas q=(list tank)] :: by any
[%send p=lane q=@] :: transmit packet [%send p=lane q=@] :: transmit packet
@ -1688,8 +1685,6 @@
^- [(list move) _+>] ^- [(list move) _+>]
?- +<.sih ?- +<.sih
%crud [[[hen [%slip %d %flog +.sih]] ~] +>] %crud [[[hen [%slip %d %flog +.sih]] ~] +>]
%rasp ~& %knap-rasp
[~ +>]
%send [[hen %give +.sih]~ +>] %send [[hen %give +.sih]~ +>]
%went [~ +>] %went [~ +>]
== ==

63
arvo/eyre.hoon
View File

@ -76,7 +76,9 @@
== == :: == == ::
$: %g :: by %gall $: %g :: by %gall
$% [%dumb ~] :: $% [%dumb ~] ::
[%rasp p=(unit (pair logo noun))] :: [%lean ~] ::
[%mean p=(list tank)] ::
[%nice ~] ::
[%rush p=logo q=*] :: [%rush p=logo q=*] ::
[%rust p=logo q=*] :: [%rust p=logo q=*] ::
== == :: == == ::
@ -319,25 +321,7 @@
%crud %crud
+>.$(mow [[hen %slip %d %flog +.sih] mow]) +>.$(mow [[hen %slip %d %flog +.sih] mow])
:: ::
%dumb ?(%dumb %lean %mean %nice %rush %rust)
?> ?=([%hoop @ @ @ @ ~] tea)
=+ ^= ouy
%- yolk:(gale (slav %p i.t.tea) i.t.t.tea)
(slav %ud i.t.t.t.tea)
?~ ouy
+>.$
abet:work:abet:dumb:(yule:u.ouy (slav %ud i.t.t.t.t.tea))
::
%made
?. ?=([%honk @ @ @ ~] tea)
+>.$
%- galt
[(slav %p i.t.tea) i.t.t.tea (slav %ud i.t.t.t.tea) p.+.sih]
::
%rasp
=+ ^= cuy ^- (unit cage)
?~ p.+.sih ~
`[p.u.p.+.sih (slot 15 [typ +.sih])]
?> ?=([%hoop @ @ @ @ ~] tea) ?> ?=([%hoop @ @ @ @ ~] tea)
=+ ^= ouy =+ ^= ouy
%- yolk:(gale (slav %p i.t.tea) i.t.t.tea) %- yolk:(gale (slav %p i.t.tea) i.t.t.tea)
@ -346,20 +330,37 @@
+>.$ +>.$
=+ woy=(yule:u.ouy (slav %ud i.t.t.t.t.tea)) =+ woy=(yule:u.ouy (slav %ud i.t.t.t.t.tea))
=< abet =< work =< abet =< abet =< work =< abet
?~ cuy ?- -.+.sih
%dumb
dumb:woy dumb:woy
(hear:woy `[%& u.cuy]) %lean
%^ hear:woy ~ %&
:- %json !>((jobe ~[[%ok %b |] [%res %s 'subscription ended']]))
%mean
=+ ^= jso
%- jobe
:+ [%ok %b |]
:+ %res %s
%- crip
%+ slag 2
^- tape
%+ roll p.+.sih
|= [p=tank q=tape]
:(weld q "\\n" ~(ram re p))
~
(hear:woy ~ %& %json !>(jso))
%nice
(hear:woy ~ %& %json !>((joba %ok %b &)))
?(%rust %rush)
=+ cay=`cage`[p.+.sih (slot 3 (spec (slot 3 [typ +.sih])))]
(hear:woy ~ ?:(?=(%rust -.+.sih) [%& cay] [%| cay]))
==
:: ::
?(%rush %rust) %made
=+ cay=`cage`[p.+.sih (slot 3 (spec (slot 3 [typ +.sih])))] ?. ?=([%honk @ @ @ ~] tea)
=+ heq=?:(?=(%rust -.+.sih) [%& cay] [%| cay])
?> ?=([%hoop @ @ @ @ ~] tea)
=+ ^= ouy
%- yolk:(gale (slav %p i.t.tea) i.t.t.tea)
(slav %ud i.t.t.t.tea)
?~ ouy
+>.$ +>.$
abet:work:abet:(hear:(yule:u.ouy (slav %ud i.t.t.t.t.tea)) `heq) %- galt
[(slav %p i.t.tea) i.t.t.tea (slav %ud i.t.t.t.tea) p.+.sih]
:: ::
%thou :: remote return %thou :: remote return
?> ?=([@ @ *] tea) ?> ?=([@ @ *] tea)

40
arvo/gall.hoon
View File

@ -14,8 +14,10 @@
$% [%back p=?] :: %mess ack good/bad $% [%back p=?] :: %mess ack good/bad
[%crud p=@tas q=(list tank)] :: physical error [%crud p=@tas q=(list tank)] :: physical error
[%dumb ~] :: close duct [%dumb ~] :: close duct
[%rasp ~] :: message failure [%lean ~] :: subscription done
[%mean p=(list tank)] :: message failure
[%meta p=vase] :: meta-gift [%meta p=vase] :: meta-gift
[%nice ~] :: message success
== :: == ::
++ hasp ,[p=ship q=term] :: app identity ++ hasp ,[p=ship q=term] :: app identity
++ kiss :: in request ->$ ++ kiss :: in request ->$
@ -80,8 +82,8 @@
$% [%d p=logo q=*] :: diff $% [%d p=logo q=*] :: diff
[%e p=(list tank)] :: error [%e p=(list tank)] :: error
[%f p=logo q=*] :: full refresh [%f p=logo q=*] :: full refresh
[%k ~] :: message response
[%n ~] :: cancel subscription [%n ~] :: cancel subscription
[%r p=(unit (pair logo noun))] :: message response
== :: == ::
++ rook :: foreign request ++ rook :: foreign request
$% [%m p=logo q=*] :: message $% [%m p=logo q=*] :: message
@ -108,7 +110,9 @@
$? [?(%a %b %c %d %e) @tas *] :: $? [?(%a %b %c %d %e) @tas *] ::
$: %g :: by %gall $: %g :: by %gall
$% [%dumb ~] :: $% [%dumb ~] ::
[%rasp p=(unit (pair logo noun))] :: [%lean ~] :: cancel subscription
[%mean p=(list tank)] :: message failure
[%nice ~] :: message success
[%rush p=logo q=*] :: [%rush p=logo q=*] ::
[%rust p=logo q=*] :: [%rust p=logo q=*] ::
== == :: == == ::
@ -260,21 +264,10 @@
^- gift ^- gift
:- %meta :- %meta
^- vase ^- vase
:- :+ %cell [%cube %rust %atom %tas] :- :+ %cell [%cube sem %atom %tas]
[%cell [%atom %tas] p.q.cay] [%cell [%atom %tas] p.q.cay]
[sem p.cay q.q.cay] [sem p.cay q.q.cay]
:: ::
++ besp :: best for rasp grr
|= cuy=(unit cage)
^- gift
?~ cuy [%rasp ~]
:- %meta
^- vase
:- :+ %cell [%cube %rasp %atom %tas]
:+ %cell [%cube 0 [%atom %n]]
[%cell [%atom %tas] p.q.u.cuy]
[%rasp ~ p.u.cuy q.q.u.cuy]
::
++ gaff :: take and go ++ gaff :: take and go
|= [our=@p app=@tas] |= [our=@p app=@tas]
=+ mat=(need (~(get by pol.all) our)) =+ mat=(need (~(get by pol.all) our))
@ -331,7 +324,6 @@
?+ -.pax !! ?+ -.pax !!
%d [%give (best %rush cay)] %d [%give (best %rush cay)]
%f [%give (best %rust cay)] %f [%give (best %rust cay)]
%r [%give (besp ~ cay)]
== ==
== ==
:: ::
@ -361,7 +353,9 @@
%g %g
?- -.+.sih ?- -.+.sih
%dumb !! %dumb !!
%rasp (rod %r p.+.sih) %lean !!
%mean (rod %e p.+.sih)
%nice (rod %k ~)
%rush !! %rush !!
%rust !! %rust !!
== ==
@ -374,7 +368,9 @@
^- note ^- note
?- -.+.sih ?- -.+.sih
%dumb !! %dumb !!
%rasp !! %lean (rod %n ~)
%mean !!
%nice !!
%rush (rod %d p.+.sih q.+.sih) %rush (rod %d p.+.sih q.+.sih)
%rust (rod %f p.+.sih q.+.sih) %rust (rod %f p.+.sih q.+.sih)
== ==
@ -394,10 +390,8 @@
%d [%pass /x/d `note`[%f %exec p.saq ~ %vale p.ron saq q.ron]] %d [%pass /x/d `note`[%f %exec p.saq ~ %vale p.ron saq q.ron]]
%e !! %e !!
%f [%pass /x/f `note`[%f %exec p.saq ~ %vale p.ron saq q.ron]] %f [%pass /x/f `note`[%f %exec p.saq ~ %vale p.ron saq q.ron]]
%k !!
%n !! %n !!
%r ?~ p.ron
[%give %rasp ~]
[%pass /x/r `note`[%f %exec p.saq ~ %vale p.u.p.ron saq q.u.p.ron]]
== ==
:: ::
++ gawk :: %r call/request ++ gawk :: %r call/request
@ -756,7 +750,7 @@
:: ::
%poke %poke
=^ gud +>.$ (mack q.hin) =^ gud +>.$ (mack q.hin)
?^ gud (give %rasp ~) ?^ gud (give %mean leaf/"mack-fail" ~)
+>.$ +>.$
:: ::
%pour %pour
@ -937,7 +931,7 @@
=+ goc=(cat 3 'poke-' p.q.kon) =+ goc=(cat 3 'poke-' p.q.kon)
?:((warm goc) goc %poke) ?:((warm goc) goc %poke)
?. (warm cog) ?. (warm cog)
(give(qic.sat ~) %rasp ~) (give(qic.sat ~) %mean leaf/"poke-fail" ~)
?> ?=(^ huv.sat) ?> ?=(^ huv.sat)
=+ sam=:(slop [[%atom %ud] ost] [[%atom %p] p.kon] q.q.kon) =+ sam=:(slop [[%atom %ud] ost] [[%atom %p] p.kon] q.q.kon)
:: ~& [%mess-poke cog] :: ~& [%mess-poke cog]

3
main/app/appbug-2/core.hoon
View File

@ -5,8 +5,7 @@
++ poke ++ poke
|= [ost=bone *] |= [ost=bone *]
:_ +>(p.vat +(p.vat)) :_ +>(p.vat +(p.vat))
:~ [ost %give %rasp ~ %json *json] :~ [ost %give %mean leaf/"you're evillll" ~]
[%c %pass]
== ==
:: ::
++ peek ++ peek