Merge branch 'master' into test

Conflicts:
	urb/urbit.pill
This commit is contained in:
Galen Wolfe-Pauly 2015-05-19 10:17:37 -07:00
commit 12769cba88
10 changed files with 128 additions and 48 deletions

View File

@ -74,6 +74,10 @@
|= [from hood-init] |= [from hood-init]
(ably (poke-init:(helm-work [hid +<-] (able %helm)) +<+)) (ably (poke-init:(helm-work [hid +<-] (able %helm)) +<+))
:: ::
++ poke-hood-mass ::
|= [from ~]
(ably poke-mass:(helm-work [hid +<-] (able %helm)))
::
++ poke-hood-merge :: ++ poke-hood-merge ::
|= [from hood-merge] |= [from hood-merge]
(ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+)) (ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+))
@ -118,6 +122,10 @@
|= [then @uvH (each gage tang)] |= [then @uvH (each gage tang)]
(ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+)) (ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+))
:: ::
++ init-helm ::
|= [then *]
[~ +>]
::
++ note-helm :: ++ note-helm ::
|= [then (pair ,@tD tank)] |= [then (pair ,@tD tank)]
(ably (take-note:(helm-work [hid ost src] (able %helm)) way +<+)) (ably (take-note:(helm-work [hid ost src] (able %helm)) way +<+))

View File

@ -1,11 +1,11 @@
:: ::::::::::::::: :: :: ::
:::: /hook/core/octo/ape :: :: :: build :::: /hook/core/acto/ape :: :: dependencies
:: ::::::::::::::: :: :: ::
/- *sole :: structures /- *sole :: structures
/+ sole :: libraries /+ sole :: libraries
:: ::::::::::::::: :: :: ::
:::: :: :: :: logic :::: :: :: structures
!: ::::::::::::::: !: :: ::
=> |% :: board logic => |% :: board logic
++ board ,@ :: one-player bitfield ++ board ,@ :: one-player bitfield
++ point ,[x=@ y=@] :: coordinate ++ point ,[x=@ y=@] :: coordinate
@ -43,9 +43,9 @@
++ tab ~["+ 1 2 3" (row 0) (row 1) (row 2)] :: print table ++ tab ~["+ 1 2 3" (row 0) (row 1) (row 2)] :: print table
-- :: -- ::
-- :: -- ::
:: ::::::::::::::: :: :: ::
:::: :: :: :: agent :::: :: :: server
:: ::::::::::::::: :: :: ::
=> |% :: arvo structures => |% :: arvo structures
++ axle ,[%1 eye=face but=tube gam=game] :: agent state ++ axle ,[%1 eye=face but=tube gam=game] :: agent state
++ axon $?(axle [%0 eye=face gam=game]) :: historical state ++ axon $?(axle [%0 eye=face gam=game]) :: historical state
@ -146,17 +146,16 @@
?^ but (park %2 ~) :: [~ %& !who src] ?^ but (park %2 ~) :: [~ %& !who src]
(park:(link src !who) %2 `"link by {<src>}") :: (park:(link src !who) %2 `"link by {<src>}") ::
++ peer-sole :: console subscribe ++ peer-sole :: console subscribe
|= [from *] =< abet :: |= [from pax=path] =< abet ::
(plow:(fret +<-) %2 ~) :: (plow:(fret +<-) %2 ~) ::
++ poke-sole-action :: console input ++ poke-sole-action :: console input
|= [from act=sole-action] =< abet :: |= [from act=sole-action] =< abet ::
(work:(flet +<-) act) :: (work:(flet +<-) act) ::
++ poke-octo-move ++ poke-octo-move ::
|= [from wha=point] =< abet |= [from wha=point] =< abet ::
=^ dud gam ~(m ~(at go gam) wha) =^ dud gam ~(m ~(at go gam) wha) ::
?> dud ?> dud =+ mus=~(res go gam) ::
=+ mus=~(res go gam) :: (park(gam ?^(mus *game gam)) %2 mus) ::
(park(gam ?^(mus *game gam)) %2 mus)
++ prep |= [from old=(unit ,[(list move) axon])] :: initialize ++ prep |= [from old=(unit ,[(list move) axon])] :: initialize
=< abet ?~ old +> :: =< abet ?~ old +> ::
=< (park %2 ~) :: =< (park %2 ~) ::

