Merge branch 'test' of https://github.com/urbit/urbit into test

This commit is contained in:
C. Guy Yarvin 2014-11-19 16:46:40 -08:00
commit 6a83a8b176
8 changed files with 123 additions and 93 deletions

View File

@ -393,6 +393,8 @@
+>.$
?: ?=(%y p.p.u.rot)
%= +>.$
yel
[[hen %note ';' %leaf "starting to sync desk {(trip syd)}..."] yel]
tag
:_ tag
:* hen /auto/(scot %p who)/[syd]/(scot %p her)/[sud]/v
@ -424,6 +426,8 @@
~& "autosync from {<sud>} on {<her>} to {<syd>} on {<who>} up to date"
+>.$
%= +>.$
yel
[[hen %note ';' %leaf "successfully synced desk {(trip syd)}..."] yel]
tag
:_ tag
:* hen /auto/(scot %p who)/[syd]/(scot %p her)/[sud]/merg

View File

@ -7,7 +7,7 @@
$% [%bbye ~] :: reset prompt
[%blit p=(list blit)] :: terminal output
[%init p=@p] :: report install
[%logo ~] :: logout
[%logo @] :: logout
[%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path
[%verb ~] ::
@ -85,7 +85,8 @@
$% [%writ p=riot] ::
== == ::
$: %g ::
$% [%mean p=ares] ::
$% [%logo p=@] ::
[%mean p=ares] ::
[%nice ~] ::
$: %rush :: XX
$% [%term-line q=term-line] ::
@ -114,7 +115,7 @@
[%res p=span] ::
[%cmd p=char] ::
== == ::
++ term-line ,[p=[p=cord q=prom] q=(list cord) r=(list tark)]
++ term-line ,[p=[p=cord q=prom r=cord] q=(list cord) r=(list tark)]
++ tark ?(tank [%stem p=tank q=tank]) ::
:::::::: :: dill tiles
++ bein :: terminal control
@ -378,15 +379,18 @@
?~(hyt *hist u.hyt)
?: &(?=(^ q.q.yar) =(/ hux.u.q.q.yar))
%= u.q.q.yar
bul (met 3 r.p.q.sih)
bus (met 3 r.p.q.sih)
but (rip 3 r.p.q.sih)
hyt [+(p.hyt) [%$ q.hyt]]
pot (trip p.p.q.sih)
pol (met 3 p.p.q.sih)
buy q.p.q.sih
==
%_ bed
bul 0
bus 0
but ~
bul (met 3 r.p.q.sih)
bus (met 3 r.p.q.sih)
but (rip 3 r.p.q.sih)
buy q.p.q.sih
hux /
hiz 0
@ -399,21 +403,9 @@
%= +>.$
mos :_(mos [hen [%give %blit [%sag p.+.sih q.+.sih] ~]])
==
::S ::
::S %save :: write a file
::S %= +>.$
::S mos :_(mos [hen [%give %blit [%sav p.+.sih q.+.sih] ~]])
::S ==
::S ::
::S %tell (furl (turn p.+.sih |=(a=@t (trip a)))) :: wall of text
::S %talk (furl (~(win re p.+.sih) 0 p.q.yar)) :: program output
::S %text $(+.sih [%talk %leaf p.+.sih]) :: simple message
::S %warn (fume '~' [%leaf p.+.sih]) :: system message
::S ?(%init %logo %veer %vega %verb) :: drop-throughs
::S +>(mos :_(mos [hen %give +.sih]))
?(%init %veer %vega %verb) :: drop-throughs
?(%init %logo %veer %vega %verb) :: drop-throughs
+>(mos :_(mos [hen %give +.sih]))
%writ :: file exists
%writ :: file exists
%= +>.$
mos
:_ mos
@ -430,8 +422,8 @@
%belt :: terminal input
?~ q.q.yar
%^ furl
"Downloading terminal from ticketing ship, please wait until"
"a prompt shows up. This could take a minute or two."
"Downloading files from ticketing ship, please wait until"
"a prompt shows up. This could take several minutes."
~
?^ hyr.u.q.q.yar :: live search
?+ p.kyz $(hiz.u.q.q.yar 0, hyr.u.q.q.yar ~)
@ -497,7 +489,7 @@
%d ?: ?& =(0 bul.u.q.q.yar)
=(0 bus.u.q.q.yar)
==
+>.$(mos :_(mos [hen %give %logo ~]))
+>.$(mos :_(mos (poke %term-in -:!>(*term-in) / %cmd %d)))
$(kyz [%belt %del ~])
%e (edit u.q.q.yar(bus bul.u.q.q.yar))
%f $(kyz [%belt %aro %r])
@ -544,10 +536,7 @@
but (slag bus.u.q.q.yar but.u.q.q.yar)
==
%r (edit u.q.q.yar(hyr [~ ~]))
:: TODO
:: %w +>.$(mos :_(mos [hen %pass ~ %b [%limn ~]]))
%x +>.$(mos :_(mos (poke %term-in -:!>(*term-in) / %cmd %x)))
::S %x +>.$(mos :_(mos [hen %pass ~ %b [%ling ~]]))
%y ?: =(0 p.r.q.yar)
beep
$(kyz [%belt %txt (snag q.r.q.yar r.r.q.yar)])
@ -616,10 +605,8 @@
[p.hyt.u.q.q.yar [jab ?~(q.hyt.u.q.q.yar ~ +.q.hyt.u.q.q.yar)]]
::
mos
:* ::S [hen %pass ~ %b [%hail ~]]
(poke %term-ctrl -:!>(%hail) %hail)
:* (poke %term-ctrl -:!>(%hail) %hail)
[hen %give [%bbye ~]]
::S [hen %pass ~ %b [%line jab]]
(poke %term-in -:!>(*term-in) / %line jab)
[hen %give [%blit [[%mor ~] ~]]]
mos
@ -657,7 +644,6 @@
::
%hail :: refresh
+>.$
::S +>.$(mos :_(mos [hen %pass ~ %b kyz]))
::
%harm :: all terms hung up
=+ nug=((map duct yard) [[hen (~(get by dug) hen)] ~ ~])

View File

@ -141,6 +141,7 @@
$% [%crud p=@tas q=(list tank)] ::
[%dumb ~] ::
[%gone p=hapt] ::
[%logo p=@] ::
[%mean p=ares] ::
[%nice ~] ::
[%rush p=mark q=*] ::
@ -441,6 +442,7 @@
%crud !!
%dumb !!
%gone !!
%logo !!
%mean [%give %mean p.+.sih]
%nice [%give %nice ~]
%rush !!
@ -459,6 +461,7 @@
%crud !!
%dumb !!
%gone !!
%logo !!
%mean [%give %mean p.+.sih]
%nice [%give %nice ~]
%rush [%pass [%r pax] (rod %d p.+.sih q.+.sih)]

View File

@ -14,6 +14,7 @@
%govt %sect %fname %mname %nname
%lname %done
==
++ tepe ,[(unit ,[cord prom cord]) (list cord)]
--
::
!:
@ -21,9 +22,10 @@
++ done
|= ost=bone
:_ +>.$
:~ :* ost %pass /to-gan %g %mess [our.hid /began] our.hid
:* :* ost %pass /to-gan %g %mess [our.hid /began] our.hid
%began-args !>([his tic eny ges])
==
(spam %rush %prompt "[waiting...]" %text '')
==
::
++ loon
@ -37,19 +39,20 @@
::
++ next
|= txt=cord
^- [[[cord prom] (list cord)] _+>.$]
^- [tepe _+>.$]
?- sat
%begin
:_ +>.$(sat %his)
:- ['Your ship: ~' %text]
:- `['Your ship: ~' %text '']
%- lore %- crip
"""
Do you have a ship and a ticket? If not, please ask
urbit@urbit.org for one.
"""
%his
=+ her=(rash txt fed:ag)
=> .(-.q.ges (clan her))
=+ a=(rush txt fed:ag)
?~ a [[~ 'invalid input' ~] +>.$]
=> .(-.q.ges (clan u.a))
=+ ^= cow
|- ^- @ud
?- -.q.ges
@ -67,12 +70,12 @@
%earl "yachts"
%pawn "submarines"
==
:_ ^+ +>.$ +>.$(his (rash txt fed:ag), sat %tic)
:- ['Your ticket: ~' %text]
:_ ^+ +>.$ +>.$(his u.a, sat %tic)
:- `['Your ticket: ~' %text '']
%- lore %- crip
"""
Launching {(scow %p her)}, one of {<cow>} Urbit {ves}...
Launching {(scow %p u.a)}, one of {<cow>} Urbit {ves}...
If I did not build for myself
for whom should I build?
@ -86,8 +89,10 @@
"""
::
%tic
:_ +>.$(tic (rash txt fed:ag), sat %eny)
:- ['Entropy: ' %pass]
=+ a=(rush txt fed:ag)
?~ a [[~ 'invalid input' ~] +>.$]
:_ +>.$(tic u.a, sat %eny)
:- `['Entropy: ' %pass '']
%- lore %- crip
"""
@ -97,8 +102,10 @@
"""
::
%eny
:_ +>.$(eny (rash txt (boss 256 (more gon qit))), sat %lag)
:- ['Language: ' %text]
=+ a=(rush txt (boss 256 (more gon qit)))
?~ a [[~ 'invalid input' ~] +>.$]
:_ +>.$(eny u.a, sat %lag)
:- `['Language: ' %text 'en']
%- lore %- crip
"""
@ -117,11 +124,13 @@
=+ c=(cat 3 a b)
=+(d=(glon c) ?~(d ~ [~ c]))
;~(plug low low)
=+ a=(rush txt par)
?~ a [[~ 'invalid input' ~] +>.$]
?. ?=(%duke -.q.ges)
:_ +>.$(p.ges (rash txt par), sat %name)
[['Name: ' %text] ~]
:_ +>.$(p.ges (rash txt par), sat %form)
:- ['Form: ' %text]
:_ +>.$(p.ges u.a, sat %name)
[`['Name: ' %text ''] ~]
:_ +>.$(p.ges u.a, sat %form)
:- `['Form: %' %text 'lady']
%- lore %- crip
"""
@ -136,10 +145,11 @@
::
%name
?> ?=(?(%earl %king) -.q.ges)
=+ nam=(rash txt (boss 256 (more gon qit)))
=+ gos=?-(-.q.ges %earl [%earl nam], %king [%king nam])
=+ a=(rush txt (boss 256 (more gon qit)))
?~ a [[~ 'invalid input' ~] +>.$]
=+ gos=?-(-.q.ges %earl [%earl u.a], %king [%king u.a])
:_ +>.$(q.ges gos, sat %done)
[['' %text] ~]
[`['' %text ''] ~]
::
%form
=+ ^= par
@ -149,16 +159,17 @@
(jest %lord)
(jest %punk)
==
=+ fom=(rash txt par)
?+ fom !!
%anon [[['' %text] ~] +>.$(q.ges [%duke %anon ~], sat %done)]
=+ a=(rush txt par)
?~ a [[~ 'invalid input' ~] +>.$]
?+ u.a !!
%anon [[`['' %text ''] ~] +>.$(q.ges [%duke %anon ~], sat %done)]
%punk
:_ +>.$(q.ges [%duke %punk *sect ''], sat %pname)
[['Handle: ' %text] ~]
[`['Handle: ' %text ''] ~]
?(%lady %lord)
=+ wat=?-(fom %lady [%lady *whom], %lord [%lord *whom])
=+ wat=?-(u.a %lady [%lady *whom], %lord [%lord *whom])
:_ +>.$(q.ges `gcos`[%duke wat], sat %year)
:- ['Year you were born: ' %text]
:- `['Year you were born: ' %text '19']
%- lore %- crip
"""
@ -184,8 +195,10 @@
==
::
%pname
:_ +>.$(q.ges [%duke %punk *sect (rash txt loon)], sat %psect)
:- ['Banner: %' %text]
=+ a=(rush txt loon)
?~ a [[~ 'invalid input' ~] +>.$]
:_ +>.$(q.ges [%duke %punk *sect u.a], sat %psect)
:- `['Banner: %' %text 'white']
%- lore %- crip
"""
@ -225,19 +238,23 @@
(jest %black)
(jest %orange)
==
:- [['' %text] ~]
=+ a=(rush txt par)
?~ a [[~ 'invalid input' ~] +>.$]
:- [`['' %text ''] ~]
%= +>.$
q.ges [%duke %punk ((hard sect) (rash txt par)) q.p.q.ges]
q.ges [%duke %punk ((hard sect) u.a) q.p.q.ges]
sat %done
==
::
%year
?> ?=(%duke -.q.ges)
?> ?=(?(%lord %lady) -.p.q.ges)
=+ woh=`whom`[(rash txt dim:ag) *govt *sect *name]
=+ a=(rush txt dim:ag)
?~ a [[~ 'invalid input' ~] +>.$]
=+ woh=`whom`[u.a *govt *sect *name]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %govt)
:- ['Location (e.g. us/94103):' %text]
:- `['Location ' %text 'us/94103']
%- lore %- crip
"""
@ -261,10 +278,12 @@
(easy ~)
==
==
=+ woh=`whom`[p.p.p.q.ges (rash txt par) *sect *name]
=+ a=(rush txt par)
?~ a [[~ 'invalid input' ~] +>.$]
=+ woh=`whom`[p.p.p.q.ges u.a *sect *name]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %sect)
:- ['Banner: %' %text]
:- `['Banner: %' %text 'white']
%- lore %- crip
"""
@ -304,48 +323,56 @@
(jest %black)
(jest %orange)
==
=+ woh=`whom`[p.p.p.q.ges q.p.p.q.ges (sect (rash txt par)) *name]
=+ a=(rush txt par)
?~ a [[~ 'invalid input' ~] +>.$]
=+ woh=`whom`[p.p.p.q.ges q.p.p.q.ges (sect u.a) *name]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %fname)
[['First name: ' %text] ~]
[`['First name: ' %text ''] ~]
::
%fname
?> ?=(%duke -.q.ges)
?> ?=(?(%lord %lady) -.p.q.ges)
=+ nam=[(rash txt loon) *(unit ,@t) *(unit ,@t) *@t]
=+ a=(rush txt loon)
?~ a [[~ 'invalid input' ~] +>.$]
=+ nam=[u.a *(unit ,@t) *(unit ,@t) *@t]
=+ woh=`whom`[p.p.p.q.ges q.p.p.q.ges r.p.p.q.ges nam]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %mname)
[['Middle name (or blank): ' %text] ~]
[`['Middle name (or blank): ' %text ''] ~]
::
%mname
?> ?=(%duke -.q.ges)
?> ?=(?(%lord %lady) -.p.q.ges)
=+ uni=(rash txt ;~(pose (stag ~ loon) (easy ~)))
=+ nam=[p.s.p.p.q.ges uni *(unit ,@t) *@t]
=+ a=(rush txt ;~(pose (stag ~ loon) (easy ~)))
?~ a [[~ 'invalid input' ~] +>.$]
=+ nam=[p.s.p.p.q.ges u.a *(unit ,@t) *@t]
=+ woh=`whom`[p.p.p.q.ges q.p.p.q.ges r.p.p.q.ges nam]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %nname)
[['Nickname/handle (or blank): ' %text] ~]
[`['Nickname/handle (or blank): ' %text ''] ~]
::
%nname
?> ?=(%duke -.q.ges)
?> ?=(?(%lord %lady) -.p.q.ges)
=+ uni=(rash txt ;~(pose (stag ~ loon) (easy ~)))
=+ nam=[p.s.p.p.q.ges q.s.p.p.q.ges uni *@t]
=+ a=(rush txt ;~(pose (stag ~ loon) (easy ~)))
?~ a [[~ 'invalid input' ~] +>.$]
=+ nam=[p.s.p.p.q.ges q.s.p.p.q.ges u.a *@t]
=+ woh=`whom`[p.p.p.q.ges q.p.p.q.ges r.p.p.q.ges nam]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %lname)
[['Last name: ' %text] ~]
[`['Last name: ' %text ''] ~]
::
%lname
?> ?=(%duke -.q.ges)
?> ?=(?(%lord %lady) -.p.q.ges)
=+ nam=[p.s.p.p.q.ges q.s.p.p.q.ges r.s.p.p.q.ges (rash txt loon)]
=+ a=(rush txt loon)
?~ a [[~ 'invalid input' ~] +>.$]
=+ nam=[p.s.p.p.q.ges q.s.p.p.q.ges r.s.p.p.q.ges u.a]
=+ woh=`whom`[p.p.p.q.ges q.p.p.q.ges r.p.p.q.ges nam]
=+ wat=`what`?-(-.p.q.ges %lord [%lord woh], %lady [%lady woh])
:_ +>.$(q.ges [%duke wat], sat %done)
[['' %text] ~]
[`['' %text ''] ~]
::
%done !!
==
@ -488,7 +515,7 @@
==
==
=^ res +>.$
^- [[pot=[cord prom] tak=(list cord)] _+>.$]
^- [[pot=(unit ,[cord prom cord]) tak=(list cord)] _+>.$]
(next(sat sot) '')
:_ +>.$
%+ welp
@ -496,7 +523,7 @@
[ost %give %nice ~]
==
%+ welp
(spam %rush %prompt pot.res)
?~(pot.res ~ (spam %rush %prompt u.pot.res))
%- zing
(turn (flop tak.res) |=(a=cord (spam %rush %txt a)))
::
@ -506,12 +533,13 @@
?: ?=([%in ~] pax)
?. ?=(%rush +<.sih) `+>.$
=^ res +>.$
^- [[pot=[cord prom] tak=(list cord)] _+>.$]
^- [[pot=(unit ,[cord prom cord]) tak=(list cord)] _+>.$]
(next p.sih)
?: ?=(%done sat)
(done ost)
:_ +>.$
%+ welp (spam %rush %prompt pot.res)
%+ welp
?~(pot.res ~ (spam %rush %prompt u.pot.res))
%- zing
(turn (flop tak.res) |=(a=cord (spam %rush %txt a)))
:_ +>.$

View File

@ -17,7 +17,7 @@
==
==
++ blitz
$% [%prompt p=cord q=prom]
$% [%prompt p=cord q=prom r=cord]
[%tang p=(list tank)]
[%txt p=cord]
[%zong p=zong]
@ -38,7 +38,7 @@
==
++ idad ,[p=@p q=@t]
++ iron
$% [%prompt p=cord q=prom]
$% [%prompt p=cord q=prom r=cord]
[%txt p=cord]
[%zongs p=(list zong)]
[%users p=users]
@ -113,7 +113,7 @@
^- (unit ,[p=@t q=tank])
=+ hun=(rush a wide:(vang | &1:% &2:% (scot %da lat) |3:%))
?~ hun ~
?~(a ~ [~ a (sell (slap !>(sed) u.hun))])
?~(a ~ [~ a (sell (slap sed u.hun))])
::
++ mess
%+ cook |=(a=^mess a)
@ -142,7 +142,7 @@
?- -.u.rey
%all =+ ^= mof
?~ pom ~
(send /out %give %rush %prompt '& ' %text)
(send /out %give %rush %prompt '& ' %text '')
=^ mow +>.^$
(poke-zung(pom ~) ost our.hid %mess sat.fal p.u.rey)
[(welp mof mow) +>.^$]
@ -162,7 +162,7 @@
%mess [p.u.rey %chat ~] our.hid %mess !>(q.u.rey)
==
?: =(pom [~ p.u.rey]) ~
(send /out %give %rush %prompt (cat 3 (scot %p p.u.rey) ' ') %text)
(send /out %give %rush %prompt (cat 3 (scot %p p.u.rey) ' ') %text '')
%who
:_ +>.^$
%^ send /out %give :+ %rush %tang :_ ~
@ -203,7 +203,7 @@
=+ ya=(grab t.pax)
?+ i.pax !!
%out
[ost %give %rust %prompt '& ' %text]~
[ost %give %rust %prompt '& ' %text '']~
%private
~
%amigos
@ -239,7 +239,7 @@
%+ welp
:+ [ost %pass /cmd-in %g %show [our.hid +.imp.hid] you /in/[-.imp.hid]]
[ost %pass /private %g %show [our.hid /chat] you /private]
(send /out %give %rush %prompt '& ' %text)
(send /out %give %rush %prompt '& ' %text '')
mow
::
++ poke-mess

View File

@ -15,11 +15,12 @@
act=(unit span) :: active child
pip=(map span span) :: pipe out->in
pop=(map span span) :: pipe in->out
pot=(map span ,[cord prom]) :: prompts
pot=(map span ,[cord prom cord]) :: prompts
var=(map term vase) :: variables
== ::
++ gift ::
$% [%rush p=gilt] ::
[%logo p=@] ::
[%mean p=ares] ::
[%nice ~] ::
[%meta p=vase] ::
@ -326,6 +327,12 @@
%+ blab
[ost %give %nice ~]
(print leaf/"no command \\{(trip q.key)}")
%d ?~ act
%^ blab
[ost %give %nice ~]
[ost %give %logo ~]
~
(eat-end(act next-act) %& (slav %ud u.act))
%x =. act next-act
(blab [ost %give %nice ~] ping)
%l =+ =- tak=rose/[" " "[" "]"]^(turn cubs -)
@ -357,12 +364,12 @@
:(slop !>(%rush) !>(%term-line) !>(prompt) !>(~) tan)
::
++ prompt
^- [cord prom]
^- [cord prom cord]
?^ act
=+ por=(~(get by pot) u.act)
?^ por u.por
[(rap 3 (~(got by cub.hid) u.act) '(' u.act ') ' ~) %text]
:_ %text
[(rap 3 (~(got by cub.hid) u.act) '(' u.act ') ' ~) %text '']
:_ [%text '']
?. &(?=([@ @ @ *] pax) =('0' &3.pax))
(rsh 3 1 (spat pax))
(rap 3 &1.pax '/' &2.pax '=' ?~(|3.pax ~['> '] ~[(spat |3.pax) '> ']))
@ -387,7 +394,7 @@
?. ?=(?(%rust %rush) +<.sih) +>.$
?: ?=(%prompt p.sih)
?: (~(has by pip) cil) +>.$
=. pot (~(put by pot) cil (,[cord prom] q.sih))
=. pot (~(put by pot) cil (,[cord prom cord] q.sih))
(blab ping)
%- blab
?: (~(has by pip) cil)

View File

@ -19,6 +19,7 @@
++ gift ::
$% [%rush gilt] ::
[%rust gilt] ::
[%logo @] ::
[%mean p=ares] ::
[%nice ~] ::
[%sage p=path q=*] ::
@ -43,6 +44,7 @@
++ sign ::
$% $: %g ::
$% [%gone p=hapt] ::
[%logo @] ::
[%mean p=ares] ::
[%nice ~] ::
[%rust p=%term-line q=term-line] ::
@ -243,7 +245,7 @@
|= [ost=bone pax=path sih=*]
^- [(list move) _+>]
=+ sih=((hard sign) sih)
?: ?=(?(%sage %verb %veer %vega) &2.sih) :: vomit
?: ?=(?(%sage %logo %verb %veer %vega) &2.sih) :: vomit
[[ost %give +.sih]~ +>.$]
?~ pax !!
?. ?=(?(%fork %resp %txt %kyev) i.pax) !!

View File

@ -1 +1 @@
,[p=[p=cord q=prom] q=(list cord) r=(list ?(tank [%stem p=tank q=tank]))]
,[p=[p=cord q=prom r=cord] q=(list cord) r=(list ?(tank [%stem p=tank q=tank]))]