Various fixes and improvements.

This commit is contained in:
C. Guy Yarvin 2014-06-07 11:36:31 -07:00
parent 3d1b20cfdd
commit ba59c5bffc
5 changed files with 90 additions and 92 deletions

View File

@ -3,11 +3,12 @@
::::
|= pit=vase
=> =~
|% :: metastructures
|% :: interfaces
++ gift :: out result <-$
$% [%thou p=httr] :: raw http response
[%thus p=@ud q=(unit hiss)] :: http request/cancel
== ::
++ hope (pair ,? path) :: see %gall
++ kiss :: in request ->$
$% [%born ~] :: new unix process
[%crud p=@tas q=(list tank)] :: XX rethink
@ -32,9 +33,10 @@
[%warp p=sock q=riff] :: to %clay
== ::
++ sign :: in result $-<
$% [%crud p=@tas q=(list tank)] :: by any
$% [%boot ~] :: by %gall
[%crud p=@tas q=(list tank)] :: by any
[%helo p=path q=prod] :: by %batz
[%made p=(each beet (list tank))] :: by %ford
[%made p=(each bead (list tank))] :: by %ford
:: [%rush p=@da q=json] :: by %gall
[%rust p=@da q=cage] :: by %gall
[%talk p=tank] :: by %batz
@ -47,7 +49,7 @@
[%writ p=riot] :: by %clay
==
--
|% :: structures
|% :: models
++ bolo :: eyre state
$: %0 :: version
gub=@t :: random identity
@ -83,7 +85,7 @@
== ::
$% [%err p=@ud q=(list tank)] :: error report
[%fin p=love] :: ready to send
[%fud p=(each beet (list tank))] :: function finished
[%fud p=(each bead (list tank))] :: function finished
[%haz p=riot] :: clay responded
[%raw p=hiss] :: wild url
[%who p=@tas q=@ta] :: awaiting auth
@ -99,6 +101,21 @@
sor=@p :: home sponsor
rem=[p=@ud q=(map ,@ud duct)] :: active requests
== ::
++ seam :: logical request
$% [%ape p=term q=@ud] :: await update
[%apg p=term q=logo r=path] :: app get
[%apl p=term q=@ud r=term] :: app poll
[%apm p=term q=json] :: app message
[%aps p=term q=term r=(unit path)] :: app subscribe
[%apu p=term q=logo r=octs] :: app upload
[%cog p=@ud q=@ud] :: console get
[%con p=@ud] :: console face
[%cop p=@ud q=@ud r=json] :: console put
[%det p=desk q=moat] :: load changes
[%fun p=term q=tube r=(list manx)] :: functional
[%lon p=seal] :: authentication flow
[%red p=purl] :: redirect
== ::
++ serf :: local server
$: pef=@t :: server prefix
wup=(map hole cyst) :: secure sessions
@ -211,6 +228,10 @@
|= [tea=wire sin=sign]
^+ +>
?- -.sin
%boot
~& %eyre-boot
+>.$
::
%crud
+>.$(mow [[hen %slip %d %flog sin] mow])
::
@ -344,7 +365,7 @@
[sas ~[content-type/'text/plain'] [~ (tact str)]]
::
++ galt
|= [our=ship ses=hole num=@ud mez=(each beet (list tank))]
|= [our=ship ses=hole num=@ud mez=(each bead (list tank))]
^+ +>
=+ suf=(~(get by own) our)
?~ suf +>.$
@ -1176,7 +1197,7 @@
+>.$
::
++ inch :: function built
|= [num=@ud mez=(each beet (list tank))]
|= [num=@ud mez=(each bead (list tank))]
^+ +>
~& [%inch num -.mez]
=+ pup=(~(get by q.rey) num)
@ -1517,7 +1538,7 @@
::
%fun
:- [~ pip(pez %way)]
=+ bem=`bead`(need (tome q.som.pip))
=+ bem=`beam`(need (tome q.som.pip))
=+ bek=`beak`[p.bem q.bem r.bem]
=+ kas=`silk`[%cast %mime bek `silk`[%boil p.som.pip bem]]
+>.$(..ya (honk our num ses kas))

View File

