From b9791880719bd163da1fb1a18f0343ce79a6b067 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 28 Apr 2014 15:24:32 -0700 Subject: [PATCH] Typed cards. --- arvo/ames.hoon | 3 +-- arvo/batz.hoon | 3 +-- arvo/clay.hoon | 3 +-- arvo/dill.hoon | 5 ++--- arvo/eyre.hoon | 3 +-- arvo/hoon.hoon | 53 ++++++++++++-------------------------------------- arvo/zuse.hoon | 34 ++++++++++++++++++++++++++++++++ 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index c4e3ebd20..23f5f3e26 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1428,8 +1428,7 @@ =< |% :: vane interface ++ beat - |= [wru=(unit writ) tea=wire hen=duct fav=curd] - => .(fav ((hard card) fav)) + |= [wru=(unit writ) tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] =^ duy ..knap (knap wru tea hen fav) diff --git a/arvo/batz.hoon b/arvo/batz.hoon index 637cfbfa6..1778ac92f 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -1148,8 +1148,7 @@ ^? :: opaque core |% :: poke/peek pattern ++ beat :: process move - |= [wru=(unit writ) tea=wire hen=duct fav=curd] - => .(fav ((hard card) fav)) + |= [wru=(unit writ) tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] ?: ?=([%crud *] fav) [[[wru [/d hen] [%flog fav]] ~] ..^$] diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 3ad69d0c1..41d307fe5 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -367,8 +367,7 @@ ^? :: opaque core |% :: ++ beat :: update - |= [wru=(unit writ) tea=wire hen=duct fav=curd] - => .(fav ((hard card) fav)) + |= [wru=(unit writ) tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] ?+ -.fav [[[wru hen fav] ~] ..^$] %crud diff --git a/arvo/dill.hoon b/arvo/dill.hoon index fa73790f5..0da69dbd9 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -5,12 +5,11 @@ ^- vane :: kernel instrument =| $: dug=(map duct yard) == :: -|= [now=@da eny=@ sky=$+(* (unit))] :: current invocation +|= [now=@da eny=@ sky=$+(* (unit))] :: current invocation ^? :: opaque core |% :: poke/peek pattern ++ beat :: process move - |= [wru=(unit writ) tea=wire hen=duct fav=curd] - => .(fav ((hard card) fav)) + |= [wru=(unit writ) tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] ?: ?=(%flog -.fav) :_ ..^$ diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index f201e7f1f..5171635f1 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1767,8 +1767,7 @@ ^? :: opaque core |% :: ++ beat :: process move - |= [wru=(unit writ) tea=wire hen=duct fav=curd] - => .(fav ((hard card) fav)) + |= [wru=(unit writ) tea=wire hen=duct fav=card] =. ney (shax :(mix (shax now) +(eny) ney)) :: XX!! shd not need ?: ?=(%crud -.fav) [[[wru [/d hen] %flog fav] ~] ..^$] diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index ebb832bc4..4595c8e04 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -4721,6 +4721,10 @@ |= [gat=type sam=type] (~(play ut [%cell gat sam]) [%cncl [~ 2] [~ 3]]) :: +++ slym + |= [gat=vase sam=*] ^- vase + (slap gat(+<.q sam) [%cnzy %$]) +:: ++ slap |= [vax=vase gen=twig] ^- vase =+ gun=(~(mint ut p.vax) %noun gen) @@ -8069,44 +8073,11 @@ $% [%lead p=ship] :: foreign == :: ++ hilt ?(0 1 2) :: lead iron gold -++ move ,[p=(unit writ) q=duct r=curd] :: typeless move +++ muve ,[p=(unit writ) q=duct r=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 -++ vane $_ :: kernel actor - |+ [now=@da eny=@ sky=$+(* (unit))] :: activate - ^? |% :: - ++ beat :: update - |= $: wru=(unit writ) :: calling identity - pax=wire :: pretext - hen=duct :: channel - fav=curd :: event - == :: - :- p=*(list move) :: actions - q=*vane :: consequence - ++ come :: load state, stale - |= [sam=? old=vase] :: - *vane :: - ++ doze :: next wakeup - |= [now=@da hen=duct] :: channel - *(unit ,@da) :: alarm if any - ++ load :: load state, fresh - |= old=vase :: - *vane :: - ++ raze *vane :: erase all state - ++ scry :: inspect - |= $: our=ship :: observer - ren=@tas :: submode - his=ship :: target - syd=@tas :: project - lot=coin :: version - tyl=path :: location - == :: - *(unit) :: record - ++ stay *vase :: save state, new - ++ vern [_@ud _@ud] :: hoon/vane version - -- :: ++ vile :: reflexive constants $: bet=type :: beat nim=type :: scry @@ -8170,9 +8141,9 @@ hen=duct fav=curd == - ^- [p=(list move) q=_+>.^$] - =+ pro=(slam (slap rig [%cnzy %beat]) [bet.vil +<]) - :- ((hard (list move)) q:(slap pro [%cnzy %p])) + ^- [p=(list muve) q=_+>.^$] + =+ pro=(slym (slap rig [%cnzy %beat]) +<.$) + :- ((hard (list muve)) q:(slap pro [%cnzy %p])) =+ sev=(slap pro [%cnzy %q]) %= +>.^$ ves @@ -8184,7 +8155,7 @@ ++ doze |= [now=@da hen=duct] ^- (unit ,@da) - ((hard (unit ,@da)) q:(slam (slap rig [%cnzy %doze]) [hoz.vil +<])) + ((hard (unit ,@da)) q:(slym (slap rig [%cnzy %doze]) +<)) :: ++ scry |= $: our=ship @@ -8194,7 +8165,7 @@ lot=coin tyl=path == - =+ pro=(slam (slap rig [%cnzy %scry]) [nim.vil +<]) + =+ pro=(slym (slap rig [%cnzy %scry]) +<) ((hard (unit)) q.pro) -- -- @@ -8276,7 +8247,7 @@ (kick [[[~ %iron who] [[(dint p.ovo) ~] p.ovo ~] q.ovo] ~]) :: ++ kick :: complete loop - |= mor=(list move) + |= mor=(list muve) =| ova=(list ovum) =+ rom=mor |- ^- [p=(list ovum) q=(list ,[p=@tas q=vase])] @@ -8293,7 +8264,7 @@ =- $(mor (weld p.nyx t.mor), fan q.nyx) ^= nyx =+ naf=fan - |- ^- [p=(list move) q=_fan] + |- ^- [p=(list muve) q=_fan] ?~ naf [~ ~] ?. =(i.i.q.i.mor p.i.naf) =+ tuh=$(naf t.naf) diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 7c6c5d1be..55099e918 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2554,6 +2554,7 @@ ++ moar ,[p=@ud q=@ud] :: normal change range ++ moat ,[p=case q=case] :: change range ++ mood ,[p=care q=case r=path] :: request in desk +++ move ,[p=(unit writ) q=duct r=card] :: typeless move ++ moth ,[p=meth q=math r=(unit octs)] :: http operation ++ name ,[p=@t q=(unit ,@t) r=(unit ,@t) s=@t] :: first mid/nick last ++ newt ?(%boot %kick %mess %slay %wake) :: lifecycle events @@ -2744,6 +2745,39 @@ == :: ++ tube ,[p=@ta q=@ta r=@ta s=path] :: canonical path ++ tutu ,* :: presumed type +++ vane $_ :: kernel actor + |+ [now=@da eny=@ sky=$+(* (unit))] :: activate + ^? |% :: + ++ beat :: update + |= $: wru=(unit writ) :: calling identity + pax=wire :: pretext + hen=duct :: channel + fav=card :: event + == :: + :- p=*(list move) :: actions + q=*vane :: consequence + ++ come :: load state, stale + |= [sam=? old=vase] :: + *vane :: + ++ doze :: next wakeup + |= [now=@da hen=duct] :: channel + *(unit ,@da) :: alarm if any + ++ load :: load state, fresh + |= old=vase :: + *vane :: + ++ raze *vane :: erase all state + ++ scry :: inspect + |= $: our=ship :: observer + ren=@tas :: submode + his=ship :: target + syd=@tas :: project + lot=coin :: version + tyl=path :: location + == :: + *(unit) :: record + ++ stay *vase :: save state, new + ++ vern [_@ud _@ud] :: hoon/vane version + -- :: ++ wand (list ,[p=life q=ring r=acro]) :: mace in action ++ what :: logical identity $% [%anon ~] :: anonymous