From 6ce270ffa4ace7748097dc156e5f351b0f88c868 Mon Sep 17 00:00:00 2001 From: silnem2 <126880409+silnem2@users.noreply.github.com> Date: Tue, 9 Jan 2024 06:53:38 -0800 Subject: [PATCH 1/6] drum: fix off-by-one error in wrd:offset --- pkg/arvo/lib/hood/drum.hoon | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/arvo/lib/hood/drum.hoon b/pkg/arvo/lib/hood/drum.hoon index bec10edf07..532205c505 100644 --- a/pkg/arvo/lib/hood/drum.hoon +++ b/pkg/arvo/lib/hood/drum.hoon @@ -1070,8 +1070,9 @@ ++ wrd :: next or current word |= a=(list @) =| i=@ud + ?~ a i |- ^- @ud - ?: |(?=(~ a) (alnm i.a)) i + ?: |(?=(~ t.a) (alnm i.a)) i $(i +(i), a t.a) -- -- From db3cf2a65317a4c448f6f064293d3d0924c031ef Mon Sep 17 00:00:00 2001 From: wispem-wantex Date: Tue, 23 Jan 2024 20:15:39 -0800 Subject: [PATCH 2/6] test thread: now prints errors/failures in red instead of gray --- pkg/arvo/sys/vane/clay.hoon | 2 +- pkg/arvo/ted/test.hoon | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 65230a0cde..1acf9716e0 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -4552,7 +4552,7 @@ |^ =/ res (mule |.(read)) ?: ?=(%& -.res) p.res %. [[~ ~] ..park] - (slog leaf+"clay: read-at-tako fail {<[desk=syd mun]>}" p.res) + (%*(. slog1 pri 3) leaf+"clay: read-at-tako fail {<[desk=syd mun]>}" p.res) :: ++ read ^- [(unit (unit cage)) _..park] diff --git a/pkg/arvo/ted/test.hoon b/pkg/arvo/ted/test.hoon index d483fb1ff7..927325e94f 100644 --- a/pkg/arvo/ted/test.hoon +++ b/pkg/arvo/ted/test.hoon @@ -17,14 +17,14 @@ :: ++ run-test |= [pax=path test=test-func] - ^- [ok=? =tang] + ^- [ok=? output=tang result=tang] =+ name=(spud pax) =+ run=(mule test) ?- -.run - %| |+(welp p.run leaf+"CRASHED {name}" ~) + %| |+[p.run [leaf+"CRASHED {name}" ~]] %& ?: =(~ p.run) - &+[leaf+"OK {name}"]~ - |+(flop `tang`[leaf+"FAILED {name}" p.run]) + &+[p.run [leaf+"OK {name}" ~]] + |+[p.run [leaf+"FAILED {name}" ~]] == :: +resolve-test-paths: add test names to file paths to form full identifiers :: @@ -119,7 +119,7 @@ ?^ fiz ;< cor=(unit vase) bind:m (build-file:strandio beam.i.fiz) ?~ cor - ~> %slog.0^leaf+"FAILED {(spud s.beam.i.fiz)} (build)" + ~> %slog.3^leaf+"FAILED {(spud s.beam.i.fiz)} (build)" gather-tests(fiz t.fiz, build-ok |) ~> %slog.0^leaf+"built {(spud s.beam.i.fiz)}" =/ arms=(list test-arm) (get-test-arms u.cor) @@ -135,5 +135,6 @@ |= [[=path =test-func] ok=_build-ok] ^+ ok =/ res (run-test path test-func) -%- (slog (flop tang.res)) +%- (%*(. slog pri ?:(ok.res 0 3)) output.res) +%- (%*(. slog pri ?:(ok.res 0 3)) result.res) &(ok ok.res) From f6097522311d571a73d50bf755d7a91b00e20e33 Mon Sep 17 00:00:00 2001 From: Alessio Date: Thu, 25 Jan 2024 15:04:24 -0800 Subject: [PATCH 3/6] Fix a typo --- pkg/arvo/sys/vane/clay.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 1acf9716e0..0d172ef0b5 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -4552,7 +4552,7 @@ |^ =/ res (mule |.(read)) ?: ?=(%& -.res) p.res %. [[~ ~] ..park] - (%*(. slog1 pri 3) leaf+"clay: read-at-tako fail {<[desk=syd mun]>}" p.res) + (%*(. slog pri 3) leaf+"clay: read-at-tako fail {<[desk=syd mun]>}" p.res) :: ++ read ^- [(unit (unit cage)) _..park] From c5d3be7be2a19963425ee3d481393c4189ff4acd Mon Sep 17 00:00:00 2001 From: pkova Date: Fri, 26 Jan 2024 01:31:21 +0200 Subject: [PATCH 4/6] clay: do not return false conversion gate from build-cast --- pkg/arvo/app/herm.hoon | 1 - pkg/arvo/sys/vane/clay.hoon | 32 +++++++------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/pkg/arvo/app/herm.hoon b/pkg/arvo/app/herm.hoon index f20bf2b2d8..8c2b77f06a 100644 --- a/pkg/arvo/app/herm.hoon +++ b/pkg/arvo/app/herm.hoon @@ -5,7 +5,6 @@ :: keep relevant mark conversions in cache for performance :: /$ blit-to-json %blit %json -/$ json-to-blit %json %blit /$ json-to-task %json %herm-task :: =, jael diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 65230a0cde..9d8d1a7deb 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -749,24 +749,19 @@ :: try direct +grab :: =^ new=vase nub (build-fit %mar b) + =/ rib (mule |.((slap new !,(*hoon grab)))) + =/ arm=? + ?: ?=(%| -.rib) %.n + =/ lab (mule |.((slob a p.p.rib))) + ?: ?=(%| -.lab) %.n + p.lab =/ rab (mule |.((slap new tsgl/[limb/a limb/%grab]))) - ?: &(?=(%& -.rab) ?=(^ q.p.rab)) + ?: &(arm ?=(%& -.rab) ?=(^ q.p.rab)) %+ gain-leak cast+a^b |= nob=state %- (trace 4 |.("{} -> {}: +{(trip a)}:grab:{(trip b)}")) =. nub nob :_(nub vase+p.rab) - :: try +jump - :: - =/ jum (mule |.((slap old tsgl/[limb/b limb/%jump]))) - ?: ?=(%& -.jum) - =/ via !<(mark p.jum) - %- (trace 4 |.("{} -> {}: via {} per +jump:{(trip a)}")) - (compose-casts a via b) - ?: ?=(%& -.rab) - =/ via !<(mark p.rab) - %- (trace 4 |.("{} -> {}: via {} per +grab:{(trip b)}")) - (compose-casts a via b) ?: ?=(%noun b) %+ gain-leak cast+a^b |= nob=state @@ -774,19 +769,6 @@ =. nub nob :_(nub vase+same.bud) ~|(no-cast-from+[a b] !!) - :: - ++ compose-casts - |= [x=mark y=mark z=mark] - ^- [soak state] - =^ uno=vase nub (build-cast x y) - =^ dos=vase nub (build-cast y z) - %+ gain-leak cast+x^z - |= nob=state - =. nub nob - :_ nub :- %vase - %+ slap - (with-faces uno+uno dos+dos ~) - !,(*hoon |=(_+<.uno (dos (uno +<)))) :: +build-tube: produce a $tube mark conversion gate from .a to .b :: ++ build-tube From 8dc62a6cbe55567042b174800c9363cb39ff1b15 Mon Sep 17 00:00:00 2001 From: pkova Date: Fri, 26 Jan 2024 19:15:25 +0200 Subject: [PATCH 5/6] clay: restore +jump --- pkg/arvo/sys/vane/clay.hoon | 46 ++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 9d8d1a7deb..d1cc404632 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -729,11 +729,7 @@ :: %- (trace 1 |.("make cast {} -> {}")) =^ old=vase nub (build-fit %mar a) - ?: =/ ram (mule |.((slap old !,(*hoon grow)))) - ?: ?=(%| -.ram) %.n - =/ lab (mule |.((slob b p.p.ram))) - ?: ?=(%| -.lab) %.n - p.lab + ?: (has-arm %grow b old) :: +grow core has .b arm; use that :: %+ gain-leak cast+a^b @@ -749,12 +745,7 @@ :: try direct +grab :: =^ new=vase nub (build-fit %mar b) - =/ rib (mule |.((slap new !,(*hoon grab)))) - =/ arm=? - ?: ?=(%| -.rib) %.n - =/ lab (mule |.((slob a p.p.rib))) - ?: ?=(%| -.lab) %.n - p.lab + =/ arm=? (has-arm %grab a new) =/ rab (mule |.((slap new tsgl/[limb/a limb/%grab]))) ?: &(arm ?=(%& -.rab) ?=(^ q.p.rab)) %+ gain-leak cast+a^b @@ -762,6 +753,17 @@ %- (trace 4 |.("{} -> {}: +{(trip a)}:grab:{(trip b)}")) =. nub nob :_(nub vase+p.rab) + :: try +jump + :: + =/ jum (mule |.((slap old tsgl/[limb/b limb/%jump]))) + ?: &((has-arm %jump a old) ?=(%& -.jum)) + =/ via !<(mark p.jum) + %- (trace 4 |.("{} -> {}: via {} per +jump:{(trip a)}")) + (compose-casts a via b) + ?: &(arm ?=(%& -.rab)) + =/ via !<(mark p.rab) + %- (trace 4 |.("{} -> {}: via {} per +grab:{(trip b)}")) + (compose-casts a via b) ?: ?=(%noun b) %+ gain-leak cast+a^b |= nob=state @@ -769,6 +771,28 @@ =. nub nob :_(nub vase+same.bud) ~|(no-cast-from+[a b] !!) + :: + ++ compose-casts + |= [x=mark y=mark z=mark] + ^- [soak state] + =^ uno=vase nub (build-cast x y) + =^ dos=vase nub (build-cast y z) + %+ gain-leak cast+x^z + |= nob=state + =. nub nob + :_ nub :- %vase + %+ slap + (with-faces uno+uno dos+dos ~) + !,(*hoon |=(_+<.uno (dos (uno +<)))) + :: + ++ has-arm + |= [arm=@tas =mark core=vase] + ^- ? + =/ rib (mule |.((slap core [%wing ~[arm]]))) + ?: ?=(%| -.rib) %.n + =/ lab (mule |.((slob mark p.p.rib))) + ?: ?=(%| -.lab) %.n + p.lab :: +build-tube: produce a $tube mark conversion gate from .a to .b :: ++ build-tube From ab021294d2b3771823c9ba40a9c8446e1e54eacf Mon Sep 17 00:00:00 2001 From: Alessio Date: Tue, 30 Jan 2024 23:08:24 -0800 Subject: [PATCH 6/6] Undo the clay change for now --- pkg/arvo/sys/vane/clay.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 0d172ef0b5..65230a0cde 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -4552,7 +4552,7 @@ |^ =/ res (mule |.(read)) ?: ?=(%& -.res) p.res %. [[~ ~] ..park] - (%*(. slog pri 3) leaf+"clay: read-at-tako fail {<[desk=syd mun]>}" p.res) + (slog leaf+"clay: read-at-tako fail {<[desk=syd mun]>}" p.res) :: ++ read ^- [(unit (unit cage)) _..park]