ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-01 11:33:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Final syllable renaming.

Browse Source
This commit is contained in:
C. Guy Yarvin 2018-03-13 21:36:10 -07:00
parent fa6036b478
commit 5c8a77fe90
6 changed files with 185 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/dojo.hoon
View File

@ -176,7 +176,7 @@
== ==
== ==
:: ::
;~ pfix fas ;~ pfix net
;~ pose ;~ pose
(dp-variable (cold %sur hep) ;~(pfix gap dp-hooves)) (dp-variable (cold %sur hep) ;~(pfix gap dp-hooves))
(dp-variable (cold %lib lus) ;~(pfix gap dp-hooves)) (dp-variable (cold %lib lus) ;~(pfix gap dp-hooves))
@ -201,8 +201,8 @@
++ dp-sink ++ dp-sink
;~ pose ;~ pose
;~(plug (cold %file tar) dp-beam) ;~(plug (cold %file tar) dp-beam)
;~(plug (cold %flat pat) (most fas sym)) ;~(plug (cold %flat hat) (most net sym))
;~(plug (cold %pill dot) (most fas sym)) ;~(plug (cold %pill dot) (most net sym))
;~(plug (cold %http lus) (stag %post dp-iden-url)) ;~(plug (cold %http lus) (stag %post dp-iden-url))
;~(plug (cold %http hep) (stag %put dp-iden-url)) ;~(plug (cold %http hep) (stag %put dp-iden-url))
(stag %show (cook $?($1 $2 $3) (cook lent (stun [1 3] wut)))) (stag %show (cook $?($1 $2 $3) (cook lent (stun [1 3] wut))))
@ -215,8 +215,8 @@
:(stag %sand %f ;~(pose (cold %| tar) (easy %&))) :(stag %sand %f ;~(pose (cold %| tar) (easy %&)))
:(stag %sand %tas sym) :(stag %sand %tas sym)
%- dp-hoon-punt %- dp-hoon-punt
;~ (glue fas) ;~ (glue net)
;~(pfix fas (sear dp-case-hoon nuck:so)) ;~(pfix net (sear dp-case-hoon nuck:so))
(stag %sand ;~(plug (cold %p sig) fed:ag)) (stag %sand ;~(plug (cold %p sig) fed:ag))
== ==
== ==
@ -237,7 +237,7 @@
;~ pose ;~ pose
;~(plug (cold %ur lus) dp-iden-url) ;~(plug (cold %ur lus) dp-iden-url)
;~(plug (cold %ge lus) dp-model) ;~(plug (cold %ge lus) dp-model)
;~(plug (cold %as pam) sym ;~(pfix ace dp-source)) ;~(plug (cold %as pad) sym ;~(pfix ace dp-source))
;~(plug (cold %do cab) dp-hoon ;~(pfix ace dp-source)) ;~(plug (cold %do cab) dp-hoon ;~(pfix ace dp-source))
dp-value dp-value
== ==
@ -247,7 +247,7 @@
;~ pose ;~ pose
;~ plug ;~ plug
;~(pfix sig fed:ag) ;~(pfix sig fed:ag)
;~(pose ;~(pfix fas sym) (easy dp-default-app)) ;~(pose ;~(pfix net sym) (easy dp-default-app))
== ==
%+ stag our.hid %+ stag our.hid
;~(pose sym (easy dp-default-app)) ;~(pose sym (easy dp-default-app))
@ -264,7 +264,7 @@
:: ::
++ dp-model ;~(plug dp-server dp-config) :: ++dojo-model ++ dp-model ;~(plug dp-server dp-config) :: ++dojo-model
++ dp-path (en-beam he-beam) :: ++path ++ dp-path (en-beam he-beam) :: ++path
++ dp-server (stag 0 (most fas sym)) :: ++dojo-server ++ dp-server (stag 0 (most net sym)) :: ++dojo-server
++ dp-hoon tall:(vang | dp-path) :: ++hoon ++ dp-hoon tall:(vang | dp-path) :: ++hoon
++ dp-rood :: 'dir' hoon ++ dp-rood :: 'dir' hoon
=> (vang | (en-beam dir)) => (vang | (en-beam dir))
@ -280,9 +280,9 @@
== ==
++ dp-value :: ++dojo-source ++ dp-value :: ++dojo-source
;~ pose ;~ pose
(stag %sa ;~(pfix tar pam sym)) (stag %sa ;~(pfix tar pad sym))
(stag %ex dp-hoon) (stag %ex dp-hoon)
(stag %tu (ifix [sel ser] (most ace dp-source))) (stag %tu (ifix [lac rac] (most ace dp-source)))
== ==
:: ::
++ dp-config :: ++dojo-config ++ dp-config :: ++dojo-config
@ -1624,7 +1624,7 @@
$get-api $get-api
:* %ex :* %ex
%dtkt %dtkt
[%bcsm [%wing ~[%json]]] [%bcmc [%wing ~[%json]]]
:* %clsg :* %clsg
[%rock %tas %gx] [%rock %tas %gx]
[%sand %ta (scot %p our.hid)] [%sand %ta (scot %p our.hid)]

16
app/talk.hoon
View File

@ -641,14 +641,14 @@
;~ pose ;~ pose
(cold incir col) (cold incir col)
;~(pfix cen (stag self urs:ab)) ;~(pfix cen (stag self urs:ab))
;~(pfix fas (stag (sein:title self) urs:ab)) ;~(pfix net (stag (sein:title self) urs:ab))
:: ::
%+ cook %+ cook
|= {a/@p b/(unit term)} |= {a/@p b/(unit term)}
[a ?^(b u.b %inbox)] [a ?^(b u.b %inbox)]
;~ plug ;~ plug
ship ship
(punt ;~(pfix fas urs:ab)) (punt ;~(pfix net urs:ab))
== ==
== ==
:: ::
@ -692,11 +692,11 @@
:: ::
++ rang :< subscription range ++ rang :< subscription range
=+ ;~ pose =+ ;~ pose
(cook some ;~(pfix fas (pont |))) (cook some ;~(pfix net (pont |)))
(easy ~) (easy ~)
== ==
;~ pose ;~ pose
(cook some ;~(plug ;~(pfix fas (pont &)) -)) (cook some ;~(plug ;~(pfix net (pont &)) -))
(easy ~) (easy ~)
== ==
:: ::
@ -705,7 +705,7 @@
(most ;~(plug com (star ace)) ;~(plug circ rang)) (most ;~(plug com (star ace)) ;~(plug circ rang))
:: ::
++ pick :< message reference ++ pick :< message reference
;~(pose nump (cook lent (star sem))) ;~(pose nump (cook lent (star mic)))
:: ::
++ nump :< number reference ++ nump :< number reference
;~ pose ;~ pose
@ -736,8 +736,8 @@
%+ most (jest '•') %+ most (jest '•')
;~ pose ;~ pose
(stag %url aurf:de-purl:html) (stag %url aurf:de-purl:html)
:(stag %lin & ;~(pfix pat text)) :(stag %lin & ;~(pfix hat text))
:(stag %lin | ;~(less sem hax text)) :(stag %lin | ;~(less mic hax text))
== ==
:: ::
++ text :< msg without break ++ text :< msg without break
@ -755,7 +755,7 @@
== ==
++ work :< full input ++ work :< full input
%+ knee *^work |. ~+ %+ knee *^work |. ~+
=- ;~(pose ;~(pfix sem -) message) =- ;~(pose ;~(pfix mic -) message)
;~ pose ;~ pose
:: ::
:: circle management :: circle management

4
lib/hall-legacy.hoon
View File

@ -122,9 +122,9 @@
++ parn ++ parn
^- $-(nail (like partner)) ^- $-(nail (like partner))
%+ pick %+ pick
;~((glue fas) ;~(pfix sig fed:ag) urs:ab) ;~((glue net) ;~(pfix sig fed:ag) urs:ab)
%+ sear (soft passport) %+ sear (soft passport)
;~((glue fas) sym urs:ab) :: XX [a-z0-9_]{1,15} ;~((glue net) sym urs:ab) :: XX [a-z0-9_]{1,15}
:: ::
++ stam (ot date+di bouquet+(as (ar so)) speech+spec ~) ++ stam (ot date+di bouquet+(as (ar so)) speech+spec ~)
++ spec ++ spec

264
sys/hoon.hoon
View File