@ -6,7 +6,7 @@
:: structures
|%
++ gift :: out result <-$
$% [%made p=(each beet (list tank))] :: computed result
$% [%made p=(each bead (list tank))] :: computed result
== ::
++ kiss :: in request ->$
$% [%exec p=@p q=(unit silk)] :: make / kill
@ -33,8 +33,8 @@
|* a=$+(* *) :: product clam
$: p=cafe :: cache
$= q ::
$% [%0 p=(set bead) q=a] :: depends/product
[%1 p=(set ,[p=bead q=(list tank)])] :: blocks
$% [%0 p=(set beam) q=a] :: depends/product
[%1 p=(set ,[p=beam q=(list tank)])] :: blocks
[%2 p=(list tank)] :: error
== ::
== ::
@ -50,7 +50,7 @@
:: ::
++ calm :: cache metadata
$: laz=@da :: last accessed
dep=(set bead) :: dependencies
dep=(set beam) :: dependencies
== ::
++ calx :: concrete cache line
$% [%comp p=calm q=cage r=twig] :: compile by text
@ -59,7 +59,7 @@
++ task :: problem in progress
$: nah=duct :: cause
kas=silk :: problem
kig=[p=@ud q=(map ,@ud bead)] :: blocks
kig=[p=@ud q=(map ,@ud beam)] :: blocks
== ::
-- ::
|% ::
@ -100,7 +100,7 @@
==
::
++ fine |* [a=cafe b=*] :: bolt from data
[p=`cafe`a q=[%0 p=*(set bead) q=b]] ::
[p=`cafe`a q=[%0 p=*(set beam) q=b]] ::
++ flaw |=([a=cafe b=(list tank)] [p=a q=[%2 p=b]]) :: bolt from error
::
++ grom :: merge sets
@ -167,7 +167,7 @@
==
++ camo :: stop requests
^+ .
=+ kiz=(~(tap by q.kig) *(list ,[p=@ud q=bead]))
=+ kiz=(~(tap by q.kig) *(list ,[p=@ud q=beam]))
|- ^+ +>
?~ kiz +>
%= $
@ -180,7 +180,7 @@
==
::
++ camp :: request a file
|= [ren=care bem=bead]
|= [ren=care bem=beam]
^+ +>
=+ tik=(scot %ud p.kig)
=: p.kig +(p.kig)
@ -260,13 +260,13 @@
^= q
?- -.ton
%2 [%2 p=p.ton]
%0 [%0 p=*(set bead) q=(fun p.ton)]
%0 [%0 p=*(set beam) q=(fun p.ton)]
%1 =- ?- faw
& [%1 p=(turn p.faw |=(a=bead [a *(list tank)]))]
& [%1 p=(turn p.faw |=(a=beam [a *(list tank)]))]
| [%2 p=p.faw]
==
^= faw
|- ^- (each (list bead) (list tank))
|- ^- (each (list beam) (list tank))
?~ p.ton [%& ~]
=+ nex=$(p.ton t.p.ton)
=+ pax=(path i.p.ton)
@ -297,7 +297,7 @@
=< abet
|- ^+ ..exec
?~ zuk ..exec
=+ foo=`_..exec`(camp %x `bead`p.i.zuk)
=+ foo=`_..exec`(camp %x `beam`p.i.zuk)
$(zuk t.zuk, ..exec foo)
==
::
@ -363,7 +363,7 @@
(fine cof p.cay vax)
::
++ krab :: load to twig
|= [cof=cafe for=logo how=logo rem=spur bem=bead]
|= [cof=cafe for=logo how=logo rem=spur bem=beam]
^- (bolt vase)
%+ cope (fade cof %bake how bem)
|= [cof=cafe gen=twig]
@ -372,7 +372,7 @@
(maul cof gat !>([`beak`[p.bem q.bem r.bem] for +:s.bem rem]))
::
++ lace :: load and check
|= [cof=cafe for=logo rem=spur bem=bead]
|= [cof=cafe for=logo rem=spur bem=beam]
^- (bolt (unit vase))
=+ bek=`beak`[p.bem q.bem r.bem]
%+ cope (lend cof bem)
@ -407,7 +407,7 @@
(fine cof ~ pro)
::
++ lair :: metaload
|= [for=logo bem=bead]
|= [for=logo bem=beam]
|= [cof=cafe vax=vase]
^- (bolt vase)
?. (~(nest ut -:!>(*silk)) | p.vax)
@ -423,14 +423,14 @@
|=(ref=type ref)
::
++ lend :: load arch
|= [cof=cafe bem=bead]
|= [cof=cafe bem=beam]
^- (bolt arch)
=+ von=(ska %cy (tope bem))
?~ von [p=cof q=[%1 [bem ~] ~ ~]]
(fine cof ((hard arch) (need u.von)))
::
++ liar :: load vase
|= [cof=cafe bem=bead]
|= [cof=cafe bem=beam]
^- (bolt vase)
=+ von=(ska %cx (tope bem))
?~ von
@ -450,7 +450,7 @@
(fine cof ?.(=(%hoon for) all [%hoot all]))
::
++ lima :: load at depth
|= [cof=cafe for=logo rem=spur bem=bead]
|= [cof=cafe for=logo rem=spur bem=beam]
^- (bolt (unit vase))
%+ cope (lend cof bem)
|= [cof=cafe arc=arch]
@ -472,8 +472,8 @@
|= [cof=cafe vax=vase]
(fine cof ~ vax)
::
++ lime :: load bead
|= [cof=cafe for=logo bem=bead]
++ lime :: load beam
|= [cof=cafe for=logo bem=beam]
=+ [mob=bem rem=*path]
|- ^- (bolt vase)
%+ cope (lima cof for rem bem)

