Various fixes and improvements.

This commit is contained in:
C. Guy Yarvin 2014-06-24 10:32:59 -07:00
parent 23186f9a24
commit f939071722
10 changed files with 73 additions and 67 deletions

View File

@ -1624,7 +1624,7 @@
=. ton.fox (~(su go ton.fox) gus)
:_ fox
:~ :- hen
[%toss ~ %a %want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl]
[%pass ~ %a %want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl]
==
%re :: %re
:_ fox
@ -1641,7 +1641,7 @@
%+ turn paz
|= him=ship
:- hen
[%toss ~ %a %want [p.p.bon him] /q/yu [q.p.bon r.bon]]
[%pass ~ %a %want [p.p.bon him] /q/yu [q.p.bon r.bon]]
==
::
%ouzo

View File

@ -416,7 +416,7 @@
|= [lap=wire ted=@ud] :: XX ugly
^+ +>
%= +>
duv :_(duv `move`[~ %toss ~ %b [%hail ~]])
duv :_(duv `move`[~ %pass ~ %b [%hail ~]])
paq.gyr
%- ~(gas to *(qeu gyro))
%+ skip
@ -428,7 +428,7 @@
|= [lap=wire ted=@ud pod=prod] :: install prompt
^+ +>
%_ +>
duv :_(duv [~ %toss ~ %b [%hail ~]])
duv :_(duv [~ %pass ~ %b [%hail ~]])
paq.gyr (~(put to paq.gyr) [ted lap pod])
==
::
@ -814,7 +814,7 @@
::
++ gull :: request control
|= [tea=wire him=ship ryf=riff]
(gram ~ %toss tea %c [%warp [who him] ryf])
(gram ~ %pass tea %c [%warp [who him] ryf])
::
++ gulf :: stop request
|= [tea=wire kit=kite]
@ -903,17 +903,17 @@
%mx |- ^+ +>.^^$
?~ p.gud +>.^^$
$(p.gud t.p.gud, +>.^^$ ^$(gud i.p.gud))
%ok (gram ~ %toss ~ %c %info who p.gud q.gud)
%ok (gram ~ %pass ~ %c %info who p.gud q.gud)
%sc good:+>.^$(sac ?~(p.gud ?~(sac ~ +.sac) [u.p.gud sac]))
%sp !!
%sq =+ tea=(bist %ma r.gud)
%+ gram ~
[%toss tea %a [%want [who p.gud] [%q q.gud %b tea] s.gud]]
%sr (gram ~ %toss ~ %a [%want [who p.gud] [%r q.gud] r.gud])
[%pass tea %a [%want [who p.gud] [%q q.gud %b tea] s.gud]]
%sr (gram ~ %pass ~ %a [%want [who p.gud] [%r q.gud] r.gud])
%te (gram ~ %give %tell p.gud)
%th (gram ~ %toss ~ %e %that p.gud q.gud)
%th (gram ~ %pass ~ %e %that p.gud q.gud)
%tq =+ tea=(bist %ma p.gud)
(gram ~ %toss tea %e [%them ~ q.gud])
(gram ~ %pass tea %e [%them ~ q.gud])
%va !!
%xx =+ gah=((soft ghat) p.gud)
?~ gah
@ -927,7 +927,7 @@
?~ hug
~& [%batz-xy (,@tas -.q.gud)]
!!
(gram ~ %toss ~ u.hug)
(gram ~ %pass ~ u.hug)
==
==
::
@ -953,7 +953,7 @@
%es :: ~& %es-loss
(gull (bist %ma lap) p.gal q.gal ~)
%hp +>
%ht (gram ~ %toss (bist [%ma lap]) %e [%band who ~])
%ht (gram ~ %pass (bist [%ma lap]) %e [%band who ~])
%lq (gump | p.gal gyp ted lap)
%ow +>
%rt +>
@ -971,7 +971,7 @@
%es :: ~& %es-moor
(gull (bist %ma lap) p.gal q.gal [~ r.gal])
%hp +>
%ht (gram ~ %toss [%b (bist [%ma lap])] %e [%band who p.gal])
%ht (gram ~ %pass [%b (bist [%ma lap])] %e [%band who p.gal])
%lq (gump & p.gal [gyp ted lap])
%ow +>
%rt +>
@ -1361,7 +1361,7 @@
..^^$(dez (~(put by dez) hen [[p.q.hic (bard p.q.hic)] ~]))
::
?(%make %sith)
[[[hen [%toss ~ %a q.hic]] ~] ..^^$]
[[[hen [%pass ~ %a q.hic]] ~] ..^^$]
==
?> ?=(^ u.dus)
=+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus]

