mirror of
https://github.com/urbit/shrub.git
synced 2024-12-04 14:58:10 +03:00
Merge branch 'test' of https://github.com/urbit/urbit into karpi
Conflicts: urb/urbit.pill
This commit is contained in:
C. Guy Yarvin
commit
e7e9fdeaa0
@ -2,8 +2,9 @@
|
||||
:::: /hoon/oct1/ape :::::: dependencies
|
||||
:: :: ::
|
||||
/? 310 :: arvo version
|
||||
/- sole, oct1 :: structures
|
||||
/- sole, oct1 :: structures
|
||||
/+ sole, oct1 :: libraries
|
||||
[. sole oct1] :: ::
|
||||
:: :: ::
|
||||
:::: :::::: interfaces
|
||||
!: :: ::
|
||||
@ -23,7 +24,6 @@
|
||||
:: :: ::
|
||||
:::: :::::: process core
|
||||
:: :: ::
|
||||
[sole oct1 .]
|
||||
|_ $: bowl :: system state
|
||||
moz=(list move) :: pending actions
|
||||
axon :: server state, v0
|
||||
@ -63,15 +63,15 @@
|
||||
++ work :: console action
|
||||
|= act=sole-action ::
|
||||
=+ say=(~(got by eye) ost) ::
|
||||
|^ ?:(?=(%det -.act) (delt +.act) dive) ::
|
||||
|^ ?+(-.act abet %det (delt +.act), %ret dive) ::
|
||||
++ abet ..work(eye (~(put by eye) ost say)) :: resolve
|
||||
++ delt |= cal=sole-change :: edit command line
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
?~(cul abet fail:(fect:abet det/u.cul)) ::
|
||||
++ dive =+ (rust (tufa buf.say) (punt come)) :: apply command line
|
||||
?~(- fail ?~(-> show (kick:wipe ->+))) ::
|
||||
++ good |=((list ,@c) -:(rose (tufa +<) come)) :: validate input
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
(fect:abet %det cal) ::
|
||||
-- ::
|
||||
:: :: ::
|
||||
|
||||
@ -2,8 +2,9 @@
|
||||
:::: /hoon/oct2/ape :::::: dependencies
|
||||
:: :: ::
|
||||
/? 310 :: arvo version
|
||||
/- sole, oct2 :: structures
|
||||
/- sole, oct2 :: structures
|
||||
/+ sole, oct2 :: libraries
|
||||
[. sole oct2] :: ::
|
||||
:: :: ::
|
||||
:::: :::::: interfaces
|
||||
!: :: ::
|
||||
@ -37,7 +38,6 @@
|
||||
:: :: ::
|
||||
:::: :::::: process core
|
||||
:: :: ::
|
||||
[sole oct2 .]
|
||||
|_ $: bowl ::
|
||||
moz=(list move) :: pending actions
|
||||
[%1 axle] :: process state, v1
|
||||
@ -80,16 +80,16 @@
|
||||
++ work :: console action
|
||||
|= act=sole-action ::
|
||||
=+ say=(~(got by eye) ost) ::
|
||||
|^ ?:(?=(%det -.act) (delt +.act) dive) ::
|
||||
|^ ?+(-.act abet %det (delt +.act), %ret dive) ::
|
||||
++ abet ..work(eye (~(put by eye) ost say)) :: resolve
|
||||
++ cusp (cope !ept:here) :: parsing rule
|
||||
++ delt |= cal=sole-change :: edit command line
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
?~(cul abet fail:(fect:abet det/u.cul)) ::
|
||||
++ dive =+ (rust (tufa buf.say) (punt come)) :: apply command line
|
||||
?~(- fail ?~(-> show (kick:wipe ->+))) ::
|
||||
++ good |=((list ,@c) -:(rose (tufa +<) cusp)) :: validate input
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
(fect:abet %det cal) ::
|
||||
-- ::
|
||||
:: :: ::
|
||||
|
||||
@ -2,8 +2,9 @@
|
||||
:::: /hoon/oct3/ape :::::: dependencies
|
||||
:: :: ::
|
||||
/? 310 :: arvo version
|
||||
/- sole, oct3 :: structures
|
||||
/- sole, oct3 :: structures
|
||||
/+ sole, oct3 :: libraries
|
||||
[. sole oct3] :: ::
|
||||
:: :: ::
|
||||
:::: :::::: interfaces
|
||||
!: :: ::
|
||||
@ -39,7 +40,6 @@
|
||||
:: :: ::
|
||||
:::: :::::: process core
|
||||
:: :: ::
|
||||
[sole oct3 .]
|
||||
|_ $: bowl ::
|
||||
moz=(list move) :: pending actions
|
||||
[%1 axle] :: process state, v1
|
||||
@ -90,16 +90,16 @@
|
||||
++ work :: console action
|
||||
|= act=sole-action ::
|
||||
=+ say=(~(got by eye) ost) ::
|
||||
|^ ?:(?=(%det -.act) (delt +.act) dive) ::
|
||||
|^ ?+(-.act abet %det (delt +.act), %ret dive) ::
|
||||
++ abet ..work(eye (~(put by eye) ost say)) :: resolve
|
||||
++ cusp (cope !ept:here) :: parsing rule
|
||||
++ delt |= cal=sole-change :: edit command line
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
?~(cul abet fail:(fect:abet det/u.cul)) ::
|
||||
++ dive =+ (rust (tufa buf.say) (punt come)) :: apply command line
|
||||
?~(- fail ?~(-> show (kick:wipe ->+))) ::
|
||||
++ good |=((list ,@c) -:(rose (tufa +<) cusp)) :: validate input
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
(fect:abet %det cal) ::
|
||||
-- ::
|
||||
:: :: ::
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
:: :: ::
|
||||
:::: /hoon/oct4/ape :::::: dependencies
|
||||
:::: /hoon/oct4/ape :::::: dependencies
|
||||
:: :: ::
|
||||
/? 310 :: arvo version
|
||||
/- sole, oct4 :: structures
|
||||
/- sole, oct4 :: structures
|
||||
/+ sole, oct4 :: libraries
|
||||
[. sole oct4] :: ::
|
||||
:: :: ::
|
||||
:::: :::::: interfaces
|
||||
!: :: ::
|
||||
@ -45,8 +46,7 @@
|
||||
:: :: ::
|
||||
:::: :::::: process core
|
||||
:: :: ::
|
||||
[sole oct4 .]
|
||||
|_ $: bowl
|
||||
|_ $: bowl ::
|
||||
moz=(list move) :: pending actions
|
||||
[%1 axle] :: process state, v1
|
||||
== ::
|
||||
@ -110,16 +110,16 @@
|
||||
++ work :: console action
|
||||
|= act=sole-action ::
|
||||
=+ say=(~(got by eye) ost) ::
|
||||
|^ ?:(?=(%det -.act) (delt +.act) dive) ::
|
||||
|^ ?+(-.act abet %det (delt +.act), %ret dive) ::
|
||||
++ abet ..work(eye (~(put by eye) ost say)) :: resolve
|
||||
++ cusp (cope !ept:here) :: parsing rule
|
||||
++ delt |= cal=sole-change :: edit command line
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
=^ cul say (~(remit sole say) cal good) ::
|
||||
?~(cul abet fail:(fect:abet det/u.cul)) ::
|
||||
++ dive =+ (rust (tufa buf.say) (punt comb)) :: apply command line
|
||||
?~(- fail ?~(-> show (plot:wipe ->+))) ::
|
||||
++ good |=((list ,@c) -:(rose (tufa +<) cusp)) :: validate input
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
++ wipe =^ cal say (~(transmit sole say) set/~) :: clear line
|
||||
(fect:abet %det cal) ::
|
||||
-- ::
|
||||
:: :: ::
|
||||
|
||||
@ -107,6 +107,7 @@
|
||||
[%banish p=span q=(list partner)] :: blacklist add
|
||||
[%block p=span q=(list partner)] :: blacklist add
|
||||
[%author p=span q=(list partner)] :: whitelist add
|
||||
[%nick p=(unit ship) q=(unit cord)] ::
|
||||
[%target p=where q=(unit work)] :: set active targets
|
||||
:: [%destroy p=span] ::
|
||||
[%create p=posture q=span r=cord] ::
|
||||
@ -214,6 +215,7 @@
|
||||
==
|
||||
==
|
||||
::
|
||||
++ nick (cook crip (stun [1 14] low)) :: nickname
|
||||
++ text (cook crip (star (shim ' ' '~'))) :: bullets separating
|
||||
++ glyph (mask "/\\\{(<!?{(zing glyphs)}") :: station postfix
|
||||
++ work
|
||||
@ -237,6 +239,17 @@
|
||||
;~(plug (perk %bind ~) ;~(pfix ace glyph) (punt ;~(pfix ace parz)))
|
||||
;~((glue ace) (perk %join ~) parz)
|
||||
;~((glue ace) (perk %what ~) ;~(pose parz glyph))
|
||||
::
|
||||
;~ plug (perk %nick ~)
|
||||
;~ pose
|
||||
(cook some ;~(pfix ace ship))
|
||||
(easy ~)
|
||||
==
|
||||
;~ pose
|
||||
(cook some ;~(pfix ace nick))
|
||||
(easy ~)
|
||||
==
|
||||
==
|
||||
::
|
||||
;~(plug (perk %help ~) (easy ~))
|
||||
(stag %number nump)
|
||||
@ -843,6 +856,7 @@
|
||||
%author (author +.job)
|
||||
%block (block +.job)
|
||||
%create (create +.job)
|
||||
%nick (nick +.job)
|
||||
%target (target +.job)
|
||||
%probe (probe +.job)
|
||||
%help (help)
|
||||
@ -857,7 +871,7 @@
|
||||
sh-prod(active.she `tr-pals:tay)
|
||||
::
|
||||
++ help |=(~ (sh-fact %mor talk-doc)) :: %help
|
||||
++ nick
|
||||
++ glyph
|
||||
|= idx=@
|
||||
=< cha.ole
|
||||
%+ reel glyphs
|
||||
@ -875,7 +889,7 @@
|
||||
=. ..sh-work
|
||||
=+ (~(get by nik) lix)
|
||||
?^ - (sh-note "has glyph {<u>}")
|
||||
=+ cha=(nick (mug lix))
|
||||
=+ cha=(glyph (mug lix))
|
||||
=: nik (~(put by nik) lix cha)
|
||||
nak (~(put ju nak) cha lix)
|
||||
==
|
||||
@ -964,6 +978,42 @@
|
||||
[por ~]
|
||||
(join [[%& our.hid nom] ~ ~])
|
||||
::
|
||||
++ reverse-folks
|
||||
|= nym=span
|
||||
^- (list ship)
|
||||
%+ murn (~(tap by folks))
|
||||
|= [p=ship q=human]
|
||||
?~ hand.q ~
|
||||
?. =(u.hand.q nym) ~
|
||||
[~ u=p]
|
||||
::
|
||||
++ nick :: %nick
|
||||
|= [her=(unit ship) nym=(unit cord)]
|
||||
^+ ..sh-work
|
||||
?: ?=([~ ~] +<)
|
||||
%+ sh-fact %mor
|
||||
%+ turn (~(tap by folks))
|
||||
|= [p=ship q=human]
|
||||
:- %txt
|
||||
?~ hand.q
|
||||
"{<p>}:"
|
||||
"{<p>}: {<u.hand.q>}"
|
||||
?~ nym
|
||||
?> ?=(^ her)
|
||||
=+ asc=(~(get by folks) u.her)
|
||||
%+ sh-fact %txt
|
||||
?~ asc "{<u.her>} unbound"
|
||||
?~ hand.u.asc "{<u.her>}:"
|
||||
"{<u.her>}: {<u.hand.u.asc>}"
|
||||
?~ her
|
||||
%+ sh-fact %mor
|
||||
%+ turn (reverse-folks u.nym)
|
||||
|= p=ship
|
||||
[%txt "{<p>}: {<u.nym>}"]
|
||||
%= ..sh-work
|
||||
folks (~(put by folks) u.her [true=~ hand=nym])
|
||||
==
|
||||
::
|
||||
++ target :: %target
|
||||
|= [lix=?((set partner) char) woe=(unit ^work)]
|
||||
=- ?~(woe end work(job u.woe, ..sh-pact end))
|
||||
|
||||
@ -2222,7 +2222,7 @@
|
||||
(a b c)
|
||||
::
|
||||
++ gulf :: range list
|
||||
|=([a=@ b=@] `(list ,@)`?:(=(a b) ~ [a $(a +(a))]))
|
||||
|=([a=@ b=@] `(list ,@)`?:(=(a +(b)) ~ [a $(a +(a))]))
|
||||
::
|
||||
++ hard :: force coerce to type
|
||||
|* han=$+(* *)
|
||||
|
||||
@ -9,20 +9,24 @@
|
||||
;script
|
||||
=type "text/javascript"
|
||||
=src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.js"
|
||||
;
|
||||
==
|
||||
;script
|
||||
=type "text/javascript"
|
||||
=src "/~~/~/at/base/lib/urb.js"
|
||||
;
|
||||
==
|
||||
;link
|
||||
=type "text/css"
|
||||
=rel "stylesheet"
|
||||
=href "/{dez}/lib/base.css"
|
||||
;
|
||||
==
|
||||
;link
|
||||
=type "text/css"
|
||||
=rel "stylesheet"
|
||||
=href "/{dez}/pub/oct3/src/main.css")
|
||||
=href "/{dez}/pub/oct3/src/main.css"
|
||||
;
|
||||
==
|
||||
;title: :oct3
|
||||
==
|
||||
|
||||
Loading…
Reference in New Issue
Block a user