@ -4716,41 +4716,29 @@
++ cen (just '%') ++ cen (just '%')
++ col (just ':') ++ col (just ':')
++ com (just ',') ++ com (just ',')
++ doq (just '"') :: toc
++ toc (just '"') :: toc
++ dot (just '.') ++ dot (just '.')
++ fas (just '/') :: net
++ net (just '/') :: net
++ gal (just '<') ++ gal (just '<')
++ gar (just '>') ++ gar (just '>')
++ hat (just '@')
++ hax (just '#') ++ hax (just '#')
++ kel (just '{') :: lef
++ lef (just '{') :: lef
++ ker (just '}') :: ref
++ ref (just '}') :: ref
++ ket (just '^')
++ lus (just '+')
++ hep (just '-') ++ hep (just '-')
++ pel (just '(') :: lit ++ ket (just '^')
++ lit (just '(') :: lit ++ lef (just '{')
++ pam (just '&') :: pad ++ lit (just '(')
++ pad (just '&') :: pad ++ lac (just '[')
++ per (just ')') :: rit ++ lus (just '+')
++ rit (just ')') :: rit ++ mic (just ';')
++ pat (just '@') :: hat ++ net (just '/')
++ hat (just '@') :: hat ++ pad (just '&')
++ sel (just '[') :: lac ++ rac (just ']')
++ lac (just '[') :: lac ++ ref (just '}')
++ sem (just ';') :: mic ++ rit (just ')')
++ mic (just ';') :: mic ++ say (just '\'')
++ ser (just ']') :: rac
++ rac (just ']') :: rac
++ sig (just '~') ++ sig (just '~')
++ soq (just '\'') :: say
++ say (just '\'') :: say
++ tar (just '*') ++ tar (just '*')
++ tec (just '`') ++ tec (just '`')
++ tis (just '=') ++ tis (just '=')
++ toc (just '"')
++ wut (just '?') ++ wut (just '?')
++ zap (just '!') ++ zap (just '!')
:: ::
@ -4778,7 +4766,7 @@
== ==
++ gaw (cold ~ (star ;~(pose vul gah))) :: classic white ++ gaw (cold ~ (star ;~(pose vul gah))) :: classic white
++ gay ;~(pose gap (easy ~)) :: ++ gay ;~(pose gap (easy ~)) ::
++ gon ;~(pose ;~(plug bas gay fas) (easy ~)) :: long numbers \ / ++ gon ;~(pose ;~(plug bas gay net) (easy ~)) :: long numbers \ /
++ gul ;~(pose (cold 2 gal) (cold 3 gar)) :: axis syntax < > ++ gul ;~(pose (cold 2 gal) (cold 3 gar)) :: axis syntax < >
++ hex (bass 16 (most gon hit)) :: hex to atom ++ hex (bass 16 (most gon hit)) :: hex to atom
++ hig (shim 'A' 'Z') :: uppercase ++ hig (shim 'A' 'Z') :: uppercase
@ -4819,13 +4807,13 @@
;~(less ;~(plug (just `@`10) soz) (just `@`10)) ;~(less ;~(plug (just `@`10) soz) (just `@`10))
== ==
++ qit ;~ pose :: chars in a cord ++ qit ;~ pose :: chars in a cord
;~(less bas soq prn) ;~(less bas say prn)
;~(pfix bas ;~(pose bas soq mes)) :: escape chars ;~(pfix bas ;~(pose bas say mes)) :: escape chars
== ==
++ qut ;~ simu soq :: cord ++ qut ;~ simu say :: cord
;~ pose ;~ pose
;~ less soz ;~ less soz
(ifix [soq soq] (boss 256 (more gon qit))) (ifix [say say] (boss 256 (more gon qit)))
== ==
=+ hed=;~(pose ;~(plug (plus ace) vul) (just '\0a')) =+ hed=;~(pose ;~(plug (plus ace) vul) (just '\0a'))
%- iny %+ ifix %- iny %+ ifix
@ -4834,7 +4822,7 @@
(boss 256 (star qat)) (boss 256 (star qat))
== ==
== ==
++ soz ;~(plug soq soq soq) :: delimiting ''' ++ soz ;~(plug say say say) :: delimiting '''
++ sym :: symbol ++ sym :: symbol
%+ cook %+ cook
|=(a/tape (rap 3 ^-((list @) a))) |=(a/tape (rap 3 ^-((list @) a)))
@ -4930,7 +4918,7 @@
(cook tuft (ifix [sig dot] hex)) (cook tuft (ifix [sig dot] hex))
;~(pfix sig ;~(pose sig dot)) ;~(pfix sig ;~(pose sig dot))
== ==
++ voy ;~(pfix bas ;~(pose bas soq bix)) ++ voy ;~(pfix bas ;~(pose bas say bix))
-- --
++ ag ++ ag
|% |%
@ -5403,7 +5391,7 @@
++ spat |=(pax/path (crip (spud pax))) :: render path to cord ++ spat |=(pax/path (crip (spud pax))) :: render path to cord
++ spud |=(pax/path ~(ram re (smyt pax))) :: render path to tape ++ spud |=(pax/path ~(ram re (smyt pax))) :: render path to tape
++ stab :: parse cord to path ++ stab :: parse cord to path
=+ fel=;~(pfix fas (more fas urs:ab)) =+ fel=;~(pfix net (more net urs:ab))
|=(zep/@t `path`(rash zep fel)) |=(zep/@t `path`(rash zep fel))
:: ::
:::: 4n: virtualization :::: 4n: virtualization
@ -5628,13 +5616,13 @@
++ plan :: data structure ++ plan :: data structure
$% {$base p/base} :: base type $% {$base p/base} :: base type
{$bccb p/hoon} :: example {$bccb p/hoon} :: example
{$bccl p/{i/plan t/(list plan)}} :: aka row {$bccl p/{i/plan t/(list plan)}} :: tuple
{$bccn p/{i/plan t/(list plan)}} :: selection {$bccn p/{i/plan t/(list plan)}} :: selection
{$bchp p/plan q/plan} :: function type {$bchp p/plan q/plan} :: function type
{$bckt p/plan q/plan} :: pair+tag {$bckt p/plan q/plan} :: pair+tag
{$bcpt p/plan q/plan} :: atom+cell {$bcht p/plan q/plan} :: atom+cell
{$bcsg p/hoon q/plan} :: default {$bcsg p/hoon q/plan} :: default
{$bcsm p/hoon} :: assembly {$bcmc p/hoon} :: assembly
{$bcts p/toga q/plan} :: name {$bcts p/toga q/plan} :: name
{$bcwt p/{i/plan t/(list plan)}} :: plain selection {$bcwt p/{i/plan t/(list plan)}} :: plain selection
{$dbug p/spot q/plan} :: set debug {$dbug p/spot q/plan} :: set debug
@ -6777,7 +6765,7 @@
{$bchp *} :: see under %bccb {$bchp *} :: see under %bccb
:: ::
[%rock %n 0] [%rock %n 0]
{$bcsm *} :: borrow sample {$bcmc *} :: borrow sample
:: ::
[%tsgl [%$ 6] p.mod] [%tsgl [%$ 6] p.mod]
{$bccn *} :: use last entry {$bccn *} :: use last entry
@ -6787,7 +6775,7 @@
$(i.p.mod i.t.p.mod, t.p.mod t.t.p.mod) $(i.p.mod i.t.p.mod, t.p.mod t.t.p.mod)
{$leaf *} [%rock p.mod q.mod] {$leaf *} [%rock p.mod q.mod]
{$halo *} $(mod q.mod) {$halo *} $(mod q.mod)
{$bcpt *} $(mod p.mod) {$bcht *} $(mod p.mod)
{$bccl *} |- ^- hoon {$bccl *} |- ^- hoon
?~ t.p.mod ^$(mod i.p.mod) ?~ t.p.mod ^$(mod i.p.mod)
:- ^$(mod i.p.mod) :- ^$(mod i.p.mod)
@ -6820,7 +6808,7 @@
?- mod ?- mod
{$base *} & {$base *} &
{$bcts *} clean(mod q.mod) {$bcts *} clean(mod q.mod)
{$bcsm *} | {$bcmc *} |
{$dbug *} clean(mod q.mod) {$dbug *} clean(mod q.mod)
{$bcsg *} | {$bcsg *} |
{$bchp *} &(clean(mod p.mod) clean(mod q.mod)) {$bchp *} &(clean(mod p.mod) clean(mod q.mod))
@ -6841,7 +6829,7 @@
== ==
{$leaf *} & {$leaf *} &
{$halo *} clean(mod q.mod) {$halo *} clean(mod q.mod)
{$bcpt *} &(clean(mod p.mod) clean(mod q.mod)) {$bcht *} &(clean(mod p.mod) clean(mod q.mod))
{$bckt *} &(clean(mod p.mod) clean(mod q.mod)) {$bckt *} &(clean(mod p.mod) clean(mod q.mod))
{$bccb *} | {$bccb *} |
== ==
@ -6860,7 +6848,7 @@
:: ::
{$base *} (decorate (basal p.mod)) {$base *} (decorate (basal p.mod))
{$bcts *} (decorate [%ktts p.mod example:clear(mod q.mod)]) {$bcts *} (decorate [%ktts p.mod example:clear(mod q.mod)])
{$bcsm *} (decorate (home [%tsgl [%limb %$] p.mod])) {$bcmc *} (decorate (home [%tsgl [%limb %$] p.mod]))
{$bcsg *} [%ktls example(mod q.mod) (home p.mod)] {$bcsg *} [%ktls example(mod q.mod) (home p.mod)]
{$dbug *} example(mod q.mod, bug [p.mod bug]) {$dbug *} example(mod q.mod, bug [p.mod bug])
{$bchp *} (decorate (function:clear p.mod q.mod)) {$bchp *} (decorate (function:clear p.mod q.mod))
@ -6885,7 +6873,7 @@
?: ?=($dbug -.mod) factory(mod q.mod, bug [p.mod bug]) ?: ?=($dbug -.mod) factory(mod q.mod, bug [p.mod bug])
?: ?=($bcsg -.mod) factory(mod q.mod, def `p.mod) ?: ?=($bcsg -.mod) factory(mod q.mod, def `p.mod)
^- hoon ^- hoon
?: ?=([%bcsm *] mod) ?: ?=([%bcmc *] mod)
:: don't re-indirect through handmade molds :: don't re-indirect through handmade molds
:: ::
(home p.mod) (home p.mod)
@ -7114,7 +7102,7 @@
:: ::
:: synthesis, $; :: synthesis, $;
:: ::
{$bcsm *} {$bcmc *}
(decorate [%cncl (home p.mod) fetch ~]) (decorate [%cncl (home p.mod) fetch ~])
:: ::
:: tuple, $: :: tuple, $:
@ -7158,7 +7146,7 @@
:: ::
:: branch, $@ :: branch, $@
:: ::
{$bcpt *} {$bcht *}
%- decorate %- decorate
?@ top ?@ top
?: =(%| top) ?: =(%| top)
@ -7669,7 +7657,7 @@
[%tsgl [%$ 2] [%limb %a]] [%tsgl [%$ 2] [%limb %a]]
:+ %kthp :+ %kthp
:+ %bcts p.p.gen :+ %bcts p.p.gen
[%bcsm [%tsgr [%limb %v] [%bccm u.q.p.gen]]] [%bcmc [%tsgr [%limb %v] [%bccm u.q.p.gen]]]
[%tsgl [%$ 2] [%limb %a]] [%tsgl [%$ 2] [%limb %a]]
[%limb %v] [%limb %v]
s.gen s.gen
@ -7726,7 +7714,7 @@
{$wtts *} [%fits ~(bunt ax fab p.gen) q.gen] {$wtts *} [%fits ~(bunt ax fab p.gen) q.gen]
{$wtzp *} [%wtcl p.gen [%rock %f 1] [%rock %f 0]] {$wtzp *} [%wtcl p.gen [%rock %f 1] [%rock %f 0]]
{$zpgr *} {$zpgr *}
[%cncl [%limb %onan] [%zpmc [%bcdt [%bcsm %limb %abel]] p.gen] ~] [%cncl [%limb %onan] [%zpmc [%bcdt [%bcmc %limb %abel]] p.gen] ~]
:: ::
{$zpwt *} {$zpwt *}
?: ?: ?=(@ p.gen) ?: ?: ?=(@ p.gen)
@ -7785,6 +7773,7 @@
$$ (lead -.gen %.(+.gen noop)) $$ (lead -.gen %.(+.gen noop))
$base (lead -.gen %.(+.gen noop)) $base (lead -.gen %.(+.gen noop))
$bcdt (lead -.gen %.(+.gen stir)) $bcdt (lead -.gen %.(+.gen stir))
$bccm (lead -.gen %.(+.gen stir))
$bust (lead -.gen %.(+.gen noop)) $bust (lead -.gen %.(+.gen noop))
$docs (lead -.gen %.(+.gen nexp)) $docs (lead -.gen %.(+.gen nexp))
$dbug (lead -.gen %.(+.gen nexp)) $dbug (lead -.gen %.(+.gen nexp))
@ -7799,16 +7788,6 @@
$tune (lead -.gen %.(+.gen tung)) $tune (lead -.gen %.(+.gen tung))
$wing (lead -.gen %.(+.gen noop)) $wing (lead -.gen %.(+.gen noop))
$yell (lead -.gen %.(+.gen moar)) $yell (lead -.gen %.(+.gen moar))
$bcpt (lead -.gen %.(+.gen dubs))
$bccb (lead -.gen %.(+.gen expr))
$bccl (lead -.gen %.(+.gen (twin expr moar)))
$bccn (lead -.gen %.(+.gen (twin expr moar)))
$bchp (lead -.gen %.(+.gen dubs))
$bckt (lead -.gen %.(+.gen dubs))
$bcsg (lead -.gen %.(+.gen dubs))
$bcwt (lead -.gen %.(+.gen (twin expr moar)))
$bcts (lead -.gen %.(+.gen nexp))
$bcsm (lead -.gen %.(+.gen expr))
$brcb (lead -.gen %.(+.gen (quad noop stir exps arms))) $brcb (lead -.gen %.(+.gen (quad noop stir exps arms)))
$brcl (lead -.gen %.(+.gen (twin noop dubs))) $brcl (lead -.gen %.(+.gen (twin noop dubs)))
$brcn (lead -.gen %.(+.gen (twin noop arms))) $brcn (lead -.gen %.(+.gen (twin noop arms)))
@ -7848,7 +7827,6 @@
$ktsg (lead -.gen %.(+.gen expr)) $ktsg (lead -.gen %.(+.gen expr))
$ktts (lead -.gen %.(+.gen nexp)) $ktts (lead -.gen %.(+.gen nexp))
$ktwt (lead -.gen %.(+.gen expr)) $ktwt (lead -.gen %.(+.gen expr))
$bccm (lead -.gen %.(+.gen stir))
$sgbr (lead -.gen %.(+.gen dubs)) $sgbr (lead -.gen %.(+.gen dubs))
$sgcb (lead -.gen %.(+.gen dubs)) $sgcb (lead -.gen %.(+.gen dubs))
$crap (lead -.gen %.(+.gen (raid expr))) $crap (lead -.gen %.(+.gen (raid expr)))
@ -10492,7 +10470,7 @@
++ gash %+ cook :: parse path ++ gash %+ cook :: parse path
|= a/(list tyke) ^- tyke |= a/(list tyke) ^- tyke
?~(a ~ (weld i.a $(a t.a))) ?~(a ~ (weld i.a $(a t.a)))
(more fas limp) (more net limp)
++ gasp ;~ pose :: parse =path= etc. ++ gasp ;~ pose :: parse =path= etc.
%+ cook %+ cook
|=({a/tyke b/tyke c/tyke} :(weld a b c)) |=({a/tyke b/tyke c/tyke} :(weld a b c))
@ -10505,8 +10483,8 @@
== ==
++ glam ~+((glue ace)) ++ glam ~+((glue ace))
++ hasp ;~ pose :: path element ++ hasp ;~ pose :: path element
(ifix [sel ser] wide) (ifix [lac rac] wide)
(stag %cncl (ifix [pel per] (most ace wide))) (stag %cncl (ifix [lit rit] (most ace wide)))
(stag %sand (stag %tas (cold %$ buc))) (stag %sand (stag %tas (cold %$ buc)))
(stag %sand (stag %t qut)) (stag %sand (stag %t qut))
%+ cook %+ cook
@ -10517,7 +10495,7 @@
|= {a/(list) b/tyke} |= {a/(list) b/tyke}
?~ a b ?~ a b
$(a t.a, b [`[%sand %tas %$] b]) $(a t.a, b [`[%sand %tas %$] b])
;~(plug (star fas) gasp) ;~(plug (star net) gasp)
++ mota %+ cook ++ mota %+ cook
|=({a/tape b/tape} (rap 3 (weld a b))) |=({a/tape b/tape} (rap 3 (weld a b)))
;~(plug (star low) (star hig)) ;~(plug (star low) (star hig))
@ -10695,7 +10673,7 @@
++ porc ++ porc
;~ plug ;~ plug
(cook |=(a/(list) (lent a)) (star cen)) (cook |=(a/(list) (lent a)) (star cen))
;~(pfix fas gash) ;~(pfix net gash)
== ==
:: ::
++ rump ++ rump
@ -10705,7 +10683,7 @@
;~(plug rope ;~(pose (stag ~ wede) (easy ~))) ;~(plug rope ;~(pose (stag ~ wede) (easy ~)))
:: ::
++ rood ++ rood
;~ pfix fas ;~ pfix net
(stag %clsg poor) (stag %clsg poor)
== ==
:: ::
@ -10751,12 +10729,12 @@
top-level top-level
:: ::
++ top-level :: entry-point ++ top-level :: entry-point
;~(pfix sem ?:(in-tall-form tall-top wide-top)) ;~(pfix mic ?:(in-tall-form tall-top wide-top))
:: ::
++ inline-embed :: brace interpolation ++ inline-embed :: brace interpolation
%+ cook |=(a/tuna:hoon a) %+ cook |=(a/tuna:hoon a)
;~ pose ;~ pose
;~(pfix sem bracketed-elem(in-tall-form |)) ;~(pfix mic bracketed-elem(in-tall-form |))
;~(plug tuna-mode sump) ;~(plug tuna-mode sump)
(stag %tape sump) (stag %tape sump)
== ==
@ -10794,13 +10772,13 @@
++ wide-attrs :: wide attributes ++ wide-attrs :: wide attributes
%+ cook |=(a/(unit mart:hoon) (fall a ~)) %+ cook |=(a/(unit mart:hoon) (fall a ~))
%- punt %- punt
%+ ifix [pel per] %+ ifix [lit rit]
%+ more (jest ', ') %+ more (jest ', ')
;~((glue ace) a-mane hopefully-quote) ;~((glue ace) a-mane hopefully-quote)
:: ::
++ wide-tail :: wide elements ++ wide-tail :: wide elements
%+ cook |=(a/marl:hoon a) %+ cook |=(a/marl:hoon a)
;~(pose ;~(pfix col wrapped-elems) (cold ~ sem) (easy ~)) ;~(pose ;~(pfix col wrapped-elems) (cold ~ mic) (easy ~))
:: ::
++ wide-elems :: wide elements ++ wide-elems :: wide elements
%+ cook |=(a/marl:hoon a) %+ cook |=(a/marl:hoon a)
@ -10810,7 +10788,7 @@
++ wide-paren-elems :: wide flow ++ wide-paren-elems :: wide flow
%+ cook |=(a/marl:hoon a) %+ cook |=(a/marl:hoon a)
%+ cook join-tops %+ cook join-tops
(ifix [pel per] (more ace wide-inner-top)) (ifix [lit rit] (more ace wide-inner-top))
:: ::
::+| ::+|
:: ::
@ -10831,7 +10809,7 @@
%+ cook |=(a/marl:hoon a) %+ cook |=(a/marl:hoon a)
;~ pose ;~ pose
;~ less (jest '"""') ;~ less (jest '"""')
(ifix [doq doq] (cook collapse-chars quote-innards)) (ifix [toc toc] (cook collapse-chars quote-innards))
== ==
:: ::
%- inde %- inde
@ -10843,14 +10821,14 @@
%+ cook |=(a/(list $@(@ tuna:hoon)) a) %+ cook |=(a/(list $@(@ tuna:hoon)) a)
%- star %- star
;~ pose ;~ pose
;~(pfix bas ;~(pose (mask "-+*%;\{") bas doq bix:ab)) ;~(pfix bas ;~(pose (mask "-+*%;\{") bas toc bix:ab))
inline-embed inline-embed
;~(less bas kel ?:(in-tall-form fail doq) prn) ;~(less bas lef ?:(in-tall-form fail toc) prn)
?:(lin fail ;~(less (jest '\0a"""') (just '\0a'))) ?:(lin fail ;~(less (jest '\0a"""') (just '\0a')))
== ==
:: ::
++ bracketed-elem :: bracketed element ++ bracketed-elem :: bracketed element
%+ ifix [kel ker] %+ ifix [lef ref]
;~(plug tag-head wide-elems) ;~(plug tag-head wide-elems)
:: ::
++ wrapped-elems :: wrapped tuna ++ wrapped-elems :: wrapped tuna
@ -10897,7 +10875,7 @@
;~ plug ;~ plug
(punt ;~(plug (cold %id hax) (cook trip sym))) (punt ;~(plug (cold %id hax) (cook trip sym)))
(cook en-class (star ;~(plug (cold %class dot) sym))) (cook en-class (star ;~(plug (cold %class dot) sym)))
(punt ;~(plug ;~(pose (cold %href fas) (cold %src pat)) soil)) (punt ;~(plug ;~(pose (cold %href net) (cold %src hat)) soil))
(easy ~) (easy ~)
== ==
:: ::
@ -10945,7 +10923,7 @@
%+ cook |=(a/marl:hoon a) %+ cook |=(a/marl:hoon a)
%+ ifix [gap ;~(plug gap duz)] %+ ifix [gap ;~(plug gap duz)]
%+ most gap %+ most gap
;~ pfix sem ;~ pfix mic
%+ cook |=(a/tape ;/(a)) %+ cook |=(a/tape ;/(a))
;~ pose ;~ pose
;~(pfix ace (star prn)) ;~(pfix ace (star prn))
@ -10957,7 +10935,7 @@
?> in-tall-form ?> in-tall-form
%+ cook |=(a/marl:hoon a) %+ cook |=(a/marl:hoon a)
;~ pose ;~ pose
(cold ~ sem) (cold ~ mic)
;~(pfix col wrapped-elems(in-tall-form |)) ;~(pfix col wrapped-elems(in-tall-form |))
;~(pfix col ace (cook collapse-chars(in-tall-form |) quote-innards)) ;~(pfix col ace (cook collapse-chars(in-tall-form |) quote-innards))
(ifix [gap ;~(plug gap duz)] tall-kids) (ifix [gap ;~(plug gap duz)] tall-kids)
@ -11375,7 +11353,7 @@
:: ::
(cold [%one %rule] ;~(plug hep hep hep)) :: --- horizontal ruler (cold [%one %rule] ;~(plug hep hep hep)) :: --- horizontal ruler
(cold [%one %fens] ;~(plug tec tec tec)) :: ``` code fence (cold [%one %fens] ;~(plug tec tec tec)) :: ``` code fence
(cold [%one %expr] sem) :: ;sail expression (cold [%one %expr] mic) :: ;sail expression
:: ::
(cold [%new %head] ;~(plug (star hax) ace)) :: # heading (cold [%new %head] ;~(plug (star hax) ace)) :: # heading
(cold [%new %lint] ;~(plug hep ace)) :: - line item (cold [%new %lint] ;~(plug hep ace)) :: - line item
@ -11484,7 +11462,7 @@
:: ::
:: "quoted text" :: "quoted text"
:: ::
(stag %quod (ifix [doq doq] (cool (cash doq) work))) (stag %quod (ifix [toc toc] (cool (cash toc) work)))
:: ::
:: `classic markdown quote` :: `classic markdown quote`
:: ::
@ -11498,8 +11476,8 @@
:: ::
%+ stag %link %+ stag %link
;~ (glue (punt whit)) ;~ (glue (punt whit))
(ifix [sel ser] (cool (cash ser) work)) (ifix [lac rac] (cool (cash rac) work))
(ifix [pel per] (cash per)) (ifix [lit rit] (cash rit))
== ==
:: ::
:: #hoon :: #hoon
@ -11524,7 +11502,7 @@
tash:so tash:so
;~(pfix dot perd:so) ;~(pfix dot perd:so)
;~(pfix sig ;~(pose twid:so (easy [%$ %n 0]))) ;~(pfix sig ;~(pose twid:so (easy [%$ %n 0])))
;~(pfix cen ;~(pose sym buc pam bar qut nuck:so)) ;~(pfix cen ;~(pose sym buc pad bar qut nuck:so))
== ==
:: ::
;~(simu whit (easy ~)) ;~(simu whit (easy ~))
@ -11668,7 +11646,7 @@
++ scab ++ scab
%+ cook %+ cook
|= a/(list wing) ^- plan |= a/(list wing) ^- plan
:- %bcsm :- %bcmc
|- ^- hoon |- ^- hoon
?~(a !! ?~(t.a [%wing i.a] [%tsgl [%wing i.a] $(a t.a)])) ?~(a !! ?~(t.a [%wing i.a] [%tsgl [%wing i.a] $(a t.a)]))
(most col rope) (most col rope)
@ -11681,26 +11659,26 @@
:- '_' :- '_'
;~(pfix cab (stag %bccb wide)) ;~(pfix cab (stag %bccb wide))
:- ',' :- ','
;~(pfix com (stag %bcsm wide)) ;~(pfix com (stag %bcmc wide))
:- '$' :- '$'
;~ pose ;~ pose
;~ pfix buc ;~ pfix buc
;~ pose ;~ pose
(stag %leaf (stag %tas (cold %$ buc))) (stag %leaf (stag %tas (cold %$ buc)))
(stag %leaf (stag %f (cold & pam))) (stag %leaf (stag %f (cold & pad)))
(stag %leaf (stag %f (cold | bar))) (stag %leaf (stag %f (cold | bar)))
(stag %leaf (stag %t qut)) (stag %leaf (stag %t qut))
(stag %leaf (sear |=(a/coin ?:(?=($$ -.a) (some +.a) ~)) nuck:so)) (stag %leaf (sear |=(a/coin ?:(?=($$ -.a) (some +.a) ~)) nuck:so))
== ==
== ==
(stag %bcsm rump) (stag %bcmc rump)
== ==
:- '%' :- '%'
;~ pose ;~ pose
;~ pfix cen ;~ pfix cen
;~ pose ;~ pose
(stag %leaf (stag %tas (cold %$ buc))) (stag %leaf (stag %tas (cold %$ buc)))
(stag %leaf (stag %f (cold & pam))) (stag %leaf (stag %f (cold & pad)))
(stag %leaf (stag %f (cold | bar))) (stag %leaf (stag %f (cold | bar)))
(stag %leaf (stag %t qut)) (stag %leaf (stag %t qut))
(stag %leaf (sear |=(a/coin ?:(?=($$ -.a) (some +.a) ~)) nuck:so)) (stag %leaf (sear |=(a/coin ?:(?=($$ -.a) (some +.a) ~)) nuck:so))
@ -11708,25 +11686,25 @@
== ==
== ==
:- '(' :- '('
%+ stag %bcsm %+ stag %bcmc
%+ stag %cncl %+ stag %cncl
%+ ifix [pel per] %+ ifix [lit rit]
;~ plug ;~ plug
wide wide
;~(pose ;~(pfix ace (most ace (stag %bccm wyde))) (easy ~)) ;~(pose ;~(pfix ace (most ace (stag %bccm wyde))) (easy ~))
== ==
:- '{' :- '{'
(stag %bccl (ifix [kel ker] (most ace wyde))) (stag %bccl (ifix [lef ref] (most ace wyde)))
:- '[' :- '['
(stag %bccl (ifix [sel ser] (most ace wyde))) (stag %bccl (ifix [lac rac] (most ace wyde)))
:- '*' :- '*'
(cold [%base %noun] tar) (cold [%base %noun] tar)
:- '@' :- '@'
;~(pfix pat (stag %base (stag %atom mota))) ;~(pfix hat (stag %base (stag %atom mota)))
:- '?' :- '?'
;~ pose ;~ pose
%+ stag %bcwt %+ stag %bcwt
;~(pfix wut (ifix [pel per] (most ace wyde))) ;~(pfix wut (ifix [lit rit] (most ace wyde)))
:: ::
(cold [%base %bean] wut) (cold [%base %bean] wut)
== ==
@ -11751,12 +11729,12 @@
{$tsgl *} $(hon ~(open ap hon)) {$tsgl *} $(hon ~(open ap hon))
{$tsgr *} $(hon q.hon) {$tsgr *} $(hon q.hon)
== ==
|=(term [%bcts +< %bcsm hon]) |=(term [%bcts +< %bcmc hon])
wide wide
== ==
:- ['a' 'z'] :- ['a' 'z']
;~ pose ;~ pose
(stag %bcts ;~(plug sym ;~(pfix ;~(pose fas tis) wyde))) (stag %bcts ;~(plug sym ;~(pfix ;~(pose net tis) wyde)))
scab scab
== ==
== ==
@ -11783,7 +11761,7 @@
;~ pfix buc ;~ pfix buc
;~ pose ;~ pose
(stag %leaf (stag %tas (cold %$ buc))) (stag %leaf (stag %tas (cold %$ buc)))
(stag %leaf (stag %f (cold & pam))) (stag %leaf (stag %f (cold & pad)))
(stag %leaf (stag %f (cold | bar))) (stag %leaf (stag %f (cold | bar)))
(stag %leaf (stag %t qut)) (stag %leaf (stag %t qut))
(stag %leaf (sear |=(a/coin ?:(?=($$ -.a) (some +.a) ~)) nuck:so)) (stag %leaf (sear |=(a/coin ?:(?=($$ -.a) (some +.a) ~)) nuck:so))
@ -11796,7 +11774,7 @@
;~ pose ;~ pose
(stag %clsg (sear |~({a/@ud b/tyke} (posh ~ ~ a b)) porc)) (stag %clsg (sear |~({a/@ud b/tyke} (posh ~ ~ a b)) porc))
(stag %rock (stag %tas (cold %$ buc))) (stag %rock (stag %tas (cold %$ buc)))
(stag %rock (stag %f (cold & pam))) (stag %rock (stag %f (cold & pad)))
(stag %rock (stag %f (cold | bar))) (stag %rock (stag %f (cold | bar)))
(stag %rock (stag %t qut)) (stag %rock (stag %t qut))
(cook (jock &) nuck:so) (cook (jock &) nuck:so)
@ -11806,26 +11784,26 @@
:- '&' :- '&'
;~ pose ;~ pose
(cook |=(a/wing [%cnts a ~]) rope) (cook |=(a/wing [%cnts a ~]) rope)
(stag %wtpm ;~(pfix pam (ifix [pel per] (most ace wide)))) (stag %wtpm ;~(pfix pad (ifix [lit rit] (most ace wide))))
;~(plug (stag %rock (stag %f (cold & pam))) wede) ;~(plug (stag %rock (stag %f (cold & pad))) wede)
(stag %sand (stag %f (cold & pam))) (stag %sand (stag %f (cold & pad)))
== ==
:- '\'' :- '\''
(stag %sand (stag %t qut)) (stag %sand (stag %t qut))
:- '(' :- '('
(stag %cncl (ifix [pel per] (most ace wide))) (stag %cncl (ifix [lit rit] (most ace wide)))
:- '{' :- '{'
(stag %bccm (stag %bccl (ifix [kel ker] (most ace wyde)))) (stag %bccm (stag %bccl (ifix [lef ref] (most ace wyde))))
:- '*' :- '*'
;~ pose ;~ pose
(stag %bcdt ;~(pfix tar wyde)) (stag %bcdt ;~(pfix tar wyde))
(cold [%base %noun] tar) (cold [%base %noun] tar)
== ==
:- '@' :- '@'
;~(pfix pat (stag %base (stag %atom mota))) ;~(pfix hat (stag %base (stag %atom mota)))
:- '+' :- '+'
;~ pose ;~ pose
(stag %dtls ;~(pfix lus (ifix [pel per] wide))) (stag %dtls ;~(pfix lus (ifix [lit rit] wide)))
:: ::
%+ cook %+ cook
|= a/(list (list woof)) |= a/(list (list woof))
@ -11859,16 +11837,16 @@
:- ':' :- ':'
;~ pfix col ;~ pfix col
;~ pose ;~ pose
(stag %mccl (ifix [pel per] (most ace wide))) (stag %mccl (ifix [lit rit] (most ace wide)))
;~(pfix fas (stag %mcnt wide)) ;~(pfix net (stag %mcnt wide))
== ==
== ==
:- '=' :- '='
(stag %dtts ;~(pfix tis (ifix [pel per] ;~(glam wide wide)))) (stag %dtts ;~(pfix tis (ifix [lit rit] ;~(glam wide wide))))
:- '?' :- '?'
;~ pose ;~ pose
%+ stag %bccm %+ stag %bccm
(stag %bcwt ;~(pfix wut (ifix [pel per] (most ace wyde)))) (stag %bcwt ;~(pfix wut (ifix [lit rit] (most ace wyde))))
:: ::
(cold [%base %bean] wut) (cold [%base %bean] wut)
== ==
@ -11884,7 +11862,7 @@
;~ pose ;~ pose
%+ cook %+ cook
|=({a/@ta b/hoon} [%ktls [%sand a 0] [%ktls [%sand %$ 0] b]]) |=({a/@ta b/hoon} [%ktls [%sand a 0] [%ktls [%sand %$ 0] b]])
;~(pfix pat ;~(plug mota ;~(pfix tec wide))) ;~(pfix hat ;~(plug mota ;~(pfix tec wide)))
;~ pfix tar ;~ pfix tar
(stag %kthp (stag [%base %noun] ;~(pfix tec wide))) (stag %kthp (stag [%base %noun] ;~(pfix tec wide)))
== ==
@ -11903,7 +11881,7 @@
:- '|' :- '|'
;~ pose ;~ pose
(cook |=(a/wing [%cnts a ~]) rope) (cook |=(a/wing [%cnts a ~]) rope)
(stag %wtbr ;~(pfix bar (ifix [pel per] (most ace wide)))) (stag %wtbr ;~(pfix bar (ifix [lit rit] (most ace wide))))
;~(plug (stag %rock (stag %f (cold | bar))) wede) ;~(plug (stag %rock (stag %f (cold | bar))) wede)
(stag %sand (stag %f (cold | bar))) (stag %sand (stag %f (cold | bar)))
== ==
@ -11913,11 +11891,11 @@
:: ::
;~ pfix sig ;~ pfix sig
;~ pose ;~ pose
(stag %clsg (ifix [sel ser] (most ace wide))) (stag %clsg (ifix [lac rac] (most ace wide)))
:: ::
%+ stag %cnsg %+ stag %cnsg
%+ ifix %+ ifix
[pel per] [lit rit]
;~(glam rope wide (most ace wide)) ;~(glam rope wide (most ace wide))
:: ::
(cook (jock |) twid:so) (cook (jock |) twid:so)
@ -11936,11 +11914,11 @@
++ soil ++ soil
;~ pose ;~ pose
;~ less (jest '"""') ;~ less (jest '"""')
%+ ifix [doq doq] %+ ifix [toc toc]
%- star %- star
;~ pose ;~ pose
;~(pfix bas ;~(pose bas doq kel bix:ab)) ;~(pfix bas ;~(pose bas toc lef bix:ab))
;~(less doq bas kel prn) ;~(less toc bas lef prn)
(stag ~ sump) (stag ~ sump)
== ==
== ==
@ -11949,13 +11927,13 @@
[(jest '"""\0a') (jest '\0a"""')] [(jest '"""\0a') (jest '\0a"""')]
%- star %- star
;~ pose ;~ pose
;~(pfix bas ;~(pose bas kel bix:ab)) ;~(pfix bas ;~(pose bas lef bix:ab))
;~(less bas kel prn) ;~(less bas lef prn)
;~(less (jest '\0a"""') (just `@`10)) ;~(less (jest '\0a"""') (just `@`10))
(stag ~ sump) (stag ~ sump)
== ==
== ==
++ sump (ifix [kel ker] (stag %cltr (most ace wide))) ++ sump (ifix [lef ref] (stag %cltr (most ace wide)))
++ norm :: rune regular form ++ norm :: rune regular form
|= tol/? |= tol/?
|% |%
@ -11966,7 +11944,7 @@
;~ pfix buc ;~ pfix buc
%- stew %- stew
^. stet ^. limo ^. stet ^. limo
:~ ['@' (rune pat %bcpt exqb)] :~ ['@' (rune hat %bcht exqb)]
['_' (rune cab %bccb expa)] ['_' (rune cab %bccb expa)]
[':' (rune col %bccl exqs)] [':' (rune col %bccl exqs)]
['%' (rune cen %bccn exqs)] ['%' (rune cen %bccn exqs)]
@ -11975,11 +11953,11 @@
['-' (rune hep %bchp exqb)] ['-' (rune hep %bchp exqb)]
['=' (rune tis %bcts exqg)] ['=' (rune tis %bcts exqg)]
['?' (rune wut %bcwt exqs)] ['?' (rune wut %bcwt exqs)]
[';' (rune sem %bcsm expa)] [';' (rune mic %bcmc expa)]
== ==
== ==
:- '%' :- '%'
%+ stag %bcsm %+ stag %bcmc
;~ pfix cen ;~ pfix cen
%- stew %- stew
^. stet ^. limo ^. stet ^. limo
@ -12032,7 +12010,7 @@
;~ pfix buc ;~ pfix buc
%- stew %- stew
^. stet ^. limo ^. stet ^. limo
:~ ['@' (stag %bccm (rune pat %bcpt exqb))] :~ ['@' (stag %bccm (rune hat %bcht exqb))]
['_' (stag %bccm (rune cab %bccb expa))] ['_' (stag %bccm (rune cab %bccb expa))]
[':' (stag %bccm (rune col %bccl exqs))] [':' (stag %bccm (rune col %bccl exqs))]
['%' (stag %bccm (rune cen %bccn exqs))] ['%' (stag %bccm (rune cen %bccn exqs))]
@ -12091,7 +12069,7 @@
['.' (rune dot %ktdt expb)] ['.' (rune dot %ktdt expb)]
['-' (rune hep %kthp exqc)] ['-' (rune hep %kthp exqc)]
['+' (rune lus %ktls expb)] ['+' (rune lus %ktls expb)]
['&' (rune pam %ktpd expa)] ['&' (rune pad %ktpd expa)]
['~' (rune sig %ktsg expa)] ['~' (rune sig %ktsg expa)]
['=' (rune tis %ktts expg)] ['=' (rune tis %ktts expg)]
['?' (rune wut %ktwt expa)] ['?' (rune wut %ktwt expa)]
@ -12106,24 +12084,24 @@
['$' (rune buc %sgbc expf)] ['$' (rune buc %sgbc expf)]
['_' (rune cab %sgcb expb)] ['_' (rune cab %sgcb expb)]
['%' (rune cen %sgcn hind)] ['%' (rune cen %sgcn hind)]
['/' (rune fas %sgnt hine)] ['/' (rune net %sgnt hine)]
['<' (rune gal %sggl hinb)] ['<' (rune gal %sggl hinb)]
['>' (rune gar %sggr hinb)] ['>' (rune gar %sggr hinb)]
['+' (rune lus %sgls hinc)] ['+' (rune lus %sgls hinc)]
['&' (rune pam %sgpm hinf)] ['&' (rune pad %sgpm hinf)]
['?' (rune wut %sgwt hing)] ['?' (rune wut %sgwt hing)]
['=' (rune tis %sgts expb)] ['=' (rune tis %sgts expb)]
['!' (rune zap %sgzp expb)] ['!' (rune zap %sgzp expb)]
== ==
== ==
:- ';' :- ';'
;~ pfix sem ;~ pfix mic
%- stew %- stew
^. stet ^. limo ^. stet ^. limo
:~ [':' (rune col %mccl expi)] :~ [':' (rune col %mccl expi)]
['/' (rune fas %mcnt expa)] ['/' (rune net %mcnt expa)]
['~' (rune sig %mcsg expi)] ['~' (rune sig %mcsg expi)]
[';' (rune sem %mcmc expb)] [';' (rune mic %mcmc expb)]
== ==
== ==
:- '=' :- '='
@ -12135,8 +12113,8 @@
['?' (rune wut %tswt expw)] ['?' (rune wut %tswt expw)]
['^' (rune ket %tskt expt)] ['^' (rune ket %tskt expt)]
[':' (rune col %tscl expp)] [':' (rune col %tscl expp)]
['/' (rune fas %tsnt expo)] ['/' (rune net %tsnt expo)]
[';' (rune sem %tsmc expo)] [';' (rune mic %tsmc expo)]
['<' (rune gal %tsgl expb)] ['<' (rune gal %tsgl expb)]
['>' (rune gar %tsgr expb)] ['>' (rune gar %tsgr expb)]
['-' (rune hep %tshp expb)] ['-' (rune hep %tshp expb)]
@ -12159,8 +12137,8 @@
['^' ;~(pfix ket (toad tkkt))] ['^' ;~(pfix ket (toad tkkt))]
['=' ;~(pfix tis (toad txts))] ['=' ;~(pfix tis (toad txts))]
['+' ;~(pfix lus (toad txls))] ['+' ;~(pfix lus (toad txls))]
['&' (rune pam %wtpm exps)] ['&' (rune pad %wtpm exps)]
['@' ;~(pfix pat (toad tkht))] ['@' ;~(pfix hat (toad tkht))]
['~' ;~(pfix sig (toad tksg))] ['~' ;~(pfix sig (toad tksg))]
['!' (rune zap %wtzp expa)] ['!' (rune zap %wtzp expa)]
== ==
@ -12172,7 +12150,7 @@
:~ [':' ;~(pfix col (toad expz))] :~ [':' ;~(pfix col (toad expz))]
['.' ;~(pfix dot (toad |.(loaf(bug |))))] ['.' ;~(pfix dot (toad |.(loaf(bug |))))]
[',' (rune com %zpcm expb)] [',' (rune com %zpcm expb)]
[';' (rune sem %zpmc expb)] [';' (rune mic %zpmc expb)]
['>' (rune gar %zpgr expa)] ['>' (rune gar %zpgr expa)]
['=' (rune tis %zpts expa)] ['=' (rune tis %zpts expa)]
['?' (rune wut %zpwt hinh)] ['?' (rune wut %zpwt hinh)]
@ -12279,7 +12257,7 @@
++ toad :: untrap parser exp ++ toad :: untrap parser exp
=+ har=expa =+ har=expa
|% +- $ |% +- $
=+ dur=(ifix [pel per] $:har(tol |)) =+ dur=(ifix [lit rit] $:har(tol |))
?:(tol ;~(pose ;~(pfix gap $:har(tol &)) dur) dur) ?:(tol ;~(pose ;~(pfix gap $:har(tol &)) dur) dur)
-- --
:: ::
@ -12443,7 +12421,7 @@
;~ gunk ;~ gunk
;~ pose ;~ pose
dem dem
(ifix [sel ser] ;~(plug dem ;~(pfix ace dem))) (ifix [lac rac] ;~(plug dem ;~(pfix ace dem)))
== ==
loaf loaf
== ==
@ -12456,7 +12434,7 @@
;~ pose ;~ pose
(cold ~ sig) (cold ~ sig)
%+ ifix %+ ifix
?:(tol [;~(plug duz gap) ;~(plug gap duz)] [pel per]) ?:(tol [;~(plug duz gap) ;~(plug gap duz)] [lit rit])
(more mash ;~(gunk ;~(pfix cen sym) loaf)) (more mash ;~(gunk ;~(pfix cen sym) loaf))
== ==
-- --
@ -12467,7 +12445,7 @@
$% {$tis p/hoon} $% {$tis p/hoon}
{$col p/hoon} {$col p/hoon}
{$ket p/hoon} {$ket p/hoon}
{$pel p/(list (pair wing hoon))} {$lit p/(list (pair wing hoon))}
== ==
== ==
:: ::
@ -12478,7 +12456,7 @@
^- (unit hoon) ^- (unit hoon)
?- -.vil ?- -.vil
$col ?:(=([%base %bean] ros) ~ [~ %tsgl ros p.vil]) $col ?:(=([%base %bean] ros) ~ [~ %tsgl ros p.vil])
$pel (bind ~(reek ap ros) |=(hyp/wing [%cnts hyp p.vil])) $lit (bind ~(reek ap ros) |=(hyp/wing [%cnts hyp p.vil]))
$ket [~ ros p.vil] $ket [~ ros p.vil]
$tis =+ tog=~(hock ap ros) $tis =+ tog=~(hock ap ros)
?:(=([%0 ~] tog) ~ [~ %ktts tog p.vil]) ?:(=([%0 ~] tog) ~ [~ %ktts tog p.vil])
@ -12493,8 +12471,8 @@
;~(plug (cold %col col) wide) ;~(plug (cold %col col) wide)
;~(plug (cold %ket ket) wide) ;~(plug (cold %ket ket) wide)
;~ plug ;~ plug
(easy %pel) (easy %lit)
(ifix [pel per] lobo) (ifix [lit rit] lobo)
== ==
== ==
== ==
@ -12506,7 +12484,7 @@
%+ cook |=(hoon +<) %+ cook |=(hoon +<)
%+ stag %cltr %+ stag %cltr
%+ ifix %+ ifix
[;~(plug sel gap) ;~(plug gap ser)] [;~(plug lac gap) ;~(plug gap rac)]
(most gap tall) (most gap tall)
:: ::
++ rope :: wing form ++ rope :: wing form
@ -12524,14 +12502,14 @@
|=(a/axis [%& a]) |=(a/axis [%& a])
;~ pose ;~ pose
;~(pfix lus dim:ag) ;~(pfix lus dim:ag)
;~(pfix pam (cook |=(a/@ ?:(=(0 a) 0 (mul 2 +($(a (dec a)))))) dim:ag)) ;~(pfix pad (cook |=(a/@ ?:(=(0 a) 0 (mul 2 +($(a (dec a)))))) dim:ag))
;~(pfix bar (cook |=(a/@ ?:(=(0 a) 1 +((mul 2 $(a (dec a)))))) dim:ag)) ;~(pfix bar (cook |=(a/@ ?:(=(0 a) 1 +((mul 2 $(a (dec a)))))) dim:ag))
ven ven
(cold 1 dot) (cold 1 dot)
== ==
== ==
:: ::
++ wise ;~(plug sym (punt ;~(pfix ;~(pose fas tis) wyde))) ++ wise ;~(plug sym (punt ;~(pfix ;~(pose net tis) wyde)))
++ wrap ++ wrap
|* fel/rule |* fel/rule
%+ cook %+ cook
@ -12585,7 +12563,7 @@
%+ knee *plan %+ knee *plan
|.(~+((wert (wrip ;~(pose structure:(norm &) scad))))) |.(~+((wert (wrip ;~(pose structure:(norm &) scad)))))
++ wede :: wide bulb ++ wede :: wide bulb
;~(pfix ;~(pose lus fas) wide) ;~(pfix ;~(pose lus net) wide)
++ wide :: full wide form ++ wide :: full wide form
%+ knee *hoon %+ knee *hoon
|.(~+((wart ;~(pose expression:(norm |) long apex:(sail |))))) |.(~+((wart ;~(pose expression:(norm |) long apex:(sail |)))))