View File

@ -104,7 +104,7 @@
%+ turn (flop say)
|= [a=duct b=path c=ship d=[p=@ud q=riff]]
:- a
[%toss b %a %want [who c] [%q %re p.q.d (scot %ud p.d) ~] q.d]
[%pass b %a %want [who c] [%q %re p.q.d (scot %ud p.d) ~] q.d]
==
::
++ aver :: read
@ -467,7 +467,7 @@
=+ ryf=((hard riff) s.q.hic)
:_ ..^$
:~ :- hen
:^ %toss [(scot %p p.p.q.hic) (scot %p q.p.q.hic) r.q.hic]
:^ %pass [(scot %p p.p.q.hic) (scot %p q.p.q.hic) r.q.hic]
%c
[%warp [p.p.q.hic p.p.q.hic] ryf]
==
@ -539,7 +539,7 @@
=+ him=(need (slaw %p i.t.tea))
:_ ..^$
:~ :- hen
[%toss ~ %a [%want [our him] [%r %re %c t.t.tea] p.+.q.hin]]
[%pass ~ %a [%want [our him] [%r %re %c t.t.tea] p.+.q.hin]]
==
::
%went

View File

@ -297,7 +297,7 @@
==
::
?(%hail %make %sith)
+>.$(mos :_(mos [hen %toss ~ %b +.sih]))
+>.$(mos :_(mos [hen %pass ~ %b +.sih]))
::
%note ?.(p.yar +>.$ (fume p.+.sih q.+.sih)) :: debug message
%save :: write a file
@ -386,7 +386,7 @@
%d ?: ?& =(0 bul.u.q.q.yar)
=(0 bus.u.q.q.yar)
==
+>.$(mos :_(mos [hen %toss ~ %b [%kill ~]]))
+>.$(mos :_(mos [hen %pass ~ %b [%kill ~]]))
$(kyz [%belt %del ~])
%e (edit u.q.q.yar(bus bul.u.q.q.yar))
%f $(kyz [%belt %aro %r])
@ -434,8 +434,8 @@
==
%r (edit u.q.q.yar(hyr [~ ~]))
:: TODO
:: %w +>.$(mos :_(mos [hen %toss ~ %b [%limn ~]]))
%x +>.$(mos :_(mos [hen %toss ~ %b [%ling ~]]))
:: %w +>.$(mos :_(mos [hen %pass ~ %b [%limn ~]]))
%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)])
@ -504,9 +504,9 @@
[p.hyt.u.q.q.yar [jab ?~(q.hyt.u.q.q.yar ~ +.q.hyt.u.q.q.yar)]]
::
mos
:* [hen %toss ~ %b [%hail ~]]
:* [hen %pass ~ %b [%hail ~]]
[hen %give [%bbye ~]]
[hen %toss ~ %b [%line jab]]
[hen %pass ~ %b [%line jab]]
[hen %give [%blit [[%mor ~] ~]]]
mos
==
@ -532,7 +532,7 @@
%boot
%= +>.$
mos
:_(mos [hen %toss ~ (note %b p.kyz)])
:_(mos [hen %pass ~ (note %b p.kyz)])
==
::
%crud :: error trace
@ -542,18 +542,18 @@
(fume:$(q.kyz t.q.kyz) '!' `tank`i.q.kyz)
::
%hail :: refresh
+>.$(mos :_(mos [hen %toss ~ %b kyz]))
+>.$(mos :_(mos [hen %pass ~ %b kyz]))
::
%harm :: all terms hung up
=+ nug=((map duct yard) [[hen (~(get by dug) hen)] ~ ~])
^+ +>.$
%= +>.$
dug nug
mos :_(mos [hen %toss ~ %b kyz])
mos :_(mos [hen %pass ~ %b kyz])
==
::
%hook :: this term hung up
+>.$(dug (~(del by dug) hen), mos :_(mos [hen %toss ~ %b kyz]))
+>.$(dug (~(del by dug) hen), mos :_(mos [hen %pass ~ %b kyz]))
::
%talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output
%text $(kyz [%talk %leaf p.kyz]) :: simple message

