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

Rename ++twig to ++hoon.

Browse Source
This commit is contained in:
C. Guy Yarvin 2017-11-16 13:50:03 -08:00
parent c7e73c22f9
commit bd17e5ece5
5 changed files with 414 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/dojo.hoon
View File

@ -41,7 +41,7 @@
r/purl:eyre r/purl:eyre
== ==
{$poke p/goal} :: poke app {$poke p/goal} :: poke app
{$show p/?($0 $1 $2 $3)} :: print val+type+twig {$show p/?($0 $1 $2 $3)} :: print val+type+hoon
{$verb p/term} :: store variable {$verb p/term} :: store variable
{$help p/(list term)} :: look up help {$help p/(list term)} :: look up help
== :: == ::
@ -53,10 +53,10 @@
$% {$ur p/(unit knot) q/purl:eyre} :: http GET request $% {$ur p/(unit knot) q/purl:eyre} :: http GET request
{$ge p/dojo-model} :: generator {$ge p/dojo-model} :: generator
{$dv p/path} :: core from source {$dv p/path} :: core from source
{$ex p/twig} :: hoon expression {$ex p/hoon} :: hoon expression
{$sa p/mark} :: example mark value {$sa p/mark} :: example mark value
{$as p/mark q/dojo-source} :: simple transmute {$as p/mark q/dojo-source} :: simple transmute
{$do p/twig q/dojo-source} :: gate apply {$do p/hoon q/dojo-source} :: gate apply
{$tu p/(list dojo-source)} :: tuple {$tu p/(list dojo-source)} :: tuple
== :: == ::
++ dojo-model :: data construction ++ dojo-model :: data construction
@ -201,22 +201,22 @@
++ dp-hooves :: hoof list ++ dp-hooves :: hoof list
:(stag 0 %ex %clsg (most ;~(plug com gaw) dp-hoof)) :(stag 0 %ex %clsg (most ;~(plug com gaw) dp-hoof))
:: ::
++ dp-hoof :: ++ford-hoof twig ++ dp-hoof :: ++ford-hoof hoon
;~ plug ;~ plug
:(stag %sand %f ;~(pose (cold %| tar) (easy %&))) :(stag %sand %f ;~(pose (cold %| tar) (easy %&)))
:(stag %sand %tas sym) :(stag %sand %tas sym)
%- dp-twig-punt %- dp-hoon-punt
;~ (glue fas) ;~ (glue fas)
;~(pfix fas (sear dp-case-twig nuck:so)) ;~(pfix fas (sear dp-case-hoon nuck:so))
(stag %sand ;~(plug (cold %p sig) fed:ag)) (stag %sand ;~(plug (cold %p sig) fed:ag))
== ==
== ==
:: ::
++ dp-twig-punt :: twig of unit ++ dp-hoon-punt :: hoon of unit
|*(a/rule ;~(pose (stag [%bust %null] a) (easy [%bust %null]))) |*(a/rule ;~(pose (stag [%bust %null] a) (easy [%bust %null])))
:: ::
++ dp-case-twig ++ dp-case-hoon
|= a/coin ^- (unit twig) |= a/coin ^- (unit hoon)
?. ?=({$~ case} a) ~ ?. ?=({$~ case} a) ~
%+ some %+ some
[%rock %tas p.p.a] [%rock %tas p.p.a]
@ -229,7 +229,7 @@
;~(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 pam) sym ;~(pfix ace dp-source))
;~(plug (cold %do cab) dp-twig ;~(pfix ace dp-source)) ;~(plug (cold %do cab) dp-hoon ;~(pfix ace dp-source))
dp-value dp-value
== ==
:: ::
@ -256,8 +256,8 @@
++ 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 fas sym)) :: ++dojo-server
++ dp-twig tall:(vang | dp-path) :: ++twig ++ dp-hoon tall:(vang | dp-path) :: ++hoon
++ dp-rood :: 'dir' twig ++ dp-rood :: 'dir' hoon
=> (vang | (en-beam dir)) => (vang | (en-beam dir))
;~ pose ;~ pose
rood rood
@ -272,7 +272,7 @@
++ dp-value :: ++dojo-source ++ dp-value :: ++dojo-source
;~ pose ;~ pose
(stag %sa ;~(pfix tar pam sym)) (stag %sa ;~(pfix tar pam sym))
(stag %ex dp-twig) (stag %ex dp-hoon)
(stag %tu (ifix [sel ser] (most ace dp-source))) (stag %tu (ifix [sel ser] (most ace dp-source)))
== ==
:: ::
@ -1122,7 +1122,7 @@
{$cube * _$} {$cube * _$}
{$face {what $@(term tune)} _$} {$face {what $@(term tune)} _$}
{$fork (set _$)} {$fork (set _$)}
{$hold _$ twig} {$hold _$ hoon}
== ==
wain :: "<|core|>" wain :: "<|core|>"
$?($noun $void) $?($noun $void)
@ -1137,13 +1137,13 @@
== ==
:: ::
++ dy-shown ++ dy-shown
$? twig $? hoon
$^ {dy-shown dy-shown} $^ {dy-shown dy-shown}
$% {$ur (unit knot) purl:eyre} $% {$ur (unit knot) purl:eyre}
{$dv path} {$dv path}
{$sa mark} {$sa mark}
{$as mark dy-shown} {$as mark dy-shown}
{$do twig dy-shown} {$do hoon dy-shown}
{$ge path (list dy-shown) (map term (unit dy-shown))} {$ge path (list dy-shown) (map term (unit dy-shown))}
== ==
== ==
@ -1156,7 +1156,7 @@
?- -.bil ?- -.bil
$?($ur $dv $sa) bil $?($ur $dv $sa) bil
$ex ?. ?=({$cltr *} p.bil) p.bil $ex ?. ?=({$cltr *} p.bil) p.bil
|- ^- twig |- ^- hoon
?~ p.p.bil !! ?~ p.p.bil !!
?~ t.p.p.bil i.p.p.bil ?~ t.p.p.bil i.p.p.bil
[i.p.p.bil $(p.p.bil t.p.p.bil)] [i.p.p.bil $(p.p.bil t.p.p.bil)]
@ -1230,7 +1230,7 @@
%- dy-silk-vase %- dy-silk-vase
?~(b !>([~ ~]) (dy-vase p.u.b)) ?~(b !>([~ ~]) (dy-vase p.u.b))
:: ::
++ dy-twig-head :: dynamic state ++ dy-hoon-head :: dynamic state
:: todo: how do i separate the toplevel 'dojo state' comment? :: todo: how do i separate the toplevel 'dojo state' comment?
:> dojo state :> dojo state
:> :>
@ -1286,7 +1286,7 @@
(dy-meal (slot 7 vax)) (dy-meal (slot 7 vax))
:: ::
$| $|
=> .(vax (slap vax !,(*twig ?>(?=($| -) .)))) :: XX working spec #72 => .(vax (slap vax !,(*hoon ?>(?=($| -) .)))) :: XX working spec #72
=+ typ={$| (unit knot) hiss:eyre *} =+ typ={$| (unit knot) hiss:eyre *}
=+ [~ usr hiz ~]=((dy-cast typ !>(*typ)) vax) =+ [~ usr hiz ~]=((dy-cast typ !>(*typ)) vax)
=. ..dy (he-diff %tan leaf+"< {(en-purl:html p.hiz)}" ~) =. ..dy (he-diff %tan leaf+"< {(en-purl:html p.hiz)}" ~)
@ -1333,14 +1333,14 @@
(slop hed $(p.bil t.p.bil)) (slop hed $(p.bil t.p.bil))
== ==
:: ::
++ dy-twig-mark :: XX architect ++ dy-hoon-mark :: XX architect
=+ ^= ope =+ ^= ope
|= gen/twig ^- twig |= gen/hoon ^- hoon
?: ?=(?($sggl $sggr) -.gen) ?: ?=(?($sggl $sggr) -.gen)
$(gen q.gen) $(gen q.gen)
=+ ~(open ap gen) =+ ~(open ap gen)
?.(=(gen -) $(gen -) gen) ?.(=(gen -) $(gen -) gen)
|= gen/twig ^- (unit mark) |= gen/hoon ^- (unit mark)
=. gen (ope gen) =. gen (ope gen)
?: ?=({$cnts {@ $~} $~} gen) ?: ?=({$cnts {@ $~} $~} gen)
(bind (~(get by var) i.p.gen) head) (bind (~(get by var) i.p.gen) head)
@ -1361,12 +1361,12 @@
== ==
:: ::
++ dy-mare :: build expression ++ dy-mare :: build expression
|= gen/twig |= gen/hoon
^- silk:ford ^- silk:ford
=+ too=(dy-twig-mark gen) =+ too=(dy-hoon-mark gen)
=- ?~(too - [%cast u.too -]) =- ?~(too - [%cast u.too -])
:+ %ride gen :+ %ride gen
:- [%$ dy-twig-head] :- [%$ dy-hoon-head]
[%plan he-beam blob+** [zuse sur lib ~ ~]] [%plan he-beam blob+** [zuse sur lib ~ ~]]
:: ::
++ dy-step :: advance project ++ dy-step :: advance project

