From b752cf660ebff9a1f59d2725c5ff8b016dd1be27 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 17:12:12 -0700 Subject: [PATCH] hoon: add parsing for barhax --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 23 ++++++++++++++++++++++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index da5405ad3..699e21881 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:261b5519801f67fa67e2d25d9c9a6ed7ed0ee2b1a59212e747c25e07a4db7b7c -size 11826986 +oid sha256:f50afa10e1b6717588993c72b07e7d0d78fd1e1fb49ce622e21bd388fb9816c0 +size 11905774 diff --git a/bin/ivory.pill b/bin/ivory.pill index 790dc6f6c..9f46af497 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8bbbf19d0465d3bb0bf0e8c50ed45425d19d104b0be60f3123bab3e7b3ef72d -size 6825127 +oid sha256:1929016ed07eb30180a89e0acbb6ca84c2dc1ed75125fd85ae9b6edf961d0383 +size 6911186 diff --git a/bin/solid.pill b/bin/solid.pill index c612ed856..23b7a32ff 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:242cb0f06cbdbe26e0142089a0ff6896296b6809ea3cd618e557b4bd03ce8e32 -size 14470098 +oid sha256:617a0ed90f752dca5710bfd029dda0a601d4d1adcc17412f4f5f1b00218d7d67 +size 14553418 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index c8207b119..177687933 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -16842,6 +16842,22 @@ ?. tol wide ;~(pose wide tall) + ++ lunx + =/ wid (ifix [lac rac] (most ace sym)) + =/ tal + ;~ sfix + (most gap sym) + ;~(plug gap duz) + == + =/ one + %- cook :_ sym + |= a=term + `(list term)`~[a] + %- cook + :_ ;~(pose (runq wid tal) one) + :: lestify + |= a=(list term) + ?~(a !! a) ++ whap !: :: chapter %+ cook |= a=(list (pair term hoon)) @@ -16922,6 +16938,11 @@ |@ ++ $ ;~(pfix dif (stag hil (stag tuq (toad har)))) -- + ++ runq :: wide or tall if tol + |* [wid/rule tal/rule] :: else wide + ?. tol + wid + ;~(pose wid tal) :: ++ glop ~+((glue mash)) :: separated by space ++ gunk ~+((glue muck)) :: separated list @@ -17011,7 +17032,7 @@ ++ exqc |.(;~(gunk loan loaf)) :: spec then hoon ++ exqd |.(;~(gunk loaf loan)) :: hoon then spec ++ exqf |.(;~(gunk lynx loan)) :: list of names then spec - ++ exqe |.(;~(gunk (butt huns) loan)) :: list of names then spec + ++ exqe |.(;~(gunk lunx loan)) :: list of names then spec ++ exqs |.((butt hunk)) :: closed gapped specs ++ exqg |.(;~(gunk sym loan)) :: term and spec ++ exqk |.(;~(gunk loaf ;~(plug loan (easy ~)))) :: hoon with one spec