From a35bb28e6943c5dc933f85aa57972183a2d188dc Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Wed, 4 Apr 2018 14:15:10 -0400 Subject: [PATCH 1/2] replaces all uses of %# with %~ --- app/talk.hoon | 2 +- sys/hoon.hoon | 4 ++-- sys/vane/clay.hoon | 6 +++--- sys/vane/dill.hoon | 2 +- sys/zuse.hoon | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/talk.hoon b/app/talk.hoon index b285173b7..b2d5373f7 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -2356,7 +2356,7 @@ ?: &(?=(^ pre) p.u.pre) q.u.pre ?: pat.sep " " =- (weld - q:(fall pre [p=| q=" "])) - %# ar-glyf ar + %~ ar-glyf ar ?: =(who self) aud (~(del in aud) [who %inbox]) =/ lis/(list tape) diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 9825636ac..f93baa2ec 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -9800,7 +9800,7 @@ ~>(%mean.[%leaf "rest-loop"] !!) => .(fan (~(gas in fan) leg)) %- fork - %# tap in + %~ tap in %- ~(gas in *(set type)) (turn leg |=({p/type q/hoon} (play(sut p) q))) :: @@ -10269,7 +10269,7 @@ :_ q.doy :_ p.doy %^ cat 3 - %# rent co + %~ rent co :+ %$ %ud %- ~(rep by (~(run by q.s.q.sut) |=(tomb ~(wyt by q)))) |=([[@ a=@u] b=@u] (add a b)) diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index c6f7189fc..cd83df03b 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -2276,7 +2276,7 @@ ?: |(?=($~ for) (may-read u.for %z yon pax)) ~ %- malt %+ skim - %# tap by + %~ tap by =< q %- aeon-to-yaki yon @@ -3001,7 +3001,7 @@ ~ `[pax ~] =+ ^= bof - %- %# int by + %- %~ int by %- ~(uni by `(map path *)`new.dal.dat) %- ~(uni by `(map path *)`cal.dal.dat) %- ~(uni by `(map path *)`can.dal.dat) @@ -3341,7 +3341,7 @@ =. erg.dat %- ~(uni by del) ^- (map path ?) %. |=(lobe %&) - %# run by + %~ run by %- ~(uni by new.dal.dat) %- ~(uni by cal.dal.dat) %- ~(uni by cas) diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index 72ed2a1ef..e0f2829ba 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -454,7 +454,7 @@ ?. ?=($flow -.kyz) ~ %- some %. q.kyz - %# into as + %~ into as :- [~ hen u.ore.all] :* p.kyz [~ ~] diff --git a/sys/zuse.hoon b/sys/zuse.hoon index c2d019057..bbb5c9112 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -4182,7 +4182,7 @@ (weld (trip -.man) `tape`[':' (trip +.man)]) :: :: ++clot:en-xml:html ++ clot ~+ :: self-closing tags - %# has in + %~ has in %- silt ^- (list term) :~ %area %base %br %col %command %embed %hr %img %inputt %keygen %link %meta %param %source %track %wbr From 2346d0bda6c40c71924c4128f90617bbaf01ad49 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Wed, 4 Apr 2018 14:17:13 -0400 Subject: [PATCH 2/2] removes %# --- .travis/pin-parent-pill-pier.url | 2 +- sys/hoon.hoon | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis/pin-parent-pill-pier.url b/.travis/pin-parent-pill-pier.url index 013a9183c..47c4556fc 100644 --- a/.travis/pin-parent-pill-pier.url +++ b/.travis/pin-parent-pill-pier.url @@ -1 +1 @@ -https://ci-piers.urbit.org/zod-807652e1ab88dd7e7edc7ca8593a2ba4fb1f8919.tgz +https://ci-piers.urbit.org/zod-b5aeee11e463f9338909ede5cee13d30883ea807.tgz diff --git a/sys/hoon.hoon b/sys/hoon.hoon index f93baa2ec..95ebc8e3c 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -11966,7 +11966,6 @@ ['-' (rune hep %cnhp expk)] [':' (rune col %cnhp expi)] ['~' (rune sig %cnsg expn)] - ['#' (rune hax %cnsg expn)] ['*' (rune tar %cntr expm)] ['=' (rune tis %cnts exph)] ==