View File

@ -1,4 +1,4 @@
:: :: %eyre, http servant
!: :: %eyre, http servant
!? 164
::::
|= pit=vase
@ -517,12 +517,12 @@
++ haji :: send %pc login
|= [our=ship him=ship ses=hole]
^+ +>
+>.$(mow :_(mow [hen %toss ~ %a [%want [our him] [%r %pc ~] ses]]))
+>.$(mow :_(mow [hen %pass ~ %a [%want [our him] [%r %pc ~] ses]]))
::
++ hajj :: send %pr response
|= [our=ship him=ship tus=path har=httr]
^+ +>
+>.$(mow :_(mow [hen %toss ~ %a [%want [our him] [%r %pr tus] har]]))
+>.$(mow :_(mow [hen %pass ~ %a [%want [our him] [%r %pr tus] har]]))
::
++ hare :: receive request
|= [our=ship tus=path him=ship hor=*]
@ -532,7 +532,7 @@
mow
:_ mow
:- hen
:^ %toss [(scot %p our) (scot %p him) tus]
:^ %pass [(scot %p our) (scot %p him) tus]
%e
?~(hux [%thud ~] [%this u.hux])
==
@ -571,7 +571,7 @@
%_ +>
mow
:_ mow
:+ hen %toss
:+ hen %pass
[[%hoot (scot %p our) ses (scot %ud num) ~] %c [%warp [our our] rif]]
==
::
@ -580,7 +580,7 @@
%_ +>
mow
:_ mow
[hen %toss [%honk (scot %p our) ses (scot %ud num) ~] %f [%exec our ~]]
[hen %pass [%honk (scot %p our) ses (scot %ud num) ~] %f [%exec our ~]]
==
::
++ honk :: ford request
@ -589,7 +589,7 @@
%_ +>
mow
:_ mow
[hen %toss [%honk (scot %p our) ses (scot %ud num) ~] %f [%exec our `kas]]
[hen %pass [%honk (scot %p our) ses (scot %ud num) ~] %f [%exec our `kas]]
==
::
++ hops :: cancel remote
@ -601,7 +601,7 @@
mow
:_ mow
:- hen
:^ %toss [%hork (scot %p sor.rot) mun ~]
:^ %pass [%hork (scot %p sor.rot) mun ~]
%a
[%want [sor.rot him] [%q %pr %e %hork mun ~] ~]
==
@ -627,7 +627,7 @@
mow
:_ mow
:- hen
:^ %toss [%hork (scot %p sor.rot) mun ~]
:^ %pass [%hork (scot %p sor.rot) mun ~]
%a
[%want [sor.rot him] [%q %pr %e %hork mun ~] [~ hyx]]
::
@ -656,7 +656,7 @@
(fail 400 "urbit: url {<pul>} does not match a vessel")
:*
^= rob
%- role
%- roly
:~ 'User-agent: *'
'Disallow: /'
==
@ -1294,6 +1294,9 @@
++ holy :: structured request
|= [pul=purl moh=moth]
^- (unit seam)
?: &(=(%get p.moh) ?=([~ [@ ~]] q.pul)) :: app shortcut
:: XX use credential to figure out gog/gig
$(q.pul [`%html [%gog i.q.q.pul ~]])
?~ q.q.pul ~
=* nep i.q.q.pul
=+ paw=t.q.q.pul
@ -1771,7 +1774,7 @@
?~ fuv mow
:_ mow
:- hen
:+ %toss [%cons (scot %p our) ses (scot %ud p.som.pip) ~]
:+ %pass [%cons (scot %p our) ses (scot %ud p.som.pip) ~]
u.fuv
==
[~ `pimp`pip(pez `pest`[%fin %raw 200 ~ ~])]
@ -1952,7 +1955,7 @@
%= ..yo
sok (~(del by sok) nap)
==
$(wuh t.wuh, ..amok (toss p.i.wuh `note`[%g %nuke our app]))
$(wuh t.wuh, ..amok (pass p.i.wuh `note`[%g %nuke our app]))
::
++ hoop :: request path
|= suc=term
@ -1964,12 +1967,17 @@
suc
==
::
++ pass :: pass
|= [suc=term noh=note]
^+ +>
+>(mow [[hen %pass (hoop suc) noh] mow])
::
++ post :: transmit
|= [cnt=@ud num=@ud jon=json]
^+ +>
=. +>.$
?. =(cnt meg.siq) +>.$
%+ toss(meg.siq +(meg.siq))
%+ pass(meg.siq +(meg.siq))
%post
`note`[%g %mess [our app] you [%json !>(jon)]]
?. =(+(cnt) meg.siq)
@ -1978,18 +1986,13 @@
::
++ scud :: subscribe
|= [suc=term num=@ud pax=path]
=. +>.$ (toss suc `note`[%g %show [our app] you pax])
=. +>.$ (pass suc `note`[%g %show [our app] you pax])
(hire:(yule suc) 0 num)
::
++ self :: request main
|= pax=path
^+ +>
(hire:(yule:(toss %self [%g %show [our app] you pax]) %self) 0 nap)
::
++ toss :: toss
|= [suc=term noh=note]
^+ +>
+>(mow [[hen %toss (hoop suc) noh] mow])
(hire:(yule:(pass %self [%g %show [our app] you pax]) %self) 0 nap)
::
++ yule :: swig state
|= suc=term
@ -2173,7 +2176,7 @@
=^ mos bol
=< abet
%^ axon:~(adit ye [hen [now eny sky] ~] bol) tea
(~(peek ut p.hin) %free 7)
(~(peek ut p.hin) %free 3)
q.hin
[mos ..^$]
--

View File

@ -182,7 +182,7 @@
kiz t.kiz
mow :_ mow
:- hen
:^ %toss [(scot %p our) (scot %ud num) (scot %ud p.i.kiz) ~]
:^ %pass [(scot %p our) (scot %ud num) (scot %ud p.i.kiz) ~]
%c
[%warp [our p.q.i.kiz] q.q.i.kiz ~]
==
@ -197,7 +197,7 @@
%= $
mow :_ mow
:- hen
:^ %toss [(scot %p our) (scot %ud num) (scot %ud tik) ~]
:^ %pass [(scot %p our) (scot %ud num) (scot %ud tik) ~]
%c
[%warp [our p.bem] q.bem [~ %& %x r.bem s.bem]]
==

View File

@ -379,7 +379,7 @@
|=(a=(pair ship desk) (~(has in ped.sat) a))
|= a=(pair ship desk)
:- hun.mat
:^ %toss (away %w %drug (scot %p p.a) q.a ~) %c
:^ %pass (away %w %drug (scot %p p.a) q.a ~) %c
[%warp [our p.a] q.a ~ %| [%da now] [%da (add now ~d1000)]]
=+ ^= old ^- (list move)
%+ turn
@ -387,7 +387,7 @@
|=(a=(pair ship desk) (~(has in pen) a))
|= a=(pair ship desk)
:- hun.mat
:^ %toss (away %w %drug (scot %p p.a) q.a ~) %c
:^ %pass (away %w %drug (scot %p p.a) q.a ~) %c
[%warp [our p.a] q.a ~]
%_(+>.$ ped.sat pen, mow :(weld new old mow))
::
@ -408,7 +408,7 @@
|= [pax=path kas=silk]
^+ +>
%_ +>
mow :_(mow [hen %toss (away pax) %f [%exec our `kas]])
mow :_(mow [hen %pass (away pax) %f [%exec our `kas]])
onz.sat `[hen pax]
==
::
@ -594,7 +594,7 @@
%= +>
onz.sat ~
mow
:_(mow [hen %toss (away q.u.onz.sat) %f [%exec our ~]])
:_(mow [hen %pass (away q.u.onz.sat) %f [%exec our ~]])
==
+>.$(vey.sat (~(put to vey.sat) hen kon))
::
@ -629,8 +629,8 @@
=+ caq=(spec (slot 3 wec))
?+ q.caq ~&(%sump-bad !!)
::
[%toss p=* q=@tas r=[p=@tas q=*]]
:^ %toss ((hard path) p.q.caq)
[%pass p=* q=@tas r=[p=@tas q=*]]
:^ %pass ((hard path) p.q.caq)
(need ((sand %tas) ((hard ,@) q.q.caq)))
[%meta (spec (slot 15 caq))]
::

View File

@ -92,6 +92,7 @@
++ line ,[p=[%leaf p=odor q=@] q=tile] :: %kelp case
++ list |* a=_,* :: null-term list
$|(~ [i=a t=(list a)]) ::
++ lone |*(a=$+(* *) ,p=a) :: just one thing
++ mane $|(@tas [@tas @tas]) :: XML name/space
++ mano ,[g=marx c=marl] :: normalized manx
++ manx $|(@tas [t=marx c=marl]) :: XML node
@ -100,7 +101,7 @@
++ mart (list ,[n=mane v=tape]) :: XML attributes
++ marx $|(@tas [n=mane a=mart]) :: XML tag
++ metl ?(%gold %iron %zinc %lead) :: core variance
++ noun ,*
++ noun ,* :: any noun
++ null ,~ :: null, nil, etc
++ odor ,@ta :: atom format
++ tarp ,[d=@ud h=@ud m=@ud s=@ud f=(list ,@ux)] :: parsed time
@ -4229,7 +4230,7 @@
!!
$(lub res, tez [(end 3 meg lub) tez])
::
++ role :: line list to atom
++ roly :: line list to atom
|= tez=(list ,@t)
(rap 3 (turn tez |=(a=@t (cat 3 a 10))))
::
@ -4246,7 +4247,7 @@
::
%c
=+ dst=(lore ((hard ,@) src))
%- role
%- roly
?+ -.q.don ~|(%unsupported !!)
%a ((hard (list ,@t)) q.q.don)
%c (lurk dst p.q.don)
@ -4284,7 +4285,7 @@
?+ pum ~|(%unsupported !!)
%a dst
%b (jam dst)
%c (role ((hard (list ,@)) dst))
%c (roly ((hard (list ,@)) dst))
==
::
++ lurk :: apply list patch
@ -9243,7 +9244,7 @@
++ monk (each ship khan) :: general identity
++ mold :: new kernel action
|* [a=$+(* *) b=$+(* *)] :: forward/reverse
$% [%toss p=path q=a] :: advance
$% [%pass p=path q=a] :: advance
[%slip p=a] :: lateral
[%sick p=b] :: lame refactoring
[%give p=b] :: retreat
@ -9400,7 +9401,7 @@
=+ caq=(spec (slot 3 wec))
?+ q.caq [%| (cat 3 %funk (,@tas q.caq))]
::
[%toss p=* q=@tas r=[p=@tas q=*]]
[%pass p=* q=@tas r=[p=@tas q=*]]
%- (bond |.([%| p.r.q.caq]))
%+ biff ((soft ,@) q.q.caq)
|= lal=@tas
@ -9409,7 +9410,7 @@
|= pax=path
%+ bind (song (spec (slot 15 caq)))
|= hil=mill
[%& %toss pax lal hil]
[%& %pass pax lal hil]
::
[%give p=[p=@tas q=*]]
%- (bond |.([%| p.p.q.caq]))
@ -9551,7 +9552,7 @@
%+ kick lac
:~ :* i.p.ovo
~
:^ %toss t.p.ovo
:^ %pass t.p.ovo
(dint p.ovo)
:+ %&
[%cell [%cube %soft [%atom %tas]] %noun]
@ -9585,9 +9586,9 @@
%+ fire
p.gum
?- -.r.gum
%toss
~? &(!lac !=(%gold p.gum))
[%toss p.gum (,@tas +>-.q.q.r.gum) q.gum]
%pass
~? &(!lac !=(%$ p.gum))
[%pass p.gum (,@tas +>-.q.q.r.gum) q.gum]
[p.q.r.gum ~ [[p.gum p.r.gum] q.gum] q.q.r.gum]
::
%give

View File

@ -1,3 +1,4 @@
!:
|= *
|= htm=@
[/text/html (met 3 htm) htm]

View File

@ -1,3 +1,4 @@
!:
|= *
|= man=manx
(crip (xmlt | man ~))