10
app/talk.hoon
View File

@ -110,7 +110,7 @@
{$join p/where} :: {$join p/where} ::
{$leave p/where} :: {$leave p/where} ::
{$say p/(list speech)} :: {$say p/(list speech)} ::
{$eval p/cord q/twig} :: {$eval p/cord q/hoon} ::
{$invite p/knot q/(list partner)} :: whitelist add {$invite p/knot q/(list partner)} :: whitelist add
{$banish p/knot q/(list partner)} :: blacklist add {$banish p/knot q/(list partner)} :: blacklist add
{$block p/knot q/(list partner)} :: blacklist add {$block p/knot q/(list partner)} :: blacklist add
@ -203,7 +203,7 @@
++ sh-scad :: command parser ++ sh-scad :: command parser
=< work =< work
|% |%
++ expr :: [cord twig] ++ expr :: [cord hoon]
|= tub/nail %. tub |= tub/nail %. tub
%+ stag (crip q.tub) %+ stag (crip q.tub)
wide:(vang & [&1:% &2:% (scot %da now.hid) |3:%]) wide:(vang & [&1:% &2:% (scot %da now.hid) |3:%])
@ -968,7 +968,7 @@
|= cod/command |= cod/command
%_(+> coz [cod coz]) %_(+> coz [cod coz])
:: ::
++ sh-twig-head ^- vase :: eval data ++ sh-hoon-head ^- vase :: eval data
!>(`{our/@p now/@da eny/@uvI}`[our.hid now.hid (shas %eny eny.hid)]) !>(`{our/@p now/@da eny/@uvI}`[our.hid now.hid (shas %eny eny.hid)])
:: ::
++ sh-work :: do work ++ sh-work :: do work
@ -1211,8 +1211,8 @@
..sh-work ..sh-work
:: ::
++ eval :: run ++ eval :: run
|= {txt/cord exe/twig} |= {txt/cord exe/hoon}
=> |.([(sell (slap (slop sh-twig-head seed) exe))]~) => |.([(sell (slap (slop sh-hoon-head seed) exe))]~)
=+ tan=p:(mule .) =+ tan=p:(mule .)
(say [%fat tank+tan exp+txt] ~) (say [%fat tank+tan exp+txt] ~)
:: ::

