mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-16 10:49:26 +03:00
Merge branch 'master' into test
Conflicts: urb/urbit.pill
This commit is contained in:
Galen Wolfe-Pauly
commit
12769cba88
@ -74,6 +74,10 @@
|
||||
|= [from hood-init]
|
||||
(ably (poke-init:(helm-work [hid +<-] (able %helm)) +<+))
|
||||
::
|
||||
++ poke-hood-mass ::
|
||||
|= [from ~]
|
||||
(ably poke-mass:(helm-work [hid +<-] (able %helm)))
|
||||
::
|
||||
++ poke-hood-merge ::
|
||||
|= [from hood-merge]
|
||||
(ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+))
|
||||
@ -118,6 +122,10 @@
|
||||
|= [then @uvH (each gage tang)]
|
||||
(ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+))
|
||||
::
|
||||
++ init-helm ::
|
||||
|= [then *]
|
||||
[~ +>]
|
||||
::
|
||||
++ note-helm ::
|
||||
|= [then (pair ,@tD tank)]
|
||||
(ably (take-note:(helm-work [hid ost src] (able %helm)) way +<+))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
:: :::::::::::::::
|
||||
:::: /hook/core/octo/ape :: :: :: build
|
||||
:: :::::::::::::::
|
||||
:: :: ::
|
||||
:::: /hook/core/acto/ape :: :: dependencies
|
||||
:: :: ::
|
||||
/- *sole :: structures
|
||||
/+ sole :: libraries
|
||||
:: :::::::::::::::
|
||||
:::: :: :: :: logic
|
||||
!: :::::::::::::::
|
||||
:: :: ::
|
||||
:::: :: :: structures
|
||||
!: :: ::
|
||||
=> |% :: board logic
|
||||
++ board ,@ :: one-player bitfield
|
||||
++ point ,[x=@ y=@] :: coordinate
|
||||
@ -43,9 +43,9 @@
|
||||
++ tab ~["+ 1 2 3" (row 0) (row 1) (row 2)] :: print table
|
||||
-- ::
|
||||
-- ::
|
||||
:: :::::::::::::::
|
||||
:::: :: :: :: agent
|
||||
:: :::::::::::::::
|
||||
:: :: ::
|
||||
:::: :: :: server
|
||||
:: :: ::
|
||||
=> |% :: arvo structures
|
||||
++ axle ,[%1 eye=face but=tube gam=game] :: agent state
|
||||
++ axon $?(axle [%0 eye=face gam=game]) :: historical state
|
||||
@ -146,17 +146,16 @@
|
||||
?^ but (park %2 ~) :: [~ %& !who src]
|
||||
(park:(link src !who) %2 `"link by {<src>}") ::
|
||||
++ peer-sole :: console subscribe
|
||||
|= [from *] =< abet ::
|
||||
|= [from pax=path] =< abet ::
|
||||
(plow:(fret +<-) %2 ~) ::
|
||||
++ poke-sole-action :: console input
|
||||
|= [from act=sole-action] =< abet ::
|
||||
(work:(flet +<-) act) ::
|
||||
++ poke-octo-move
|
||||
|= [from wha=point] =< abet
|
||||
=^ dud gam ~(m ~(at go gam) wha)
|
||||
?> dud
|
||||
=+ mus=~(res go gam) ::
|
||||
(park(gam ?^(mus *game gam)) %2 mus)
|
||||
++ poke-octo-move ::
|
||||
|= [from wha=point] =< abet ::
|
||||
=^ dud gam ~(m ~(at go gam) wha) ::
|
||||
?> dud =+ mus=~(res go gam) ::
|
||||
(park(gam ?^(mus *game gam)) %2 mus) ::
|
||||
++ prep |= [from old=(unit ,[(list move) axon])] :: initialize
|
||||
=< abet ?~ old +> ::
|
||||
=< (park %2 ~) ::
|
||||
|
||||
@ -237,8 +237,8 @@
|
||||
^- tape
|
||||
=+ ^= rew ^- (pair (pair ,@t ,@t) (set partner))
|
||||
?~ active.she
|
||||
[['(' ')'] passive.she]
|
||||
[['[' ']'] u.active.she]
|
||||
[[')' '('] passive.she]
|
||||
[[']' '['] u.active.she]
|
||||
=+ por=~(te-prom te man.she q.rew)
|
||||
(weld `tape`[p.p.rew por] `tape`[q.p.rew ' ' ~])
|
||||
::
|
||||
|
||||
@ -106,7 +106,7 @@
|
||||
=+ pals |- ^+ +>.^$ ?~ +< +>.^$ ::
|
||||
$(+< t.+<, +>.^$ (~(plow et i.+<) lev mus)) ::
|
||||
:: :: ::
|
||||
:::: :: :: hooks
|
||||
:::: :: :: events
|
||||
:: :: ::
|
||||
++ peer-sole :: console subscribe
|
||||
|= [from *] =< abet ::
|
||||
|
||||
@ -6,12 +6,27 @@
|
||||
++ gill (pair ship term) :: general contact
|
||||
-- ::
|
||||
=> |% :: console protocol
|
||||
++ axle :: all dill state
|
||||
++ all-axle ?(old-axle axle) ::
|
||||
++ old-axle :: all dill state
|
||||
$: %2 ::
|
||||
ore=(unit ship) :: identity once set
|
||||
hey=(unit duct) :: default duct
|
||||
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
|
||||
$: ram=term :: console program
|
||||
tem=(unit (list dill-belt)) :: pending, reverse
|
||||
@ -22,24 +37,7 @@
|
||||
-- => ::
|
||||
|% :: protocol below
|
||||
++ gift gift-dill :: out result <-$
|
||||
++ kiss :: 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
|
||||
== ::
|
||||
++ kiss kiss-dill :: in request ->$
|
||||
-- => ::
|
||||
|% :: protocol outward
|
||||
++ mess ::
|
||||
@ -63,6 +61,7 @@
|
||||
== ::
|
||||
++ note-dill :: note to self, odd
|
||||
$% [%crud p=@tas q=(list tank)] ::
|
||||
[%heft ~] ::
|
||||
[%init p=ship] ::
|
||||
[%text p=tape] ::
|
||||
[%veer p=@ta q=path r=@t] :: install vane
|
||||
@ -74,11 +73,12 @@
|
||||
[%deal p=sock q=cush] ::
|
||||
== ::
|
||||
++ note :: out request $->
|
||||
$? [?(%a %c %e %f %g %t) %wegh ~] ::
|
||||
$% [%a note-ames] ::
|
||||
[%c note-clay] ::
|
||||
[%d note-dill] ::
|
||||
[%g note-gall] ::
|
||||
== ::
|
||||
== == ::
|
||||
++ riff ,[p=desk q=(unit rave)] :: see %clay
|
||||
++ sign-ames ::
|
||||
$% [%nice ~] ::
|
||||
@ -103,12 +103,13 @@
|
||||
$% [%wake ~] ::
|
||||
== ::
|
||||
++ sign :: in result $<-
|
||||
$? [?(%a %c %e %f %g %t) %mass p=mass] ::
|
||||
$% [%a sign-ames] ::
|
||||
[%c sign-clay] ::
|
||||
[%d sign-dill] ::
|
||||
[%g sign-gall] ::
|
||||
[%t sign-time] ::
|
||||
== ::
|
||||
== == ::
|
||||
:::::::: :: dill tiles
|
||||
--
|
||||
=| all=axle
|
||||
@ -134,6 +135,7 @@
|
||||
%crud :: (send `dill-belt`[%cru p.kyz q.kyz])
|
||||
(crud p.kyz q.kyz)
|
||||
%blew (send %rez p.p.kyz q.p.kyz)
|
||||
%heft heft
|
||||
%veer (dump kyz)
|
||||
%vega (dump kyz)
|
||||
%verb (dump kyz)
|
||||
@ -179,6 +181,19 @@
|
||||
(dump %logo ~)
|
||||
(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
|
||||
~& [%dill-init our ram]
|
||||
=+ myt=(flop (need tem))
|
||||
@ -227,6 +242,9 @@
|
||||
|= sih=sign
|
||||
^+ +>
|
||||
?- sih
|
||||
[?(%a %c %e %f %g %t) %mass *]
|
||||
(wegt -.sih p.sih)
|
||||
::
|
||||
[%a %nice *]
|
||||
:: ~& [%take-nice-ames sih]
|
||||
+>
|
||||
@ -274,6 +292,38 @@
|
||||
:: ~& %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
|
||||
@ -317,6 +367,8 @@
|
||||
?: ?=([%crud %hax-init [%leaf *] ~] p.q.hic)
|
||||
=+ him=(slav %p (crip p.i.q.p.q.hic))
|
||||
:_(..^$ ?~(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 ?^(hey.all hey.all `hen)
|
||||
?: ?=(%init -.q.hic)
|
||||
@ -342,7 +394,9 @@
|
||||
~
|
||||
::
|
||||
++ load :: trivial
|
||||
|= old=axle
|
||||
|= old=all-axle
|
||||
?: ?=(%2 -.old)
|
||||
$(old [%3 ore hey dug ~ ~ ~ ~ ~ ~]:old)
|
||||
..^$(all old)
|
||||
:: |= old=* :: diable
|
||||
:: ..^$(ore.all `~zod)
|
||||
@ -375,4 +429,3 @@
|
||||
[moz ..^$]
|
||||
--
|
||||
|
||||
:: good test
|
||||
|
||||
@ -1035,6 +1035,14 @@
|
||||
=+ mes=((hard ,[@ud roon]) r.q.hic)
|
||||
=< mo-abet
|
||||
(mo-gawd:(mo-abed:mo our hen) him dap mes)
|
||||
::
|
||||
%wegh
|
||||
:_ ..^$ :_ ~
|
||||
:^ hen %give %mass
|
||||
:- %gall
|
||||
:- %|
|
||||
:~ all/`all
|
||||
==
|
||||
==
|
||||
::
|
||||
++ doze :: sleep until
|
||||
|
||||
@ -2366,6 +2366,7 @@
|
||||
== ::
|
||||
++ flog :: sent to %dill
|
||||
$% [%crud p=@tas q=(list tank)] ::
|
||||
[%heft ~] ::
|
||||
[%text p=tape] ::
|
||||
[%veer p=@ta q=path r=@t] :: install vane
|
||||
[%vega p=path] :: reboot by path
|
||||
@ -2378,6 +2379,7 @@
|
||||
[%blit p=(list blit)] :: terminal output
|
||||
[%init p=@p] :: set owner
|
||||
[%logo ~] :: logout
|
||||
[%mass p=mass] :: memory usage
|
||||
[%veer p=@ta q=path r=@t] :: install vane
|
||||
[%vega p=path] :: reboot by path
|
||||
[%verb ~] :: verbose mode
|
||||
@ -2390,6 +2392,7 @@
|
||||
[%flog p=flog] :: wrapped error
|
||||
[%flow p=@tas q=(list gill)] :: terminal config
|
||||
[%hail ~] :: terminal refresh
|
||||
[%heft ~] :: memory report
|
||||
[%hook ~] :: this term hung up
|
||||
[%harm ~] :: all terms hung up
|
||||
[%init p=ship] :: after gall ready
|
||||
@ -2522,7 +2525,7 @@
|
||||
++ cush (pair term club) :: internal kiss
|
||||
++ dude term :: server identity
|
||||
++ scup (pair ship desk) :: autoupdate
|
||||
++ well (pair desk term)
|
||||
++ well (pair desk term) ::
|
||||
++ suss (trel dude ,@tas ,@da) :: config report
|
||||
:::: ::
|
||||
++ kiss-gall :: incoming request
|
||||
@ -2531,9 +2534,11 @@
|
||||
[%deal p=sock q=cush] :: full transmission
|
||||
[%rote p=sack q=path r=*] :: remote request
|
||||
[%roth p=sack q=path r=*] :: remote response
|
||||
[%wegh ~] :: report memory
|
||||
== ::
|
||||
++ 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
|
||||
[%mack p=(unit tang)] :: message ack
|
||||
== ::
|
||||
|
||||
@ -199,7 +199,7 @@
|
||||
++ poke-start ::
|
||||
|= wel=well
|
||||
=< se-abet =< se-view
|
||||
+>(ray (~(put in ray) wel))
|
||||
(se-born wel)
|
||||
::
|
||||
++ reap ::
|
||||
|= [way=wire saw=(unit tang)]
|
||||
@ -255,7 +255,7 @@
|
||||
|- ^+ +>
|
||||
?~ 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
|
||||
+>
|
||||
@ -335,7 +335,7 @@
|
||||
^+ +>
|
||||
?: (~(has in ray) 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
|
||||
|= tac=(list tank)
|
||||
|
||||
@ -77,6 +77,10 @@
|
||||
|= him=ship =< abet
|
||||
(emit %flog /helm %crud %hax-init leaf/(scow %p him) ~)
|
||||
::
|
||||
++ poke-mass
|
||||
=< abet
|
||||
(emit %flog /heft %crud %hax-heft ~)
|
||||
::
|
||||
++ poke-start :: start a server
|
||||
|= hood-start =< abet
|
||||
(emit %conf /helm [our dap] %load our syd)
|
||||
@ -84,6 +88,7 @@
|
||||
++ poke-reload :: reload vanes
|
||||
|= all=(list term) =< abet
|
||||
%- emil
|
||||
%- flop
|
||||
%+ turn all
|
||||
=+ ark=(arch .^(%cy /(scot %p our)/base/(scot %da lat)/arvo))
|
||||
=+ van=(~(tap by r.ark))
|
||||
|
||||
@ -101,7 +101,9 @@
|
||||
++ receive :: naturalize event
|
||||
|= sole-change
|
||||
^- [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))
|
||||
?> |(!=(own.ler own.ven) =(0 haw) =(haw (sham buf)))
|
||||
=. leg (scag (sub own.ven own.ler) leg)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user