urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-07 05:26:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move silks around, etc.

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-07-12 11:24:52 -07:00
parent efde5692ed
commit ff5e56a05c
4 changed files with 76 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arvo/eyre.hoon
View File

@ -54,6 +54,12 @@
$% [| p=moat] :: $% [| p=moat] ::
== :: == ::
++ riff ,[p=desk q=(unit rave)] :: see %clay ++ riff ,[p=desk q=(unit rave)] :: see %clay
++ silk :: see %ford
$& [p=silk q=silk] ::
$% [%boil p=logo q=beam r=path] ::
[%cast p=logo q=beak r=silk] ::
[%done p=(set beam) q=cage] ::
== ::
++ sign :: in result $<- ++ sign :: in result $<-
$? $: %a :: by %ames $? $: %a :: by %ames
$% [%send p=lane q=@] :: $% [%send p=lane q=@] ::
@ -989,11 +995,11 @@
?: ?=(%helo -.+.sih) ?: ?=(%helo -.+.sih)
%+ joba %helo %+ joba %helo
%- jobe %- jobe
:~ [%path [%a `(list jval)`(turn p.+.sih |=(a=@ta [%s a]))]] :~ [%path [%a `(list json)`(turn p.+.sih |=(a=@ta [%s a]))]]
[%prod ~[%a [%s p.q.+.sih] (jape q.q.+.sih) (jape r.q.+.sih)]] [%prod ~[%a [%s p.q.+.sih] (jape q.q.+.sih) (jape r.q.+.sih)]]
== ==
%+ joba %text %+ joba %text
:- %a ^- (list jval) :- %a ^- (list json)
?+ -.+.sih ~|(-.+.sih !!) ?+ -.+.sih ~|(-.+.sih !!)
%tell (turn p.+.sih |=(a=@t [%s a])) %tell (turn p.+.sih |=(a=@t [%s a]))
%text [%s (crip p.+.sih)]~ %text [%s (crip p.+.sih)]~

46
arvo/ford.hoon
View File

@ -1,3 +1,4 @@
::::::
:: :: %ford, new execution control :: :: %ford, new execution control
!? 164 !? 164
:::: ::::
@ -9,6 +10,21 @@
++ gift :: out result <-$ ++ gift :: out result <-$
$% [%made p=(each bead (list tank))] :: computed result $% [%made p=(each bead (list tank))] :: computed result
== :: == ::
++ hood :: assembly plan
$: sum=@t :: summary text
mol=(map term beam) :: models
res=(map logo (map term beam)) :: data resources
sys=$|(@ud [@ud @ud]) :: system version
gel=(list hoop) :: telescoping stack
== ::
++ hoop :: source in hood
$% [%code p=twig] :: direct twig
[%cone p=beam] :: core from folder
[%coop p=(map term hoop)] :: complex core
[%hood p=hood] :: recursive hood
[%hoon p=beam] :: load %hoon
[%text p=@] :: direct text
== ::
++ kiss :: in request ->$ ++ kiss :: in request ->$
$% [%exec p=@p q=(unit silk)] :: make / kill $% [%exec p=@p q=(unit silk)] :: make / kill
== :: == ::
@ -26,6 +42,31 @@
$% $: %c :: by %clay $% $: %c :: by %clay
$% [%writ p=riot] :: $% [%writ p=riot] ::
== == == :: == == == ::
++ silk :: construction layer
$& [p=silk q=silk] :: cons
$% [%bake p=logo q=beam r=path] :: local synthesis
[%boil p=logo q=beam r=path] :: general synthesis
[%brew p=logo q=beam r=path] :: specific synthesis
[%call p=silk q=silk] :: slam
[%cast p=logo q=beak r=silk] :: translate
[%done p=(set beam) q=cage] :: literal
[%dude p=tank q=silk] :: error wrap
[%dune p=(set beam) q=(unit cage)] :: unit literal
[%mute p=silk q=(list (pair wing silk))] :: mutant
[%reef ~] :: kernel reef
[%ride p=silk q=sill] :: twig construction
[%vale p=logo q=sack r=*] :: validate [our his]
== ::
++ sill :: code construction
$& [p=sill q=sill] :: compose
$% [%dire p=@] :: direct text
[%dirt p=twig] :: direct twig
[%dish p=toga q=sill] :: tislus
[%disk p=(list sill)] :: pipe
[%drag p=beam q=path] :: beam to %hoon
[%drug p=silk] :: indirect twig
[%dust p=silk] :: literal value
== ::
-- :: -- ::
|% :: structures |% :: structures
++ axle :: all %ford state ++ axle :: all %ford state
@ -516,8 +557,6 @@
|= [cof=cafe too=logo for=logo bek=beak vax=vase] |= [cof=cafe too=logo for=logo bek=beak vax=vase]
^- (bolt vase) ^- (bolt vase)
?: =(too for) (fine cof vax) ?: =(too for) (fine cof vax)
?: &(=(%hoot too) =(%hoon for))
(fine cof !>(ream))
?: |(=(%noun for) =(%$ for)) ?: |(=(%noun for) =(%$ for))
%+ cope ((lake too bek) cof vax) %+ cope ((lake too bek) cof vax)
|= [cof=cafe vux=(unit vase)] |= [cof=cafe vux=(unit vase)]
@ -533,7 +572,7 @@
^- (bolt (unit (list ,@tas))) ^- (bolt (unit (list ,@tas)))
=| war=(set ,@tas) =| war=(set ,@tas)
=< -:(apex (fine cof fro)) =< -:(apex (fine cof fro))
|% :: XX improve monads |%
++ apex ++ apex
|= rof=(bolt (list ,@tas)) |= rof=(bolt (list ,@tas))
^- [(bolt (unit (list ,@tas))) _+>] ^- [(bolt (unit (list ,@tas))) _+>]
@ -602,7 +641,6 @@
(fine cof [p.kas u.vux]) (fine cof [p.kas u.vux])
:: ::
%boil %boil
~& [%boil p/p.kas q/q.kas r/r.kas ~]
%+ cool |.(leaf/"ford: boil {<p.kas>} {<(tope q.kas)>} {<r.kas>}") %+ cool |.(leaf/"ford: boil {<p.kas>} {<(tope q.kas)>} {<r.kas>}")
%+ cope (lime cof p.kas q.kas r.kas) %+ cope (lime cof p.kas q.kas r.kas)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]