728
sys/hoon.hoon
View File

File diff suppressed because it is too large Load Diff

28
sys/vane/ford.hoon
View File

@ -72,8 +72,8 @@
{$boil p/calm q/(trel coin beam beam) r/vase} :: execute {$boil p/calm q/(trel coin beam beam) r/vase} :: execute
{$path p/calm q/beam r/(unit beam)} :: -to/ transformation {$path p/calm q/beam r/(unit beam)} :: -to/ transformation
{$slit p/calm q/{p/type q/type} r/type} :: slam type {$slit p/calm q/{p/type q/type} r/type} :: slam type
{$slim p/calm q/{p/type q/twig} r/(pair type nock)}:: mint {$slim p/calm q/{p/type q/hoon} r/(pair type nock)}:: mint
{$slap p/calm q/{p/vase q/twig} r/vase} :: compute {$slap p/calm q/{p/vase q/hoon} r/vase} :: compute
{$slam p/calm q/{p/vase q/vase} r/vase} :: compute {$slam p/calm q/{p/vase q/vase} r/vase} :: compute
== :: == ::
++ deps :: depend state ++ deps :: depend state
@ -965,10 +965,10 @@
|- ^- vase |- ^- vase
?~ yom [[%atom %n ~] ~] ?~ yom [[%atom %n ~] ~]
(slop q.i.yom $(yom t.yom)) (slop q.i.yom $(yom t.yom))
^- twig ^- hoon
:+ %cncb [%& 2]~ :+ %cncb [%& 2]~
=+ axe=3 =+ axe=3
|- ^- (list (pair wing twig)) |- ^- (list (pair wing hoon))
?~ yom ~ ?~ yom ~
:- [p.i.yom [%$ (peg axe 2)]] :- [p.i.yom [%$ (peg axe 2)]]
$(yom t.yom, axe (peg axe 3)) $(yom t.yom, axe (peg axe 3))
@ -1036,7 +1036,7 @@
(fine cof bem(r [%ud ((hard @) +.+:(need u.von))])) (fine cof bem(r [%ud ((hard @) +.+:(need u.von))]))
:: ::
++ lane :: type infer ++ lane :: type infer
|= {cof/cafe typ/type gen/twig} |= {cof/cafe typ/type gen/hoon}
%+ (cowl cof) (mule |.((~(play ut typ) gen))) %+ (cowl cof) (mule |.((~(play ut typ) gen)))
|=(ref/type ref) |=(ref/type ref)
:: ::
@ -1211,10 +1211,10 @@
:: ::
++ mail :: cached mint ++ mail :: cached mint
~/ %mail ~/ %mail
|= {cof/cafe sut/type gen/twig} |= {cof/cafe sut/type gen/hoon}
^- (bolt (pair type nock)) ^- (bolt (pair type nock))
%+ (clef %slim) (fine cof sut gen) %+ (clef %slim) (fine cof sut gen)
|= {cof/cafe sut/type gen/twig} |= {cof/cafe sut/type gen/hoon}
=+ puz=(mule |.((~(mint ut sut) [%noun gen]))) =+ puz=(mule |.((~(mint ut sut) [%noun gen])))
?- -.puz ?- -.puz
$| (flaw cof p.puz) $| (flaw cof p.puz)
@ -1223,7 +1223,7 @@
:: ::
++ maim :: slap ++ maim :: slap
~/ %maim ~/ %maim
|= {cof/cafe vax/vase gen/twig} |= {cof/cafe vax/vase gen/hoon}
^- (bolt vase) ^- (bolt vase)
%+ cope (mail cof p.vax gen) %+ cope (mail cof p.vax gen)
|= {cof/cafe typ/type fol/nock} |= {cof/cafe typ/type fol/nock}
@ -1440,26 +1440,26 @@
++ meow :: assemble ++ meow :: assemble
:: =+ dyv=0 :: =+ dyv=0
|= {how/beam arg/coin} |= {how/beam arg/coin}
=| $: rop/(map term (pair hoof twig)) :: structures =| $: rop/(map term (pair hoof hoon)) :: structures
bil/(map term (pair hoof twig)) :: libraries bil/(map term (pair hoof hoon)) :: libraries
boy/(list twig) :: body stack boy/(list hoon) :: body stack
lit/? :: drop arguments lit/? :: drop arguments
== ==
~% %meow ..meow ~ ~% %meow ..meow ~
|% |%
++ able :: assemble preamble ++ able :: assemble preamble
^- twig ^- hoon
:+ %tsgr :+ %tsgr
?: =(~ rop) ?: =(~ rop)
[%$ 1] [%$ 1]
:+ %brcn [~ ~] :+ %brcn [~ ~]
=- [[0 [~ ~] -] ~ ~] =- [[0 [~ ~] -] ~ ~]
(~(run by rop) |=({^ a/twig} [~ %ash a])) (~(run by rop) |=({^ a/hoon} [~ %ash a]))
?: =(~ bil) ?: =(~ bil)
[%$ 1] [%$ 1]
:+ %brcn [~ ~] :+ %brcn [~ ~]
=- [[0 [~ ~] -] ~ ~] =- [[0 [~ ~] -] ~ ~]
(~(run by bil) |=({^ a/twig} [~ %ash a])) (~(run by bil) |=({^ a/hoon} [~ %ash a]))
:: ::
++ abut :: generate ++ abut :: generate
|= {cof/cafe hyd/hood} |= {cof/cafe hyd/hood}