View File

@ -237,8 +237,8 @@
^- tape ^- tape
=+ ^= rew ^- (pair (pair ,@t ,@t) (set partner)) =+ ^= rew ^- (pair (pair ,@t ,@t) (set partner))
?~ active.she ?~ active.she
[['(' ')'] passive.she] [[')' '('] passive.she]
[['[' ']'] u.active.she] [[']' '['] u.active.she]
=+ por=~(te-prom te man.she q.rew) =+ por=~(te-prom te man.she q.rew)
(weld `tape`[p.p.rew por] `tape`[q.p.rew ' ' ~]) (weld `tape`[p.p.rew por] `tape`[q.p.rew ' ' ~])
:: ::

View File

@ -106,7 +106,7 @@
=+ pals |- ^+ +>.^$ ?~ +< +>.^$ :: =+ pals |- ^+ +>.^$ ?~ +< +>.^$ ::
$(+< t.+<, +>.^$ (~(plow et i.+<) lev mus)) :: $(+< t.+<, +>.^$ (~(plow et i.+<) lev mus)) ::
:: :: :: :: :: ::
:::: :: :: hooks :::: :: :: events
:: :: :: :: :: ::
++ peer-sole :: console subscribe ++ peer-sole :: console subscribe
|= [from *] =< abet :: |= [from *] =< abet ::

View File