40
sys/vane/ford.hoon
View File

@ -448,15 +448,15 @@
[~ u=p.a] [~ u=p.a]
nuck:so nuck:so
:: ::
++ mota ;~(pfix pat mota:vez) :: atom odor ++ mota ;~(pfix hat mota:vez) :: atom odor
++ hath (sear plex (stag %clsg poor)):vez :: hood path ++ hath (sear plex (stag %clsg poor)):vez :: hood path
++ have (sear de-beam ;~(pfix fas hath)) :: hood beam ++ have (sear de-beam ;~(pfix net hath)) :: hood beam
++ hith :: static path ++ hith :: static path
=> vez => vez
(sear plex (stag %clsg (more fas hasp))) (sear plex (stag %clsg (more net hasp)))
:: ::
++ hive :: late-bound path ++ hive :: late-bound path
;~ pfix fas ;~ pfix net
%+ cook |=(a/hops a) %+ cook |=(a/hops a)
=> vez => vez
;~ plug ;~ plug
@ -469,17 +469,17 @@
%+ ifix [gay gay] %+ ifix [gay gay]
;~ plug ;~ plug
;~ pose ;~ pose
(ifix [;~(plug fas wut gap) gap] dem) (ifix [;~(plug net wut gap) gap] dem)
(easy zuse) (easy zuse)
== ==
:: ::
;~ pose ;~ pose
(ifix [;~(plug fas hep gap) gap] (most ;~(plug com gaw) hoof)) (ifix [;~(plug net hep gap) gap] (most ;~(plug com gaw) hoof))
(easy ~) (easy ~)
== ==
:: ::
;~ pose ;~ pose
(ifix [;~(plug fas lus gap) gap] (most ;~(plug com gaw) hoof)) (ifix [;~(plug net lus gap) gap] (most ;~(plug com gaw) hoof))
(easy ~) (easy ~)
== ==
:: ::
@ -491,7 +491,7 @@
;~ plug ;~ plug
sym sym
%- punt %- punt
;~(pfix fas ;~((glue fas) case ship)) ;~(pfix net ;~((glue net) case ship))
== ==
:: ::
++ ship ;~(pfix sig fed:ag) ++ ship ;~(pfix sig fed:ag)
@ -504,7 +504,7 @@
:: ::
++ hoop ++ hoop
;~ pose ;~ pose
(stag %| ;~(pfix ;~(plug fas fas gap) have)) (stag %| ;~(pfix ;~(plug net net gap) have))
(stag %& tall:vez) (stag %& tall:vez)
== ==
:: ::
@ -514,7 +514,7 @@
|% |%
++ apex ++ apex
%+ knee *^horn |. ~+ %+ knee *^horn |. ~+
;~ pfix fas ;~ pfix net
;~ pose ;~ pose
(stag %fssg ;~(pfix sig hoon:read)) :: /~ hoon by hand (stag %fssg ;~(pfix sig hoon:read)) :: /~ hoon by hand
(stag %fsbc ;~(pfix buc hoon:read)) :: /$ extra arguments (stag %fsbc ;~(pfix buc hoon:read)) :: /$ extra arguments
@ -524,13 +524,13 @@
(stag %fsdt ;~(pfix dot list:read)) :: /. list (stag %fsdt ;~(pfix dot list:read)) :: /. list
(stag %fscm ;~(pfix com case:read)) :: /, switch by path (stag %fscm ;~(pfix com case:read)) :: /, switch by path
(stag %fscn ;~(pfix cen horn:read)) :: /% propagate args (stag %fscn ;~(pfix cen horn:read)) :: /% propagate args
(stag %fspm ;~(pfix pam pipe:read)) :: /& translates (stag %fspm ;~(pfix pad pipe:read)) :: /& translates
(stag %fscb ;~(pfix cab horn:read)) :: /_ homo map (stag %fscb ;~(pfix cab horn:read)) :: /_ homo map
(stag %fssm ;~(pfix sem gate:read)) :: /; operate on (stag %fssm ;~(pfix mic gate:read)) :: /; operate on
(stag %fscl ;~(pfix col path:read)) :: /: relative to (stag %fscl ;~(pfix col path:read)) :: /: relative to
(stag %fskt ;~(pfix ket cast:read)) :: /^ cast (stag %fskt ;~(pfix ket cast:read)) :: /^ cast
(stag %fszp ;~(pfix zap ;~(sfix sym fas))) :: /!mark/ run to mark (stag %fszp ;~(pfix zap ;~(sfix sym net))) :: /!mark/ run to mark
(stag %fszy ;~(sfix sym fas)) :: /mark/ render file (stag %fszy ;~(sfix sym net)) :: /mark/ render file
== ==
== ==
:: ::
@ -542,12 +542,12 @@
++ read ++ read
|% ++ hoon |% ++ hoon
%+ rail %+ rail
(ifix [sel ser] (stag %cltr (most ace wide:vez))) (ifix [lac rac] (stag %cltr (most ace wide:vez)))
;~(pfix gap tall:vez) ;~(pfix gap tall:vez)
:: ::
++ alts ++ alts
%+ rail %+ rail
(ifix [pel per] (most ace horn)) (ifix [lit rit] (most ace horn))
;~(sfix (star horn) gap duz) ;~(sfix (star horn) gap duz)
:: ::
++ horn ++ horn
@ -567,17 +567,17 @@
++ case ++ case
%+ rail fail %+ rail fail
=- ;~(sfix (star -) gap duz) =- ;~(sfix (star -) gap duz)
;~(pfix gap fas ;~(plug hith horn)) ;~(pfix gap net ;~(plug hith horn))
:: ::
++ pipe ++ pipe
%+ rail %+ rail
;~(plug (plus ;~(sfix sym pam)) horn) ;~(plug (plus ;~(sfix sym pad)) horn)
=+ (cook |=(a/term [a ~]) sym) =+ (cook |=(a/term [a ~]) sym)
;~(pfix gap ;~(plug - horn)) ;~(pfix gap ;~(plug - horn))
:: ::
++ gate ++ gate
%+ rail %+ rail
;~(plug ;~(sfix wide:vez sem) horn) ;~(plug ;~(sfix wide:vez mic) horn)
;~(pfix gap ;~(plug tall:vez horn)) ;~(pfix gap ;~(plug tall:vez horn))
:: ::
++ path ++ path
@ -2050,7 +2050,7 @@
$fskt $fskt
%+ tug:bo $(hon q.hon) %+ tug:bo $(hon q.hon)
|= {cof/cafe mar/mark vax/vase} |= {cof/cafe mar/mark vax/vase}
%+ tug:bo (wrapped-slap cof bax [%bcdt %bcsm p.hon]) %+ tug:bo (wrapped-slap cof bax [%bcdt %bcmc p.hon])
|= {cof/cafe tug/vase} |= {cof/cafe tug/vase}
?. (~(nest ut p.tug) | p.vax) ?. (~(nest ut p.tug) | p.vax)
(err:bo cof [%leaf "type error: {<p.hon>} {<q.hon>}"]~) (err:bo cof [%leaf "type error: {<p.hon>} {<q.hon>}"]~)