12
arvo/gall.hoon
View File

@ -106,6 +106,18 @@
ped=(set (pair ship desk)) :: active depends ped=(set (pair ship desk)) :: active depends
zam=scar :: opaque ducts zam=scar :: opaque ducts
== :: == ::
++ silk :: see %ford
$& [p=silk q=silk] ::
$% [%boil p=logo q=beam r=path] ::
[%call p=silk q=silk] ::
[%done p=(set beam) q=cage] ::
[%mute p=silk q=(list (pair wing silk))] ::
[%ride p=silk q=sill] ::
[%vale p=logo q=sack r=*] ::
== ::
++ sill :: see %ford
$% [%dirt p=twig] ::
== ::
++ sign :: in result $<- ++ sign :: in result $<-
$? [?(%b %c %d %e) @tas *] :: $? [?(%b %c %d %e) @tas *] ::
$: %a :: by %ames $: %a :: by %ames

54
arvo/zuse.hoon
View File

@ -498,7 +498,7 @@
++ apex :: JSON object ++ apex :: JSON object
;~(pose abox obox) ;~(pose abox obox)
++ valu :: JSON value ++ valu :: JSON value
%+ knee *jval |. ~+ %+ knee *json |. ~+
;~ pfix spac ;~ pfix spac
;~ pose ;~ pose
(cold ~ (jest 'null')) (cold ~ (jest 'null'))
@ -511,11 +511,11 @@
== ==
:: JSON arrays :: JSON arrays
++ arra (ifix [sel (ws ser)] (more (ws com) valu)) ++ arra (ifix [sel (ws ser)] (more (ws com) valu))
++ abox (cook |=(elts=(list jval) [%a p=elts]) arra) ++ abox (cook |=(elts=(list json) [%a p=elts]) arra)
:: JSON objects :: JSON objects
++ pair ;~((comp |=([k=@ta v=jval] [k v])) ;~(sfix (ws stri) (ws col)) valu) ++ pair ;~((comp |=([k=@ta v=json] [k v])) ;~(sfix (ws stri) (ws col)) valu)
++ obje (ifix [(ws kel) (ws ker)] (more (ws com) pair)) ++ obje (ifix [(ws kel) (ws ker)] (more (ws com) pair))
++ obox (cook |=(s=(list ,[@ta jval]) [%o p=(mo s)]) obje) ++ obox (cook |=(s=(list ,[@ta json]) [%o p=(mo s)]) obje)
:: JSON booleans :: JSON booleans
++ bool ;~(pose (cold & (jest 'true')) (cold | (jest 'false'))) ++ bool ;~(pose (cold & (jest 'true')) (cold | (jest 'false')))
:: JSON strings :: JSON strings
@ -583,7 +583,7 @@
-- --
:: ::
++ pojo :: print json ++ pojo :: print json
|= val=jval |= val=json
^- tape ^- tape
?~ val "null" ?~ val "null"
?- -.val ?- -.val
@ -786,23 +786,23 @@
-- --
:: ::
++ joba ++ joba
|= [p=@t q=jval] |= [p=@t q=json]
^- json ^- json
[%o [[p q] ~ ~]] [%o [[p q] ~ ~]]
:: ::
++ jobe ++ jobe
|= a=(list ,[p=@t q=jval]) |= a=(list ,[p=@t q=json])
^- json ^- json
[%o (~(gas by *(map ,@t jval)) a)] [%o (~(gas by *(map ,@t json)) a)]
:: ::
++ jape ++ jape
|= a=tape |= a=tape
^- jval ^- json
[%s (crip a)] [%s (crip a)]
:: ::
++ jone ++ jone
|= a=@ |= a=@
^- jval ^- json
:- %n :- %n
?: =(0 a) '0' ?: =(0 a) '0'
(crip (flop |-(^-(tape ?:(=(0 a) ~ [(add '0' (mod a 10)) $(a (div a 10))]))))) (crip (flop |-(^-(tape ?:(=(0 a) ~ [(add '0' (mod a 10)) $(a (div a 10))])))))
@ -1432,7 +1432,7 @@
++ dusk :: apply reverse ++ dusk :: apply reverse
|= nyp=soba |= nyp=soba
(durn (curl nyp)) (durn (curl nyp))
-- --
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 3bF, names etc :: :: section 3bF, names etc ::
:: ::
@ -1480,7 +1480,7 @@
:: ::
++ folk :: silk construction ++ folk :: silk construction
|= [hom=path raw=path] |= [hom=path raw=path]
|* yox=$+((pair beam path) silk) |* yox=$+((pair beam path) *)
(yox (fain hom raw)) (yox (fain hom raw))
:: ::
++ fuel :: parse fcgi ++ fuel :: parse fcgi
@ -2398,7 +2398,6 @@
++ hiss ,[p=purl q=moth] :: outbound request ++ hiss ,[p=purl q=moth] :: outbound request
++ hist ,[p=@ud q=(list ,@t)] :: depth texts ++ hist ,[p=@ud q=(list ,@t)] :: depth texts
++ hole ,@t :: session identity ++ hole ,@t :: session identity
++ hook path :: request origin
++ hoot ,[p=? q=(unit ,@ud) r=host] :: secure/port/host ++ hoot ,[p=? q=(unit ,@ud) r=host] :: secure/port/host
++ hort ,[p=(unit ,@ud) q=host] :: http port/host ++ hort ,[p=(unit ,@ud) q=host] :: http port/host
++ host $%([& p=(list ,@t)] [| p=@if]) :: http host ++ host $%([& p=(list ,@t)] [| p=@if]) :: http host
@ -2423,11 +2422,10 @@
[%n p=@ta] :: number [%n p=@ta] :: number
[%s p=@ta] :: string [%s p=@ta] :: string
== :: == ::
++ jsot :: strict JSON top ++ jsot :: strict json top
$% [%a p=(list json)] :: array $% [%a p=(list json)] :: array
[%o p=(map ,@t json)] :: object [%o p=(map ,@t json)] :: object
== :: == ::
++ jval json :: compatibility XX
++ lamb :: short path ++ lamb :: short path
$% [& p=@tas] :: auto $% [& p=@tas] :: auto
[| p=twig] :: manual [| p=twig] :: manual
@ -2602,31 +2600,6 @@
puq=(qeu ,[p=@ud q=soul]) :: packet queue puq=(qeu ,[p=@ud q=soul]) :: packet queue
== :: == ::
== :: == ::
++ silk :: construction layer
$& [p=silk q=silk] :: cons
$% [%bake p=logo q=beam r=path] :: local synthesis
[%boil p=logo q=beam r=path] :: general synthesis
[%brew p=logo q=beam r=path] :: specific synthesis
[%call p=silk q=silk] :: slam
[%cast p=logo q=beak r=silk] :: translate
[%done p=(set beam) q=cage] :: literal
[%dude p=tank q=silk] :: error wrap
[%dune p=(set beam) q=(unit cage)] :: unit literal
[%mute p=silk q=(list (pair wing silk))] :: mutant
[%reef ~] :: kernel reef
[%ride p=silk q=sill] :: twig construction
[%vale p=logo q=sack r=*] :: validate [our his]
== ::
++ sill :: code construction
$& [p=sill q=sill] :: compose
$% [%dire p=@] :: direct text
[%dirt p=twig] :: direct twig
[%dish p=toga q=sill] :: tislus
[%disk p=(list sill)] :: pipe
[%drag p=beam q=path] :: beam to %hoon
[%drug p=silk] :: indirect twig
[%dust p=silk] :: literal value
== ::
++ skit ,[p=(unit ,@ta) q=(list ,@ta) r=(list ,@ta)] :: tracking path ++ skit ,[p=(unit ,@ta) q=(list ,@ta) r=(list ,@ta)] :: tracking path
++ skin ?(%none %open %fast %full) :: encoding stem ++ skin ?(%none %open %fast %full) :: encoding stem
++ slip ,[p=path q=goal] :: traceable request ++ slip ,[p=path q=goal] :: traceable request
@ -2671,4 +2644,5 @@
++ wund (list ,[p=life q=ring r=acru]) :: mace in action ++ wund (list ,[p=life q=ring r=acru]) :: mace in action
++ will (list deed) :: certificate ++ will (list deed) :: certificate
++ worm ,* :: vase of tart ++ worm ,* :: vase of tart
++ zuse 314 :: hoon/zuse kelvin
-- --