View File

@ -9,33 +9,32 @@
pol=(map ship mast) :: apps by ship
== ::
++ bone ,@ud :: opaque duct
++ chop ,[p=@ud q=@da] :: revision/date
++ gift :: out result <-$
$% [%back p=?] :: %mess ack good/bad
[%boot ~] :: app boot/reboot
[%boot p=@ud q=@da] :: response to %wait
[%crud p=@tas q=(list tank)] :: error
[%done ~] :: reset duct
[%rasp p=cage] :: reaction message
[%rush p=@da q=json] :: difference (web)
[%rusk p=@da q=cage] :: difference (urbit)
[%rust p=@da q=cage] :: full update
[%rush p=chop q=cage] :: difference
[%rust p=chop q=cage] :: full update
[%meta p=vase] :: meta-gift
== ::
++ hope (pair ,? path) :: view/subscribe
++ kiss :: in request ->$
$% [%show p=hasp q=(unit hope)] :: urb subscribe/cancel
[%cuff p=(unit cuff) q=kiss] :: controlled kiss
[%mesh p=hasp q=path r=json] :: web message (json)
[%mess p=hasp q=cage] :: urbit message
[%mush p=hasp q=path r=cage] :: web message (mime)
[%mess p=hasp q=cage] :: message
[%nuke p=hasp] :: reset this duct
:: [%puke p=(list tank) q=kiss] :: kiss will fail
[%shah p=hasp q=(unit hope)] :: web subscribe/cancel
[%show p=hasp q=(unit hope)] :: web subscribe/cancel
[%wait p=@ud] :: await revision
== ::
++ knob :: pending action
$% [%boot ~] :: boot/reboot
[%crud p=@tas q=(list tank)] :: error
[%mess p=cage] :: message
[%nuke ~] :: reboot
[%shah p=(unit hope)] :: web subscribe/cancel
[%show p=(unit hope)] :: urb subscribe/cancel
[%nuke ~] :: destroy duct
[%show p=(unit hope)] :: subscribe/cancel
[%take p=path q=vase] :: user result
== ::
++ mast :: apps by ship
@ -55,14 +54,16 @@
== ::
++ seat :: the living app
$: huv=(unit vase) :: application vase
qic=(unit toil) :: project
vey=(qeu toil) :: pending calls
orm=(unit ,@da) :: last buildtime
qic=(unit toil) :: current project
vey=(qeu toil) :: pending projects
tik=@ud :: build number
orm=(unit ,@da) :: build date
med=(map duct ,@ud) :: waiters
ped=(set (pair ship desk)) :: dependencies
zam=scar :: opaque ducts
== ::
++ sign :: in result $-<
$% [%made p=(each beet (list tank))] :: by %ford
$% [%made p=(each bead (list tank))] :: by %ford
[%ruse p=curd] :: user wrapper
[%writ p=riot] :: by %clay
== ::
@ -148,12 +149,10 @@
==
?- -.q.hic
%cuff $(q.hic q.q.hic, law (limp p.q.hic law))
%mesh !!
%mess [law p.q.hic %mess q.q.hic]
%mush !!
%shah [law p.q.hic %shah q.q.hic]
%show [law p.q.hic %show q.q.hic]
%nuke [law p.q.hic %nuke ~]
%wait !!
==
abet:work:(quem:(boar:(goat hap) hen law) kon)
::
@ -185,7 +184,7 @@
:- [who syd ((hard case) p.lot)]
(flop tyl)
|= $: use=(unit (set monk)) :: observers
bid=bead :: position
bid=beam :: position
== ::
(beef:(gaur p.bid q.bid) use r.bid s.bid)
%+ bind
@ -379,7 +378,7 @@
%_(+>.$ ped.sat pen, mow :(weld new old mow))
::
++ drum :: raw dependencies
|= dep=(set bead)
|= dep=(set beam)
^+ +>
?> ?=(^ orm.sat)
%- drug
@ -466,6 +465,8 @@
::
++ morn :: successful boot
|= vax=vase
^+ +>
:: =. +> (give [%boot ~])
%_(+> huv.sat `vax)
::
++ mort :: failed boot
@ -503,7 +504,7 @@
::
[%rust *]
:^ %rust
((hard ,@da) +<.q.vig)
((hard chop) +<.q.vig)
((hard lode) +>-.q.vig)
(slot 15 vig)
==
@ -579,17 +580,9 @@
~& %yawn-show
?~ huv.sat
~& [%show-none our app]
gone:(give %boot ~)
gone:(give %done ~)
%^ game [%step %peer] u.huv.sat
!>([ost use | p.kon])
::
%shah
~& %yawn-shah
?~ huv.sat
~& [%show-none our app]
gone:(give %boot ~)
%^ game [%step %peer] u.huv.sat
!>([ost use & p.kon])
::
%take
~& %yawn-take

View File

@ -9090,7 +9090,8 @@
|%
++ arch ,[p=@uvI q=(unit ,@uvI) r=(map ,@ta ,~)] :: fundamental node
++ arvo (mold mill mill) :: arvo card
++ bead ,[[p=ship q=desk r=case] s=path] :: global name
++ beam ,[[p=ship q=desk r=case] s=path] :: global name
++ beak ,[p=ship q=desk r=case] :: garnish with beak
++ bone ,@ud :: opaque
++ care ?(%$ %u %v %w %x %y %z) :: namespace mode
++ case :: version
@ -9101,7 +9102,7 @@
++ desk ,@tas :: ship desk case spur
++ cage ,[p=lode q=vase] :: structured data
++ cuff :: permissions
$: p=(unit (set monk)) :: readers
$: p=kirk :: readers
q=(set monk) :: authors
== ::
++ curd ,[p=@tas q=*] :: typeless card
@ -9168,7 +9169,7 @@
++ pane (list ,[p=@tas q=vase]) :: kernel modules
++ pone (list ,[p=@tas q=vise]) :: kernel modules, old
++ ship ,@p :: network identity
++ sled $+ [(unit (set monk)) term bead] :: namespace function
++ sled $+ [(unit (set monk)) term beam] :: namespace function
(unit (unit cage)) ::
++ slut $+(* (unit (unit))) :: old namespace
++ vile :: reflexive constants
@ -9207,7 +9208,7 @@
++ slub !:
|= sul=slut
^- sled
|= [fur=(unit (set monk)) ron=term bed=bead]
|= [fur=(unit (set monk)) ron=term bed=beam]
^- (unit (unit cage))
=+ ^= pax ^- path
:* ron
@ -9357,7 +9358,7 @@
++ scry :: read namespace
|= $: fur=(unit (set monk))
ren=care
bed=bead
bed=beam
==
^- (unit (unit cage))
=+ ^= old
@ -9423,7 +9424,7 @@
|_ now=@da
++ beck
^- sled
|= [fur=(unit (set monk)) ron=term bed=bead]
|= [fur=(unit (set monk)) ron=term bed=beam]
^- (unit (unit cage))
=> .(fur ?^(fur fur `[[%& p.bed] ~ ~])) :: XX heinous
=+ lal=(end 3 1 ron)