46
sys/zuse.hoon
View File

@ -3654,7 +3654,7 @@
:: :: ++abox:de-json:html :: :: ++abox:de-json:html
++ abox :: array ++ abox :: array
%+ stag %a %+ stag %a
(ifix [sel (wish ser)] (more (wish com) apex)) (ifix [lac (wish rac)] (more (wish com) apex))
:: :: ++apex:de-json:html :: :: ++apex:de-json:html
++ apex :: any value ++ apex :: any value
%+ knee *json |. ~+ %+ knee *json |. ~+
@ -3686,7 +3686,7 @@
=* wow `(map @t @)`(malt lip) =* wow `(map @t @)`(malt lip)
(sear ~(get by wow) low) (sear ~(get by wow) low)
=* tuf ;~(pfix (just 'u') (cook tuft qix:ab)) =* tuf ;~(pfix (just 'u') (cook tuft qix:ab))
;~(pose doq fas soq bas loo tuf) ;~(pose toc net say bas loo tuf)
== ==
:: :: ++expo:de-json:html :: :: ++expo:de-json:html
++ expo :: exponent ++ expo :: exponent
@ -3700,7 +3700,7 @@
;~(plug dot digs) ;~(plug dot digs)
:: :: ++jcha:de-json:html :: :: ++jcha:de-json:html
++ jcha :: string character ++ jcha :: string character
;~(pose ;~(less doq bas prn) esca) ;~(pose ;~(less toc bas prn) esca)
:: :: ++mayb:de-json:html :: :: ++mayb:de-json:html
++ mayb :: optional ++ mayb :: optional
|*(bus/rule ;~(pose bus (easy ~))) |*(bus/rule ;~(pose bus (easy ~)))
@ -3717,7 +3717,7 @@
== ==
:: :: ++obje:de-json:html :: :: ++obje:de-json:html
++ obje :: object list ++ obje :: object list
%+ ifix [(wish kel) (wish ker)] %+ ifix [(wish lef) (wish ref)]
(more (wish com) pear) (more (wish com) pear)
:: :: ++obox:de-json:html :: :: ++obox:de-json:html
++ obox :: object ++ obox :: object
@ -3731,7 +3731,7 @@
(cook |=(a/@ [a ~]) bus) (cook |=(a/@ [a ~]) bus)
:: :: ++stri:de-json:html :: :: ++stri:de-json:html
++ stri :: string ++ stri :: string
(cook crip (ifix [doq doq] (star jcha))) (cook crip (ifix [toc toc] (star jcha)))
:: :: ++tops:de-json:html :: :: ++tops:de-json:html
++ tops :: strict value ++ tops :: strict value
;~(pose abox obox) ;~(pose abox obox)
@ -3838,15 +3838,15 @@
;~ plug ;~ plug
;~(pfix (plus whit) name) ;~(pfix (plus whit) name)
;~ pose ;~ pose
(ifix [;~(plug tis doq) doq] (star ;~(less doq escp))) (ifix [;~(plug tis toc) toc] (star ;~(less toc escp)))
(ifix [;~(plug tis soq) soq] (star ;~(less soq escp))) (ifix [;~(plug tis say) say] (star ;~(less say escp)))
(easy ~) (easy ~)
== ==
== ==
:: :: ++chrd:de-xml:html :: :: ++chrd:de-xml:html
++ chrd :: character data ++ chrd :: character data
%+ cook |=(a/tape ^-(mars ;/(a))) %+ cook |=(a/tape ^-(mars ;/(a)))
(plus ;~(less doq ;~(pose (just `@`10) escp))) (plus ;~(less toc ;~(pose (just `@`10) escp)))
:: :: ++comt:de-xml:html :: :: ++comt:de-xml:html
++ comt :: comments ++ comt :: comments
=- (ifix [(jest '<!--') (jest '-->')] (star -)) =- (ifix [(jest '<!--') (jest '-->')] (star -))
@ -3857,10 +3857,10 @@
== ==
:: :: ++escp:de-xml:html :: :: ++escp:de-xml:html
++ escp :: ++ escp ::
;~(pose ;~(less gal gar pam prn) enty) ;~(pose ;~(less gal gar pad prn) enty)
:: :: ++enty:de-xml:html :: :: ++enty:de-xml:html
++ enty :: entity ++ enty :: entity
%+ ifix pam^sem %+ ifix pad^mic
;~ pose ;~ pose
=+ def=^+(ent (my:nl [%gt '>'] [%lt '<'] [%amp '&'] [%quot '"'] ~)) =+ def=^+(ent (my:nl [%gt '>'] [%lt '<'] [%amp '&'] [%quot '"'] ~))
%+ sear ~(get by (~(uni by def) ent)) %+ sear ~(get by (~(uni by def) ent))
@ -4006,7 +4006,7 @@
:: :: ++apat:de-purl:html :: :: ++apat:de-purl:html
++ apat :: 2396 abs_path ++ apat :: 2396 abs_path
%+ cook deft %+ cook deft
(ifix [fas ;~(pose fas (easy ~))] (more fas smeg)) (ifix [net ;~(pose net (easy ~))] (more net smeg))
:: :: ++aurf:de-purl:html :: :: ++aurf:de-purl:html
++ aurf :: 2396 with fragment ++ aurf :: 2396 with fragment
%+ cook |~(a/purf a) %+ cook |~(a/purf a)
@ -4030,16 +4030,16 @@
[q.a [[p.a r.a] b]] [q.a [[p.a r.a] b]]
:: ::
;~ plug ;~ plug
;~(plug htts (punt ;~(sfix urt:ab pat)) thor) ;~(plug htts (punt ;~(sfix urt:ab hat)) thor)
;~(plug ;~(pose apat (easy *pork)) yque) ;~(plug ;~(pose apat (easy *pork)) yque)
== ==
:: :: ++htts:de-purl:html :: :: ++htts:de-purl:html
++ htts :: scheme ++ htts :: scheme
%+ sear ~(get by (malt `(list (pair term ?))`[http+| https+& ~])) %+ sear ~(get by (malt `(list (pair term ?))`[http+| https+& ~]))
;~(sfix scem ;~(plug col fas fas)) ;~(sfix scem ;~(plug col net net))
:: :: ++cock:de-purl:html :: :: ++cock:de-purl:html
++ cock :: cookie ++ cock :: cookie
%+ most ;~(plug sem ace) %+ most ;~(plug mic ace)
;~(plug toke ;~(pfix tis tosk)) ;~(plug toke ;~(pfix tis tosk))
:: :: ++dlab:de-purl:html :: :: ++dlab:de-purl:html
++ dlab :: 2396 domainlabel ++ dlab :: 2396 domainlabel
@ -4056,10 +4056,10 @@
(cook crip (star pquo)) (cook crip (star pquo))
:: :: ++pcar:de-purl:html :: :: ++pcar:de-purl:html
++ pcar :: 2396 path char ++ pcar :: 2396 path char
;~(pose pure pesc psub col pat) ;~(pose pure pesc psub col hat)
:: :: ++pcok:de-purl:html :: :: ++pcok:de-purl:html
++ pcok :: cookie char ++ pcok :: cookie char
;~(less bas sem com doq prn) ;~(less bas mic com toc prn)
:: :: ++pesc:de-purl:html :: :: ++pesc:de-purl:html
++ pesc :: 2396 escaped ++ pesc :: 2396 escaped
;~(pfix cen mes) ;~(pfix cen mes)
@ -4068,23 +4068,23 @@
(cold ' ' (just '+')) (cold ' ' (just '+'))
:: :: ++pque:de-purl:html :: :: ++pque:de-purl:html
++ pque :: 3986 query char ++ pque :: 3986 query char
;~(pose pcar fas wut) ;~(pose pcar net wut)
:: :: ++pquo:de-purl:html :: :: ++pquo:de-purl:html
++ pquo :: normal query char ++ pquo :: normal query char
;~(pose pure pesc pold fas wut) ;~(pose pure pesc pold net wut)
:: :: ++pure:de-purl:html :: :: ++pure:de-purl:html
++ pure :: 2396 unreserved ++ pure :: 2396 unreserved
;~(pose aln hep dot cab sig) ;~(pose aln hep dot cab sig)
:: :: ++psub:de-purl:html :: :: ++psub:de-purl:html
++ psub :: 3986 sub-delims ++ psub :: 3986 sub-delims
;~ pose ;~ pose
zap buc pam soq pel per zap buc pad say lit rit
tar lus com sem tis tar lus com mic tis
== ==
:: :: ++ptok:de-purl:html :: :: ++ptok:de-purl:html
++ ptok :: 2616 token ++ ptok :: 2616 token
;~ pose ;~ pose
aln zap hax buc cen pam soq tar lus aln zap hax buc cen pad say tar lus
hep dot ket cab tec bar sig hep dot ket cab tec bar sig
== ==
:: :: ++scem:de-purl:html :: :: ++scem:de-purl:html
@ -4099,7 +4099,7 @@
(cook crip (plus pcok)) (cook crip (plus pcok))
:: :: ++tosk:de-purl:html :: :: ++tosk:de-purl:html
++ tosk :: 6265 quoted value ++ tosk :: 6265 quoted value
;~(pose tock (ifix [doq doq] tock)) ;~(pose tock (ifix [toc toc] tock))
:: :: ++toke:de-purl:html :: :: ++toke:de-purl:html
++ toke :: 2616 token ++ toke :: 2616 token
(cook crip (plus ptok)) (cook crip (plus ptok))
@ -4141,7 +4141,7 @@
:: proper query :: proper query
:: ::
%+ more %+ more
;~(pose pam sem) ;~(pose pad mic)
;~(plug fque ;~(pose ;~(pfix tis fquu) (easy ''))) ;~(plug fque ;~(pose ;~(pfix tis fquu) (easy '')))
:: ::
:: funky query :: funky query