12
sys/zuse.hoon
View File

@ -774,7 +774,7 @@
== :: == ::
++ hoof (trel ? term (unit (pair case ship))) :: resource reference ++ hoof (trel ? term (unit (pair case ship))) :: resource reference
++ hoop :: source in hood ++ hoop :: source in hood
$% {$& p/twig} :: direct twig $% {$& p/hoon} :: direct hoon
{$| p/beam} :: resource location {$| p/beam} :: resource location
== :: == ::
++ hops :: XX late-bound path ++ hops :: XX late-bound path
@ -782,8 +782,8 @@
pof/(unit {p/@ud q/tyke}) :: pof/(unit {p/@ud q/tyke}) ::
== :: == ::
++ horn :: resource tree ++ horn :: resource tree
$% {$ape p/twig} :: /~ twig by hand $% {$ape p/hoon} :: /~ hoon by hand
{$arg p/twig} :: /$ argument {$arg p/hoon} :: /$ argument
{$alt p/(list horn)} :: /| options {$alt p/(list horn)} :: /| options
{$dep p/horn} :: /# insert dephash {$dep p/horn} :: /# insert dephash
{$dub p/term q/horn} :: /= apply face {$dub p/term q/horn} :: /= apply face
@ -795,9 +795,9 @@
{$nap p/horn} :: /_ homo map {$nap p/horn} :: /_ homo map
{$now p/horn} :: deprecated {$now p/horn} :: deprecated
{$nod p/term q/horn} :: /_ @ list by odor {$nod p/term q/horn} :: /_ @ list by odor
{$saw p/twig q/horn} :: /; operate on {$saw p/hoon q/horn} :: /; operate on
{$see p/hops q/horn} :: /: relative to {$see p/hops q/horn} :: /: relative to
{$sic p/twig q/horn} :: /^ cast {$sic p/hoon q/horn} :: /^ cast
{$toy p/? q/mark} :: /mark/ static/hook {$toy p/? q/mark} :: /mark/ static/hook
== :: == ::
++ milk (trel ship desk silk) :: sourced silk ++ milk (trel ship desk silk) :: sourced silk
@ -820,7 +820,7 @@
{$pact p/silk q/silk} :: patch {$pact p/silk q/silk} :: patch
{$plan p/beam q/coin r/hood} :: structured assembly {$plan p/beam q/coin r/hood} :: structured assembly
{$reef $~} :: kernel reef {$reef $~} :: kernel reef
{$ride p/twig q/silk} :: silk thru twig {$ride p/hoon q/silk} :: silk thru hoon
{$tabl p/(list (pair silk silk))} :: list {$tabl p/(list (pair silk silk))} :: list
{$vale p/mark q/*} :: validate {$vale p/mark q/*} :: validate
{$volt p/(cask *)} :: unsafe add type {$volt p/(cask *)} :: unsafe add type