ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-07 07:30:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Before merging to update gall.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-05-27 19:00:53 -07:00
parent b50faa769b
commit fc07a7e44a
4 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
base/ape/octo/core.hook
View File

@ -37,7 +37,7 @@
++ ce :: per client ++ ce :: per client
|_ from :: |_ from ::
:: :: :: :: :: ::
:::: :: :: boilerplate :::: :: :: common logic
:: :: :: :: :: ::
++ abet [(flop moz) +>(moz ~)] :: resolve core ++ abet [(flop moz) +>(moz ~)] :: resolve core
++ dish |=(cad=card %_(+> moz [[ost cad] moz])) :: request ++ dish |=(cad=card %_(+> moz [[ost cad] moz])) :: request
@ -48,7 +48,7 @@
$(all t.all, +>.^$ (fun +>.^$)) :: $(all t.all, +>.^$ (fun +>.^$)) ::
++ emit |=(lime (dish %diff +<)) :: publish ++ emit |=(lime (dish %diff +<)) :: publish
:: :: :: :: :: ::
:::: :: :: server logic :::: :: :: custom logic
:: :: :: :: :: ::
++ fail ?:(soul (fect %bel ~) ~|(%invalid-move !!)) :: user error ++ fail ?:(soul (fect %bel ~) ~|(%invalid-move !!)) :: user error
++ fect |=(sole-effect (emit %sole-effect +<)) :: update console ++ fect |=(sole-effect (emit %sole-effect +<)) :: update console
@ -105,7 +105,7 @@
++ cusp (cope !ept:here) :: parsing rule ++ cusp (cope !ept:here) :: parsing rule
++ delt |= cal=sole-change :: edit command line ++ delt |= cal=sole-change :: edit command line
=^ cul say (~(remit cs say) cal good) :: =^ cul say (~(remit cs say) cal good) ::
?~(cul abet fail:(fect det/u.cul)) :: ?~(cul abet fail:(fect:abet det/u.cul)) ::
++ dive =+ (rust (tufa buf.say) (punt comb)) :: apply command line ++ dive =+ (rust (tufa buf.say) (punt comb)) :: apply command line
?~(- fail ?~(-> show (plot:wipe ->+))) :: ?~(- fail ?~(-> show (plot:wipe ->+))) ::
++ good |=((list ,@c) -:(rose (tufa +<) cusp)) :: validate input ++ good |=((list ,@c) -:(rose (tufa +<) cusp)) :: validate input
@ -124,12 +124,14 @@
|= [* saw=(unit)] :: |= [* saw=(unit)] ::
?~(saw +> (word "move failed")) :: ?~(saw +> (word "move failed")) ::
:: :: :: ::
++ diff-octo-game :: friend update ++ diff-octo-update :: friend update
|= [way=wire gam=game] :: |= [way=wire mex=(each game tape)] ::
?: =(^gam gam) +> :: ?- -.mex ::
wild(gam gam) :: | (word p.mex) ::
& ?:(=(gam p.mex) +> wild(gam p.mex)) ::
== ::
:: :: :: ::
++ peer-octo-net :: urbit peer ++ peer-octo :: urbit peer
|= pax=path :: |= pax=path ::
tame:meet :: tame:meet ::
:: :: :: ::
@ -143,11 +145,18 @@
:: :: :: ::
++ poke-octo-move :: ++ poke-octo-move ::
|= point :: |= point ::
(kick +<) :: wild:(kick +<) ::
:: :: :: ::
++ prep :: ++ prep ::
|= [old=(unit ,[(list move) axon])] :: initialize |= [old=(unit ,[(list move) axon])] :: initialize
+> ?-
=< abet ?~ old +> ::
=< (park %2 ~) ::
?- -.+>.old ::
%1 +>(+<+ u.old) ::
%0 !! ::
== ::
+> ::
:: ::
++ pull-octo :: unsubscribe ++ pull-octo :: unsubscribe
|= pax=path :: |= pax=path ::
@ -170,12 +179,12 @@
++ coup-octo :: move acknowledge ++ coup-octo :: move acknowledge
|= [then saw=(unit tang)] :: |= [then saw=(unit tang)] ::
abet:(~(coup-octo ce ost src) way saw) :: abet:(~(coup-octo ce ost src) way saw) ::
++ diff-octo-game :: friend update ++ diff-octo-update :: friend update
|= [then gam=game] :: |= [then mex=(each game tape)] ::
abet:(~(diff-octo-game ce ost src) way gam) :: abet:(~(diff-octo-update ce ost src) way mex) ::
++ peer-octo-net :: urbit peer ++ peer-octo :: urbit peer
|= [from path] :: |= [from path] ::
abet:(~(peer-octo-net ce +<-) +<+) :: abet:(~(peer-octo ce +<-) +<+) ::
++ peer-sole :: console subscribe ++ peer-sole :: console subscribe
|= [from path] :: |= [from path] ::
abet:(~(peer-sole ce +<-) +<+) :: abet:(~(peer-sole ce +<-) +<+) ::

21
base/arvo/gall.hoon
View File