View File

@ -1951,7 +1951,7 @@
::
++ tome :: parse path
|= pax=path
^- (unit bead)
^- (unit beam)
?. ?=([* * * *] pax) ~
%+ biff (slaw %p i.pax)
|= who=ship
@ -1960,10 +1960,10 @@
%+ biff (slay i.t.t.pax)
|= cis=coin
?. ?=([%$ case] cis) ~
`(unit bead)`[~ [who dex `case`p.cis] (flop t.t.t.pax)]
`(unit beam)`[~ [who dex `case`p.cis] (flop t.t.t.pax)]
::
++ tope :: bead to path
|= bem=bead
++ tope :: beam to path
|= bem=beam
^- path
[(scot %p p.bem) q.bem (scot r.bem) (flop s.bem)]
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -2022,8 +2022,9 @@
pot=tape :: prompt text
== ::
== ::
++ bead ,[p=(set beam) q=cage] :: computed result
++ beam ,[[p=ship q=desk r=case] s=path] :: global name
++ beak ,[p=ship q=desk r=case] :: garnish with beak
++ beet ,[p=(set bead) q=cage] :: computed result
++ bird :: packet in travel
$: gom=soap :: message identity
mup=@ud :: pktno in msg
@ -2226,11 +2227,9 @@
++ hiss ,[p=purl q=moth] :: outbound request
++ hist ,[p=@ud q=(list ,@t)] :: depth texts
++ hole ,@t :: session identity
++ hope (pair ,? path) :: view/subscribe
++ hook path :: request origin
++ hoot ,[p=? q=? r=(unit ,@ud) s=host] :: secure/mapped/host
++ hort ,[p=(unit ,@ud) q=host] :: http port/host
++ hose ,[p=(list tank) q=(unit vase) r=seam s=heir] :: http environment
++ host $%([& p=(list ,@t)] [| p=@if]) :: http host
++ httq :: raw http request
$: p=meth :: method
@ -2420,7 +2419,6 @@
++ rump ,[p=care q=case r=@tas s=path] :: relative path
++ rung $: rus=(map desk rede) :: neighbor desks
== ::
++ sash (pair term (unit hope)) :: web subscribe
++ saba ,[p=ship q=@tas r=moar s=(list nori)] :: patch/merge
++ sufi :: domestic host
$: hoy=(list ship) :: hierarchy
@ -2437,21 +2435,6 @@
foy=(unit ,[p=ship q=hole]) :: partner to notify
pus=(unit ,@ta) :: password
== ::
++ seam :: logical request
$% [%ape p=term q=@ud] :: await update
[%apg p=term q=logo r=path] :: app get
[%apl p=term q=@ud r=term] :: app poll
[%apm p=term q=json] :: app message
[%aps p=term q=term r=(unit path)] :: app subscribe
[%apu p=term q=logo r=octs] :: app upload
[%cog p=@ud q=@ud] :: console get
[%con p=@ud] :: console face
[%cop p=@ud q=@ud r=json] :: console put
[%det p=desk q=moat] :: load changes
[%fun p=term q=tube r=(list manx)] :: functional
[%lon p=seal] :: authentication flow
[%red p=purl] :: redirect
== ::
++ sect ?(%black %blue %red %orange %white) :: banner
++ shed :: packet flow
$: $: rtt=@dr :: smoothed rtt
@ -2472,11 +2455,11 @@
== ::
++ silk :: construction layer
$& [p=silk q=silk] :: cons
$% [%bake p=logo q=bead] :: local synthesis
[%boil p=logo q=bead] :: general synthesis
$% [%bake p=logo q=beam] :: local synthesis
[%boil p=logo q=beam] :: general synthesis
[%call p=silk q=silk] :: slam
[%cast p=logo q=beak r=silk] :: translate
[%done p=(set bead) q=cage] :: literal
[%done p=(set beam) q=cage] :: literal
[%mute p=silk q=(list (pair wing silk))] :: mutant
[%pass p=silk q=sill] :: twig construction
[%reef ~] :: kernel reef
@ -2484,7 +2467,7 @@
++ sill :: code construction
$% [%0 p=@] :: direct text
[%1 p=twig] :: direct twig
[%2 p=bead] :: bead over %hoon
[%2 p=beam] :: beam over %hoon
[%3 p=silk] :: build a %hoot
== ::
++ skit ,[p=(unit ,@ta) q=(list ,@ta) r=(list ,@ta)] :: tracking path