From 1ec5e5acfb5dc733886f0241558ffcd7456a07df Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Wed, 7 Apr 2021 21:14:13 +0200
Subject: [PATCH] hoon: add +stap, path parser

And cleans up a bunch of locally hand-written implementations of it.
---
 pkg/arvo/lib/language-server/parser.hoon | 4 ++--
 pkg/arvo/sys/hoon.hoon                   | 5 ++---
 pkg/arvo/sys/vane/clay.hoon              | 4 ++--
 pkg/arvo/sys/vane/eyre.hoon              | 2 +-
 pkg/arvo/sys/zuse.hoon                   | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/arvo/lib/language-server/parser.hoon b/pkg/arvo/lib/language-server/parser.hoon
index d4f5002fb..58e4b91b7 100644
--- a/pkg/arvo/lib/language-server/parser.hoon
+++ b/pkg/arvo/lib/language-server/parser.hoon
@@ -21,7 +21,7 @@
     (most ;~(plug com gaw) taut-rule)
   ::
     %+  rune  tis
-    ;~(plug sym ;~(pfix gap fas (more fas urs:ab)))
+    ;~(plug sym ;~(pfix gap stap))
   ::
     %+  rune  cen
     ;~(plug sym ;~(pfix gap ;~(pfix cen sym)))
@@ -37,7 +37,7 @@
     ;~  (glue gap)
       sym
       ;~(pfix cen sym)
-      ;~(pfix fas (more fas urs:ab))
+      stap
     ==
   ::
     %+  stag  %tssg
diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon
index 834cbcf39..d40777ca7 100644
--- a/pkg/arvo/sys/hoon.hoon
+++ b/pkg/arvo/sys/hoon.hoon
@@ -5965,9 +5965,8 @@
 ::
 ++  spat  |=(pax=path (crip (spud pax)))                ::  render path to cord
 ++  spud  |=(pax=path ~(ram re (smyt pax)))             ::  render path to tape
-++  stab                                                ::  parse cord to path
-  =+  fel=;~(pfix fas (more fas urs:ab))
-  |=(zep=@t `path`(rash zep fel))
+++  stab  |=(zep=@t `path`(rash zep stap))              ::  parse cord to path
+++  stap  ;~(pfix fas (more fas urs:ab))                ::  path parser
 ::
 ::::  4n: virtualization
   ::
diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index af2f65303..5458e0026 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -869,7 +869,7 @@
         (most ;~(plug com gaw) taut-rule)
       ::
         %+  rune  tis
-        ;~(plug sym ;~(pfix gap fas (more fas urs:ab)))
+        ;~(plug sym ;~(pfix gap stap))
       ::
         %+  rune  cen
         ;~(plug sym ;~(pfix gap ;~(pfix cen sym)))
@@ -885,7 +885,7 @@
         ;~  (glue gap)
           sym
           ;~(pfix cen sym)
-          ;~(pfix fas (more fas urs:ab))
+          ;~(pfix stap)
         ==
       ::
         %+  stag  %tssg
diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon
index b509e7131..c83dac276 100644
--- a/pkg/arvo/sys/vane/eyre.hoon
+++ b/pkg/arvo/sys/vane/eyre.hoon
@@ -215,7 +215,7 @@
   ?:  =('subscribe' u.maybe-key)
     %.  item
     %+  pe  %subscribe
-    (ot id+ni ship+(su fed:ag) app+so path+(su ;~(pfix fas (more fas urs:ab))) ~)
+    (ot id+ni ship+(su fed:ag) app+so path+(su stap) ~)
   ?:  =('unsubscribe' u.maybe-key)
     %.  item
     %+  pe  %unsubscribe
diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon
index 14c34390d..9bdff8718 100644
--- a/pkg/arvo/sys/zuse.hoon
+++ b/pkg/arvo/sys/zuse.hoon
@@ -3458,7 +3458,7 @@
       [(rash a fel) b]
     ::                                                  ::  ++pa:dejs:format
     ++  pa                                              ::  string as path
-      (su ;~(pfix fas (more fas urs:ab)))
+      (su stap)
     ::                                                  ::  ++pe:dejs:format
     ++  pe                                              ::  prefix
       |*  [pre=* wit=fist]