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

Take out floppatronic.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-01-18 15:19:06 -08:00
parent d1b54827b3
commit ad2e0bcf05
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arvo/gall.hoon
View File

@ -992,8 +992,8 @@
:: ::
++ said :: sayz, done wrong ++ said :: sayz, done wrong
|= vud=vase |= vud=vase
=- [(flop p.fob) (weld (flop q.fob) mow)] :: =- [(flop p.fob) (weld (flop q.fob) mow)]
^= fob :: ^= fob
|- ^- (pair (list toil) (list move)) |- ^- (pair (list toil) (list move))
?: =(~ q.vud) [~ ~] ?: =(~ q.vud) [~ ~]
=+ sud=(sump (slot 2 vud)) =+ sud=(sump (slot 2 vud))

12
main/app/rodeo/core.hook
View File

@ -32,7 +32,7 @@
[%exp p=@t q=tank] :: [%exp p=@t q=tank] ::
[%say p=@t] :: [%say p=@t] ::
== == == :: == == == ::
++ story :: a conversation ++ story :: wire content
$: count=@ud :: (lent grams) $: count=@ud :: (lent grams)
grams=(list telegram) :: all history grams=(list telegram) :: all history
locals=(map ship (pair ,@da status)) :: local presence locals=(map ship (pair ,@da status)) :: local presence
@ -91,7 +91,8 @@
|_ [ost=bone moves=(list move)] |_ [ost=bone moves=(list move)]
++ ra-abet :: resolve core ++ ra-abet :: resolve core
^- [(list move) _+>] ^- [(list move) _+>]
[(flop moves) +>] :: [(flop moves) +>] :: XX return when order is correct
[moves +>]
:: ::
++ ra-emil :: ra-emit move list ++ ra-emil :: ra-emit move list
|= mol=(list move) |= mol=(list move)
@ -549,14 +550,15 @@
++ pa-start :: start stream ++ pa-start :: start stream
|= riv=river |= riv=river
^+ +> ^+ +>
=- =. +>.$ (pa-sauce ost [[%rust %rodeo-report %grams q.lab r.lab] ~]) =- ~& [%pa-start riv lab]
=. +>.$ (pa-sauce ost [[%rust %rodeo-report %grams q.lab r.lab] ~])
?: p.lab ?: p.lab
(pa-sauce ost [[%mean ~] ~]) (pa-sauce ost [[%mean ~] ~])
+>.$(guests (~(put by guests) ost riv)) +>.$(guests (~(put by guests) ost riv))
^= lab ^= lab
=+ [end=count gaz=grams dun=| zeg=*(list telegram)] =+ [end=count gaz=grams dun=| zeg=*(list telegram)]
|- ^- (trel ,? ,@ud (list telegram)) |- ^- (trel ,? ,@ud (list telegram))
?~ gaz [dun end (flop zeg)] ?~ gaz [dun end zeg]
?: ?- -.q.riv :: after the end ?: ?- -.q.riv :: after the end
%ud (lte p.q.riv end) %ud (lte p.q.riv end)
%da (lte p.q.riv p.r.q.i.gaz) %da (lte p.q.riv p.r.q.i.gaz)
@ -566,7 +568,7 @@
%ud (lth end p.p.riv) %ud (lth end p.p.riv)
%da (lth p.r.q.i.gaz p.p.riv) %da (lth p.r.q.i.gaz p.p.riv)
== ==
[dun end (flop zeg)] [dun end zeg]
$(end (dec end), gaz t.gaz, zeg [i.gaz zeg]) $(end (dec end), gaz t.gaz, zeg [i.gaz zeg])
:: ::
++ pa-listen :: subscribe ++ pa-listen :: subscribe

10
main/sur/rodeo/core.hook
View File

@ -34,10 +34,11 @@
++ presence ?(%gone %hear %talk) :: status type ++ presence ?(%gone %hear %talk) :: status type
++ register (pair atlas (map station atlas)) :: ping me, ping srcs ++ register (pair atlas (map station atlas)) :: ping me, ping srcs
++ report :: unified rush/rust ++ report :: unified rush/rust
$% [%house (set span)] :: meta-changes $% [%config config] :: reconfigure
:: [%folder (list report)] :: multiple
[%grams (pair ,@ud (list telegram))] :: beginning, thoughts [%grams (pair ,@ud (list telegram))] :: beginning, thoughts
[%group register] :: presence [%group register] :: presence
[%config config] :: reconfigure [%house (set span)] :: station set
== :: == ::
++ speech :: narrative action ++ speech :: narrative action
:: XX unify %own and %say to %lin :: XX unify %own and %say to %lin
@ -45,7 +46,7 @@
$% [%lan p=span q=@t] :: local announce $% [%lan p=span q=@t] :: local announce
[%own p=@t] :: XX @ or /me [%own p=@t] :: XX @ or /me
[%exp p=@t] :: hoon line [%exp p=@t] :: hoon line
[%non ~] :: no content [%non ~] :: no content (yo)
[%ext p=@tas q=*] :: extended action [%ext p=@tas q=*] :: extended action
[%fat p=torso q=speech] :: attachment [%fat p=torso q=speech] :: attachment
:: [%inv p=station] :: invite to station :: [%inv p=station] :: invite to station
@ -61,7 +62,8 @@
++ telegram (pair ship thought) :: who which whom what ++ telegram (pair ship thought) :: who which whom what
++ thought (trel serial audience statement) :: which whom what ++ thought (trel serial audience statement) :: which whom what
++ torso :: attachment ++ torso :: attachment
$% [%text (list ,@t)] :: text lines $% [%name (pair ,@t torso)] :: named attachment
[%text (list ,@t)] :: text lines
[%tank (list tank)] :: tank list [%tank (list tank)] :: tank list
== :: == ::
:: markdown :: markdown