@ -6,11 +6,26 @@
++ gill (pair ship term) :: general contact ++ gill (pair ship term) :: general contact
-- :: -- ::
=> |% :: console protocol => |% :: console protocol
++ axle :: all dill state ++ all-axle ?(old-axle axle) ::
++ old-axle :: all dill state
$: %2 :: $: %2 ::
ore=(unit ship) :: identity once set ore=(unit ship) :: identity once set
hey=(unit duct) :: default duct hey=(unit duct) :: default duct
dug=(map duct axon) :: conversations dug=(map duct axon) :: conversations
== ::
++ axle ::
$: %3 ::
ore=(unit ship) :: identity once set
hey=(unit duct) :: default duct
dug=(map duct axon) :: conversations
$= hef :: other weights
$: a=(unit mass) ::
c=(unit mass) ::
e=(unit mass) ::
f=(unit mass) ::
g=(unit mass) ::
t=(unit mass) ::
== ::
== :: == ::
++ axon :: dill per duct ++ axon :: dill per duct
$: ram=term :: console program $: ram=term :: console program
@ -22,24 +37,7 @@
-- => :: -- => ::
|% :: protocol below |% :: protocol below
++ gift gift-dill :: out result <-$ ++ gift gift-dill :: out result <-$
++ kiss :: in request ->$ ++ kiss kiss-dill :: in request ->$
$% [%belt p=belt] :: terminal input
[%blew p=blew] :: terminal config
[%boot p=*] :: weird %dill boot
[%crud p=@tas q=(list tank)] :: error with trace
[%flog p=flog] :: wrapped error
[%flow p=@tas q=(list gill)] :: terminal config
[%hail ~] :: terminal refresh
[%hook ~] :: this term hung up
[%harm ~] :: all terms hung up
[%init p=ship] :: after gall ready
[%noop ~] :: no operation
[%talk p=tank] ::
[%text p=tape] ::
[%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path
[%verb ~] :: verbose mode
== ::
-- => :: -- => ::
|% :: protocol outward |% :: protocol outward
++ mess :: ++ mess ::
@ -63,6 +61,7 @@
== :: == ::
++ note-dill :: note to self, odd ++ note-dill :: note to self, odd
$% [%crud p=@tas q=(list tank)] :: $% [%crud p=@tas q=(list tank)] ::
[%heft ~] ::
[%init p=ship] :: [%init p=ship] ::
[%text p=tape] :: [%text p=tape] ::
[%veer p=@ta q=path r=@t] :: install vane [%veer p=@ta q=path r=@t] :: install vane
@ -74,11 +73,12 @@
[%deal p=sock q=cush] :: [%deal p=sock q=cush] ::
== :: == ::
++ note :: out request $-> ++ note :: out request $->
$? [?(%a %c %e %f %g %t) %wegh ~] ::
$% [%a note-ames] :: $% [%a note-ames] ::
[%c note-clay] :: [%c note-clay] ::
[%d note-dill] :: [%d note-dill] ::
[%g note-gall] :: [%g note-gall] ::
== :: == == ::
++ riff ,[p=desk q=(unit rave)] :: see %clay ++ riff ,[p=desk q=(unit rave)] :: see %clay
++ sign-ames :: ++ sign-ames ::
$% [%nice ~] :: $% [%nice ~] ::
@ -103,12 +103,13 @@
$% [%wake ~] :: $% [%wake ~] ::
== :: == ::
++ sign :: in result $<- ++ sign :: in result $<-
$? [?(%a %c %e %f %g %t) %mass p=mass] ::
$% [%a sign-ames] :: $% [%a sign-ames] ::
[%c sign-clay] :: [%c sign-clay] ::
[%d sign-dill] :: [%d sign-dill] ::
[%g sign-gall] :: [%g sign-gall] ::
[%t sign-time] :: [%t sign-time] ::
== :: == == ::
:::::::: :: dill tiles :::::::: :: dill tiles
-- --
=| all=axle =| all=axle
@ -134,6 +135,7 @@
%crud :: (send `dill-belt`[%cru p.kyz q.kyz]) %crud :: (send `dill-belt`[%cru p.kyz q.kyz])
(crud p.kyz q.kyz) (crud p.kyz q.kyz)
%blew (send %rez p.p.kyz q.p.kyz) %blew (send %rez p.p.kyz q.p.kyz)
%heft heft
%veer (dump kyz) %veer (dump kyz)
%vega (dump kyz) %vega (dump kyz)
%verb (dump kyz) %verb (dump kyz)
@ -179,6 +181,19 @@
(dump %logo ~) (dump %logo ~)
(done %blit [bit ~]) (done %blit [bit ~])
:: ::
++ heft
%_ .
moz
:* [hen %pass /heft/ames %a %wegh ~]
[hen %pass /heft/clay %c %wegh ~]
[hen %pass /heft/eyre %e %wegh ~]
[hen %pass /heft/ford %f %wegh ~]
[hen %pass /heft/gall %g %wegh ~]
[hen %pass /heft/time %t %wegh ~]
moz
==
==
::
++ init :: initialize ++ init :: initialize
~& [%dill-init our ram] ~& [%dill-init our ram]
=+ myt=(flop (need tem)) =+ myt=(flop (need tem))
@ -227,6 +242,9 @@
|= sih=sign |= sih=sign
^+ +> ^+ +>
?- sih ?- sih
[?(%a %c %e %f %g %t) %mass *]
(wegt -.sih p.sih)
::
[%a %nice *] [%a %nice *]
:: ~& [%take-nice-ames sih] :: ~& [%take-nice-ames sih]
+> +>
@ -274,6 +292,38 @@
:: ~& %dill-wake :: ~& %dill-wake
+> +>
== ==
::
++ wegh
^- mass
:- %dill
:- %|
:~ all/`[ore hey dug]:all
==
::
++ wegt
|= [lal=?(%a %c %e %f %g %t) mas=mass]
^+ +>
=. hef.all
?- lal
%a ~?(?=(^ a.hef.all) %double-mass-a hef.all(a `mas))
%c ~?(?=(^ c.hef.all) %double-mass-c hef.all(c `mas))
%e ~?(?=(^ e.hef.all) %double-mass-e hef.all(e `mas))
%f ~?(?=(^ f.hef.all) %double-mass-f hef.all(f `mas))
%g ~?(?=(^ g.hef.all) %double-mass-g hef.all(g `mas))
%t ~?(?=(^ t.hef.all) %double-mass-t hef.all(t `mas))
==
?. ?& ?=(^ a.hef.all)
?=(^ c.hef.all)
?=(^ e.hef.all)
?=(^ f.hef.all)
?=(^ g.hef.all)
?=(^ t.hef.all)
==
+>.$
%+ done(hef.all [~ ~ ~ ~ ~ ~])
%mass
=> [hef.all d=wegh]
[%vanes %| ~[u.a u.c d u.e u.f u.g u.t]]
-- --
:: ::
++ ax :: make ++as ++ ax :: make ++as
@ -317,6 +367,8 @@
?: ?=([%crud %hax-init [%leaf *] ~] p.q.hic) ?: ?=([%crud %hax-init [%leaf *] ~] p.q.hic)
=+ him=(slav %p (crip p.i.q.p.q.hic)) =+ him=(slav %p (crip p.i.q.p.q.hic))
:_(..^$ ?~(hey.all ~ [u.hey.all %give %init him]~)) :_(..^$ ?~(hey.all ~ [u.hey.all %give %init him]~))
?: ?=([%crud %hax-heft ~] p.q.hic)
:_(..^$ ?~(hey.all ~ [u.hey.all %slip %d %heft ~]~))
:_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~)) :_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~))
=. hey.all ?^(hey.all hey.all `hen) =. hey.all ?^(hey.all hey.all `hen)
?: ?=(%init -.q.hic) ?: ?=(%init -.q.hic)
@ -342,7 +394,9 @@
~ ~
:: ::
++ load :: trivial ++ load :: trivial
|= old=axle |= old=all-axle
?: ?=(%2 -.old)
$(old [%3 ore hey dug ~ ~ ~ ~ ~ ~]:old)
..^$(all old) ..^$(all old)
:: |= old=* :: diable :: |= old=* :: diable
:: ..^$(ore.all `~zod) :: ..^$(ore.all `~zod)
@ -375,4 +429,3 @@
[moz ..^$] [moz ..^$]
-- --
:: good test

View File

@ -1035,6 +1035,14 @@
=+ mes=((hard ,[@ud roon]) r.q.hic) =+ mes=((hard ,[@ud roon]) r.q.hic)
=< mo-abet =< mo-abet
(mo-gawd:(mo-abed:mo our hen) him dap mes) (mo-gawd:(mo-abed:mo our hen) him dap mes)
::
%wegh
:_ ..^$ :_ ~
:^ hen %give %mass
:- %gall
:- %|
:~ all/`all
==
== ==
:: ::
++ doze :: sleep until ++ doze :: sleep until

View File

@ -2366,6 +2366,7 @@
== :: == ::
++ flog :: sent to %dill ++ flog :: sent to %dill
$% [%crud p=@tas q=(list tank)] :: $% [%crud p=@tas q=(list tank)] ::
[%heft ~] ::
[%text p=tape] :: [%text p=tape] ::
[%veer p=@ta q=path r=@t] :: install vane [%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path [%vega p=path] :: reboot by path
@ -2378,6 +2379,7 @@
[%blit p=(list blit)] :: terminal output [%blit p=(list blit)] :: terminal output
[%init p=@p] :: set owner [%init p=@p] :: set owner
[%logo ~] :: logout [%logo ~] :: logout
[%mass p=mass] :: memory usage
[%veer p=@ta q=path r=@t] :: install vane [%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path [%vega p=path] :: reboot by path
[%verb ~] :: verbose mode [%verb ~] :: verbose mode
@ -2390,6 +2392,7 @@
[%flog p=flog] :: wrapped error [%flog p=flog] :: wrapped error
[%flow p=@tas q=(list gill)] :: terminal config [%flow p=@tas q=(list gill)] :: terminal config
[%hail ~] :: terminal refresh [%hail ~] :: terminal refresh
[%heft ~] :: memory report
[%hook ~] :: this term hung up [%hook ~] :: this term hung up
[%harm ~] :: all terms hung up [%harm ~] :: all terms hung up
[%init p=ship] :: after gall ready [%init p=ship] :: after gall ready
@ -2522,7 +2525,7 @@
++ cush (pair term club) :: internal kiss ++ cush (pair term club) :: internal kiss
++ dude term :: server identity ++ dude term :: server identity
++ scup (pair ship desk) :: autoupdate ++ scup (pair ship desk) :: autoupdate
++ well (pair desk term) ++ well (pair desk term) ::
++ suss (trel dude ,@tas ,@da) :: config report ++ suss (trel dude ,@tas ,@da) :: config report
:::: :: :::: ::
++ kiss-gall :: incoming request ++ kiss-gall :: incoming request
@ -2531,9 +2534,11 @@
[%deal p=sock q=cush] :: full transmission [%deal p=sock q=cush] :: full transmission
[%rote p=sack q=path r=*] :: remote request [%rote p=sack q=path r=*] :: remote request
[%roth p=sack q=path r=*] :: remote response [%roth p=sack q=path r=*] :: remote response
[%wegh ~] :: report memory
== :: == ::
++ gift-gall :: outgoing result ++ gift-gall :: outgoing result
$% [%onto p=(each suss tang)] :: about agent $% [%mass p=mass] :: memory usage
[%onto p=(each suss tang)] :: about agent
[%unto p=cuft] :: within agent [%unto p=cuft] :: within agent
[%mack p=(unit tang)] :: message ack [%mack p=(unit tang)] :: message ack
== :: == ::

View File

@ -199,7 +199,7 @@
++ poke-start :: ++ poke-start ::
|= wel=well |= wel=well
=< se-abet =< se-view =< se-abet =< se-view
+>(ray (~(put in ray) wel)) (se-born wel)
:: ::
++ reap :: ++ reap ::
|= [way=wire saw=(unit tang)] |= [way=wire saw=(unit tang)]
@ -255,7 +255,7 @@
|- ^+ +> |- ^+ +>
?~ yar +> ?~ yar +>
=+ hig=(~(get by fur) q.i.yar) =+ hig=(~(get by fur) q.i.yar)
?: &(?=(^ hig) ?=(^ u.hig) =(p.i.yar syd.u.u.hig)) $(yar t.yar) ?: &(?=(^ hig) |(?=(~ u.hig) =(p.i.yar syd.u.u.hig))) $(yar t.yar)
%= $ %= $
yar t.yar yar t.yar
+> +>
@ -335,7 +335,7 @@
^+ +> ^+ +>
?: (~(has in ray) wel) ?: (~(has in ray) wel)
(se-text "[already running {<p.wel>}/{<q.wel>}]") (se-text "[already running {<p.wel>}/{<q.wel>}]")
+>(ray (~(put in ray) wel)) +>(ray (~(put in ray) wel), eel (~(put in eel) [our q.wel]))
:: ::
++ se-dump :: print tanks ++ se-dump :: print tanks
|= tac=(list tank) |= tac=(list tank)

View File

@ -77,6 +77,10 @@
|= him=ship =< abet |= him=ship =< abet
(emit %flog /helm %crud %hax-init leaf/(scow %p him) ~) (emit %flog /helm %crud %hax-init leaf/(scow %p him) ~)
:: ::
++ poke-mass
=< abet
(emit %flog /heft %crud %hax-heft ~)
::
++ poke-start :: start a server ++ poke-start :: start a server
|= hood-start =< abet |= hood-start =< abet
(emit %conf /helm [our dap] %load our syd) (emit %conf /helm [our dap] %load our syd)
@ -84,6 +88,7 @@
++ poke-reload :: reload vanes ++ poke-reload :: reload vanes
|= all=(list term) =< abet |= all=(list term) =< abet
%- emil %- emil
%- flop
%+ turn all %+ turn all
=+ ark=(arch .^(%cy /(scot %p our)/base/(scot %da lat)/arvo)) =+ ark=(arch .^(%cy /(scot %p our)/base/(scot %da lat)/arvo))
=+ van=(~(tap by r.ark)) =+ van=(~(tap by r.ark))

View File

@ -101,7 +101,9 @@
++ receive :: naturalize event ++ receive :: naturalize event
|= sole-change |= sole-change
^- [sole-edit sole-share] ^- [sole-edit sole-share]
?> &(=(his.ler his.ven) (lte own.ler own.ven)) ?. &(=(his.ler his.ven) (lte own.ler own.ven))
~& [%receive-sync his/[his.ler his.ven] own/[own.ler own.ven]]
!!
?> &(=(his.ler his.ven) (lte own.ler own.ven)) ?> &(=(his.ler his.ven) (lte own.ler own.ven))
?> |(!=(own.ler own.ven) =(0 haw) =(haw (sham buf))) ?> |(!=(own.ler own.ven) =(0 haw) =(haw (sham buf)))
=. leg (scag (sub own.ven own.ler) leg) =. leg (scag (sub own.ven own.ler) leg)