From 67ab019da8db3bf7a0f700aeda7b5e666c73a146 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 16 May 2014 11:49:15 -0700 Subject: [PATCH] %want doesn't use writ. --- arvo/ames.hoon | 6 +++--- arvo/batz.hoon | 6 ++++-- arvo/clay.hoon | 5 +++-- arvo/eyre.hoon | 10 ++++++---- arvo/gall.hoon | 1 + arvo/zuse.hoon | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 59afe3fa3..8cead3723 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1565,7 +1565,7 @@ :_ fox :~ :+ [~ %iron p.p.bon] [/a /a hen] - `card`[%want q.p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl] + `card`[%want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl] == %re :: %re :_ fox @@ -1584,7 +1584,7 @@ |= him=ship :+ [~ %iron p.p.bon] [/a /a hen] - [%want him /q/yu [q.p.bon r.bon]] + [%want [p.p.bon him] /q/yu [q.p.bon r.bon]] == :: %ouzo @@ -1640,7 +1640,7 @@ :: %want ?> ?=(^ wru) - (~(wise am [now fox]) [q.u.wru p.fav] hen q.fav r.fav) + (~(wise am [now fox]) p.fav hen q.fav r.fav) :: %wake (~(wake am [now fox]) hen) diff --git a/arvo/batz.hoon b/arvo/batz.hoon index 9c125b6d0..66bab5a19 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -787,8 +787,10 @@ %sc good:+>.^$(sac ?~(p.gud ?~(sac ~ +.sac) [u.p.gud sac])) %sp !! %sq =+ tea=(bist %ma r.gud) - (gram [/a [%b tea] ~] [%want p.gud [%q q.gud %b tea] s.gud]) - %sr (gram [/a /b ~] [%want p.gud [%r q.gud] r.gud]) + %+ gram + [/a [%b tea] ~] + [%want [who p.gud] [%q q.gud %b tea] s.gud] + %sr (gram [/a /b ~] [%want [who p.gud] [%r q.gud] r.gud]) %te (gram ~ %tell p.gud) %th (gram [/e ~] %that p.gud q.gud) %tq =+ tea=(bist %ma p.gud) diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 039bb4a18..67aaca79c 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -36,7 +36,7 @@ |= [a=duct b=ship c=[p=@ud q=riff]] :+ [~ %gold who] [/a a] - [%want b [%q %re p.q.c (scot %ud p.c) ~] q.c] + [%want [who b] [%q %re p.q.c (scot %ud p.c) ~] q.c] == :: ++ doze @@ -439,11 +439,12 @@ :: %writ ?> ?=([@ *] tea) + ?> ?=(^ wru) =+ him=(need (slaw %p i.tea)) :_ ..^$ :~ :+ wru [/a [%c ~] hen] - `card`[%want him [%r %re %c t.tea] p.fav] + `card`[%want [q.u.wru him] [%r %re %c t.tea] p.fav] == :: %went :: XX should actually propagate diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index f3421ae89..8b79ef68d 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -362,12 +362,14 @@ ++ haji :: send %pc login |= [him=ship ses=hole] ^+ +> - +>.$(mow :_(mow [wru [/a /e hen] [%want him [%r %pc ~] ses]])) + ?> ?=(^ wru) + +>.$(mow :_(mow [wru [/a /e hen] [%want [q.u.wru him] [%r %pc ~] ses]])) :: ++ hajj :: send %pr response |= [him=ship tus=path har=httr] ^+ +> - +>.$(mow :_(mow [wru [/a /e hen] [%want him [%r %pr tus] har]])) + ?> ?=(^ wru) + +>.$(mow :_(mow [wru [/a /e hen] [%want [q.u.wru him] [%r %pr tus] har]])) :: ++ hare :: receive request |= [tus=path him=ship hor=*] @@ -449,7 +451,7 @@ :_ mow :+ [~ %gold sor.rot] [/a [%e %hork mun ~] hen] - [%want him [%q %pr %e %hork mun ~] ~] + [%want [sor.rot him] [%q %pr %e %hork mun ~] ~] == :: ++ hork :: remote request @@ -474,7 +476,7 @@ :_ mow :+ [~ %gold sor.rot] [/a [%e %hork mun ~] hen] - [%want him [%q %pr %e %hork mun ~] [~ hyx]] + [%want [sor.rot him] [%q %pr %e %hork mun ~] [~ hyx]] :: fon %+ ~(put by fon) him diff --git a/arvo/gall.hoon b/arvo/gall.hoon index ab55e2cd1..20e1d97c0 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -10,6 +10,7 @@ own=(map ship mast) :: apps by ship == :: ++ bone ,@ud :: opaque duct +++ crow ,[p=bone q=hawk] :: ++ seat :: living app $: hiv=vase :: the hive eny=@ :: entropy diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index eeb6a72ac..947f45ca8 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1944,7 +1944,7 @@ [%wait p=@da q=path] :: timer wait [%wake ~] :: timer activate [%waft p=ship q=*] :: response message - [%want p=ship q=path r=*] :: send message + [%want p=sock q=path r=*] :: send message [%warn p=tape] :: syslog [%warp p=ship q=riff] :: file request [%wart p=ship q=@tas r=path s=*] :: service request