@ -542,7 +542,7 @@
=+ cug=(ap-find [%diff p.cag +.pax]) =+ cug=(ap-find [%diff p.cag +.pax])
?~ cug ?~ cug
%. [| her +.pax] %. [| her +.pax]
ap-pump:(ap-lame %diff (ap-suck "diff: no {<`path`[p.cag pax]>}")) ap-pump:(ap-lame %diff (ap-suck "diff: no {<`path`[p.cag +.pax]>}"))
=+ ^= arg ^- vase =+ ^= arg ^- vase
%- slop %- slop
?: =(0 p.u.cug) ?: =(0 p.u.cug)
@ -614,6 +614,25 @@
^+ +> ^+ +>
+>(zip :_(zip [ost %give cit])) +>(zip :_(zip [ost %give cit]))
:: ::
++ ap-bowl :: set up bowl
%_ .
+12.q.hav
^- bowl
:* :* our :: host
q.q.pry :: guest
dap :: agent
== ::
:* wex=~ :: outgoing
sup=sup.ged :: incoming
== ::
:* ost=ost :: cause
act=act.tyc :: tick
eny=eny.tyc :: nonce
now=lat.tyc :: time
byk=[p.pup q.pup [%da lat.tyc]] :: source
== == ::
==
::
++ ap-hide :: set up hide ++ ap-hide :: set up hide
%_ . %_ .
+12.q.hav +12.q.hav

19
base/arvo/zuse.hoon
View File

@ -1818,12 +1818,13 @@
lys=@da :: last sent lys=@da :: last sent
pac=rock :: packet data pac=rock :: packet data
== :: == ::
++ bitt (map bone (pair ship path)) :: outgoing subs
++ blob :: fs blob ++ blob :: fs blob
$% [%delta p=lobe q=[p=mark q=lobe] r=page] :: delta on q $% [%delta p=lobe q=[p=mark q=lobe] r=page] :: delta on q
[%direct p=lobe q=page] :: immediate [%direct p=lobe q=page] :: immediate
[%indirect p=lobe q=page r=lobe s=page] :: both [%indirect p=lobe q=page r=lobe s=page] :: both
== :: == ::
++ boat ,[(list slip) tart] :: user stage ++ boat (map (pair bone wire) (trel bean ship path)) :: outgoing subs
++ boon :: fort output ++ boon :: fort output
$% [%beer p=ship q=@uvG] :: gained ownership $% [%beer p=ship q=@uvG] :: gained ownership
[%cake p=sock q=soap r=coop s=duct] :: e2e message result [%cake p=sock q=soap r=coop s=duct] :: e2e message result
@ -1834,7 +1835,20 @@
[%ouzo p=lane q=rock] :: transmit packet [%ouzo p=lane q=rock] :: transmit packet
[%wine p=sock q=tape] :: notify user [%wine p=sock q=tape] :: notify user
== :: == ::
++ bowl ,[p=(list gift) q=(unit boat)] :: app product ++ bowl :: standard app state
$: $: our=ship :: host
src=ship :: guest
dap=term :: agent
== ::
$: wex=boat :: outgoing subs
sup=bitt :: incoming subs
== ::
$: ost=bone :: opaque cause
act=@ud :: change number
eny=@uvI :: entropy
now=@da :: current time
byk=beak :: load source
== == ::
++ bray ,[p=life q=(unit life) r=ship s=@da] :: our parent us now ++ bray ,[p=life q=(unit life) r=ship s=@da] :: our parent us now
++ brow ,[p=@da q=@tas] :: browser version ++ brow ,[p=@da q=@tas] :: browser version
++ buck ,[p=mace q=will] :: all security data ++ buck ,[p=mace q=will] :: all security data
@ -2236,7 +2250,6 @@
++ step ,[p=bray q=gens r=pass] :: identity stage ++ step ,[p=bray q=gens r=pass] :: identity stage
++ suba ,[p=cart q=(list ,[p=path q=misu])] :: delta ++ suba ,[p=cart q=(list ,[p=path q=misu])] :: delta
++ tako ,@ :: yaki ref ++ tako ,@ :: yaki ref
++ tart $+([@da path note] bowl) :: process core
++ tick ,@ud :: process id ++ tick ,@ud :: process id
++ toro ,[p=@ta q=nori] :: general change ++ toro ,[p=@ta q=nori] :: general change
++ town :: all security state ++ town :: all security state

14
base/mar/octo-update/door.hook
View File

@ -16,16 +16,16 @@
|% |%
++ json ^- ^json :: to %json ++ json ^- ^json :: to %json
?- +>-< ?- +>-<
| s/(crip +>->) | s/(crip p)
& &
=+ she=|=(ship s/(scot %p +<)) =+ she=|=(ship s/(scot %p +<))
%- jobe %- jobe
:~ who/s/?:(who %x %o) :~ who/s/?:(who.p %x %o)
plx/?~(p.sag ~ (she u.p.sag)) plx/?~(p.sag.p ~ (she u.p.sag.p))
plo/?~(q.sag ~ (she u.q.sag)) plo/?~(q.sag.p ~ (she u.q.sag.p))
aud/a/(turn (~(tap by aud)) she) aud/a/(turn (~(tap by aud.p)) she)
box/~(jon bo box) box/~(jon bo box.p)
boo/~(jon bo boo) boo/~(jon bo boo.p)
== ==
== ==
-- --