From 13c4dd3416c0b3cb27784170133f1527a59a29e5 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 22 May 2014 11:36:37 -0700 Subject: [PATCH] More interface changes. --- arvo/clay.hoon | 10 +++---- arvo/hoon.hoon | 79 +++++++++++++++----------------------------------- 2 files changed, 29 insertions(+), 60 deletions(-) diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 98e993369..a7b1ff638 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -432,18 +432,18 @@ =+ ryf=((hard riff) s.fav) :_ ..^$ :~ :+ [~ %iron p.p.fav] - [/c [%c (scot %p q.p.fav) r.fav] hen] + [/c [%c (scot %p p.p.fav) (scot %p q.p.fav) r.fav] hen] `card`[%warp [p.p.fav p.p.fav] ryf] == :: %writ - ?> ?=([@ *] tea) - ?> ?=(^ wru) - =+ him=(need (slaw %p i.tea)) + ?> ?=([@ @ *] tea) + =+ our=(need (slaw %p i.tea)) + =+ him=(need (slaw %p i.t.tea)) :_ ..^$ :~ :+ wru [/a [%c ~] hen] - `card`[%want [q.u.wru him] [%r %re %c t.tea] p.fav] + `card`[%want [our him] [%r %re %c t.tea] p.fav] == :: %went :: XX should actually propagate diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index f5d8556f3..9eedf1bfe 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -8769,18 +8769,11 @@ $% [%lead p=ship] :: foreign == :: ++ hilt ?(0 1 2) :: lead iron gold -++ muve ,[p=(unit writ) q=duct r=curd] :: typeless move +++ muve ,[~ p=duct q=curd] :: typeless move ++ ovum ,[p=wire q=curd] :: typeless ovum ++ pane (list ,[p=@tas q=vase]) :: kernel modules ++ pone (list ,[p=@tas q=vise]) :: kernel modules, old ++ ship ,@p :: network identity -++ vile :: reflexive constants - $: bet=type :: beat - nim=type :: scry - vin=type :: vane - hoz=type :: doze - viz=type :: vane - == ++ wire path :: event pretext ++ writ ,[p=helm q=ship] :: authority :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -8803,14 +8796,14 @@ $(hen t.hen) :: ++ vent :: vane core - |= [vil=vile bud=vase ves=vase] + |= [bud=vase ves=vase] |% ++ ruck :: update vase |= [pax=path txt=@ta] ^+ +> =+ arg=[~2000.1.1 0 =>(~ |+(* ~))] =+ rig=(slym ves arg) - =+ rev=(slam (slap bud (rain pax txt)) `vase`[viz.vil bud]) + =+ rev=(slym (slap bud (rain pax txt)) bud) =+ syg=(slym rev arg) =+ ole=(slap rig [%cnzy %stay]) =+ [vol=(slap rig [%cnzy %vern]) vew=(slap syg [%cnzy %vern])] @@ -8824,10 +8817,6 @@ %= +>.$ ves (slam (slap syg [%cnzy %come]) (slop [[%cube sam %atom %f] sam] ole)) == - ++ pown :: de-writ - |= a=(list muve) - ^- (list muve) - (turn a |=(a=muve [~ q.a r.a])) :: ++ wink :: deploy |= [now=@da eny=@ sky=$+(* (unit (unit)))] @@ -8843,7 +8832,7 @@ ?: =(~ pax) (slym (slap rig [%cnzy %call]) [hen fav]) (slym (slap rig [%cnzy %beat]) [pax hen fav]) - :- (pown ((hard (list muve)) q:(slap pro [%cnzy %p]))) + :- ((list muve) q:(slap pro [%cnzy %p])) =+ sev=(slap pro [%cnzy %q]) %= +>.^$ ves @@ -8872,22 +8861,11 @@ -- :: ++ vint :: create vane - |= [vil=vile bud=vase pax=path txt=@ta] :: - (vent vil bud (slam (slap bud (rain pax txt)) [viz.vil bud])) -:: -++ viol :: vane tools - |= but=type - ^- vile - =+ pal=|=(a=@t ^-(type (~(play ut but) (vice a)))) - :* bet=(pal '_[(unit writ) wire duct curd]') - nim=(pal '_[ship @tas ship @tas coin path]') - vin=(pal '_[@da @ $+(* (unit))]') - hoz=(pal '_[@da duct]') - viz=(pal '_vase') - == + |= [bud=vase pax=path txt=@ta] :: + (vent bud (slym (slap bud (rain pax txt)) bud)) :: ++ is :: operate in time - |= [eny=@ vil=vile bud=vase fan=(list ,[p=@tas q=vase])] + |= [eny=@ bud=vase fan=(list ,[p=@tas q=vase])] |_ now=@da ++ beck |= wru=(unit writ) @@ -8915,7 +8893,7 @@ |- ^- (unit (unit)) ?~ fan ~ ?. =(dis p.i.fan) $(fan t.fan) - %- scry:(wink:(vent vil bud q.i.fan) now (shax now) ..^$) + %- scry:(wink:(vent bud q.i.fan) now (shax now) ..^$) [q.u.wru rem his q.p.u.dyc u.ved tyl] :: ++ dink :: vase by char @@ -8935,18 +8913,13 @@ :: ++ doos :: sleep until |= hap=path ^- (unit ,@da) - (doze:(wink:(vent vil bud (dink (dint hap))) now 0 (beck ~)) now [hap ~]) + (doze:(wink:(vent bud (dink (dint hap))) now 0 (beck ~)) now [hap ~]) :: ++ hurl :: start loop no id |= ovo=ovum ^- [p=(list ovum) q=(list ,[p=@tas q=vase])] (kick [[~ [[(dint p.ovo) ~] p.ovo ~] q.ovo] ~]) :: - ++ hymn :: start loop with id - |= [who=ship ovo=ovum] - ^- [p=(list ovum) q=(list ,[p=@tas q=vase])] - (kick [[[~ %iron who] [[(dint p.ovo) ~] p.ovo ~] q.ovo] ~]) - :: ++ kick :: complete loop |= mor=(list muve) =| ova=(list ovum) @@ -8954,29 +8927,26 @@ |- ^- [p=(list ovum) q=(list ,[p=@tas q=vase])] ?~ mor [(flop ova) fan] - :: ~& [%kick-move q.i.mor -.r.i.mor] - ?. ?=(^ q.i.mor) - ~& [%kick-flat -.r.i.mor] + :: ~& [%kick-move p.i.mor -.q.i.mor] + ?. ?=(^ p.i.mor) + ~& [%kick-flat -.q.i.mor] ~& [%kick-rom rom] $(mor t.mor) - ?~ t.q.i.mor - $(mor t.mor, ova [[i.q.i.mor r.i.mor] ova]) - ?> ?=(^ i.q.i.mor) + ?~ t.p.i.mor + $(mor t.mor, ova [[i.p.i.mor q.i.mor] ova]) + ?> ?=(^ i.p.i.mor) =- $(mor (weld p.nyx t.mor), fan q.nyx) ^= nyx =+ naf=fan |- ^- [p=(list muve) q=_fan] ?~ naf [~ ~] - ?. =(i.i.q.i.mor p.i.naf) + ?. =(i.i.p.i.mor p.i.naf) =+ tuh=$(naf t.naf) [p.tuh [i.naf q.tuh]] - =+ ven=(vent vil bud q.i.naf) - =+ win=(wink:ven now (shax now) (beck p.i.mor)) + =+ ven=(vent bud q.i.naf) + =+ win=(wink:ven now (shax now) (beck ~)) =+ ^= yub - %- beat:win - :: [p.i.mor t.i.q.i.mor t.q.i.mor r.i.mor] - :: [~ t.i.q.i.mor t.q.i.mor r.i.mor] - [t.i.q.i.mor t.q.i.mor r.i.mor] + (beat:win t.i.p.i.mor t.p.i.mor q.i.mor) [p.yub [[p.i.naf ves:q.yub] t.naf]] -- -- @@ -8985,7 +8955,6 @@ :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: =+ pit=`vase`!>(.) :: =+ bud=pit :: becomes tang -=+ vil=(viol p.bud) :: =| eny=@ :: entropy =| fan=(list ,[p=@tas q=vase]) :: =| hom=path :: source path @@ -9028,7 +8997,7 @@ ++ keep :: wakeup delay |= [now=@da hap=path] => .(+< ((hard ,[now=@da hap=path]) +<)) - (~(doos (is eny vil bud fan) now) hap) + (~(doos (is eny bud fan) now) hap) :: ++ load :: load compatible |= [yen=@ ova=(list ovum) nyf=pane] @@ -9047,7 +9016,7 @@ |= [now=@da hap=path] ^- (unit) ?~ hap [~ stub] - =+ rob=((~(beck (is eny vil bud fan) now) ~) hap) + =+ rob=((~(beck (is eny bud fan) now) ~) hap) ?~ rob ~ ?~ u.rob ~ [~ u.u.rob] @@ -9057,7 +9026,7 @@ =. eny (mix eny (shax now)) ^- [(list ovum) _+>] =^ zef fan - (~(hurl (is eny vil bud fan) now) ovo) + (~(hurl (is eny bud fan) now) ovo) [zef +>.$] :: ++ vega :: reboot kernel @@ -9093,11 +9062,11 @@ |- ^+ fan ?~ fan ~& [%vane `@tas`lal pax `@p`(mug txt)] - [[lal ves:(vint vil bud pax txt)] fan] + [[lal ves:(vint bud pax txt)] fan] ?. =(lal p.i.fan) [i.fan $(fan t.fan)] ~& [%vane `@tas`lal pax `@p`(mug txt)] - [[p.i.fan ves:(ruck:(vent vil bud q.i.fan) pax txt)] t.fan] + [[p.i.fan ves:(ruck:(vent bud q.i.fan) pax txt)] t.fan] == :: ++ wish :: external compute