minor cleaning

lib/tree.hoon

@@ -1,64 +1,38 @@
 /-  tree-include
 !:
 |%
-++  extract
-  |=  a=marl  ^-  tape
-  ?~  a  ~
-  %-  weld  :_  $(a t.a)
-  ?.  ?=(_:/(**) i.a)
-    $(a c.i.a)
-  v.i.a.g.i.a
-::
-++  getall
+++  getall                                              :: search in manx
   |=  tag=(list mane)
   |=  ele=manx  ^-  marl
   ?:  (lien tag |=(a=mane =(a n.g.ele)))
     ~[ele]
   (zing (turn c.ele ..$))
-++  baff  |*([a=(unit) b=(trap)] ?^(a a *b))
-++  find-in-tree
-  |*  [paz=fist:jo fun=$+(* (unit))]
-  |=  jon=json
-  =+  a=`(list json)`~[jon]
-  |^  (try)
-  ++  try
-    |.  ^+  *fun
-    ?~  a  ~
-    %+  biff  (paz i.a)
-    |*  [b=(list json) c=*]  ^+  *fun
-    (baff (baff (fun c) try(a b)) try(a t.a))
-  --
 ::
-++  map-to-json
+++  map-to-json                                         :: hoon data to json 
   |*  [a=$+(* cord) b=$+(* json)]
-  |*  c=(map)  ^-  json
+  |*  c=(map)  ^-  json               :: XX c=(map _+<.a _+<.b)
   ~!  c
   (jobe (turn (~(tap by c)) |*([k=* v=*] [(a k) (b v)])))
-:: 
-++  json-front
-  |=  a=json  ^-  json
-  =-  (fall `(unit json)`- ~)
-  %.  a
-  %+  find-in-tree  (ot c/(ar some) gn/so ga/(om so) ~):jo
-  |=  [nom=span atr=(map span cord)]  ^-  (unit json)
-  ?.  (~(has by atr) 'urb:front')  ~
-  ?>  ?=(%meta nom)
-  (biff (~(get by atr) %value) poja)
 ::
-++  read-schem  
-  =<  (cook to-noun (cook to-tree apex))
+::  a.b_c.d => [[%a %b] [%c %d]]
+::  a.b_c, a_b__c => [[%a %b] %c]
+::  a_b_c, a__b_c => [%a [%b %c]]
+++  read-schem                                          :: decode gapped noun
+  =<  (cook to-noun (cook build-grove apex))
   |%
   ++  noun  $|(term [noun noun])       ::  shadow
-  ++  data  $|(term [n=@ l=noun r=data])
+  ::  improper list of possible entry points
+  ++  grove  $|(term [gap=@ sealed=noun pending=grove])
   ++  apex  ;~(plug sym (star ;~(plug delim sym)))
   ++  delim  ;~(pose (cold 0 dot) (cook lent (plus cab)))
-  ++  to-noun  |=(a=data ?@(a a [l.a $(a r.a)]))
-  ++  to-tree
-    |=  [acc=data a=(list ,[p=@u q=term])]
-    %+  roll  a  =<  .(acc ^acc)
-    |=  [[n=@u v=term] acc=data]
-    ?@  acc            [n acc v]
-    ?:  (gth n n.acc)  [n (to-noun acc) v]
-    acc(r $(acc r.acc))
+  ++  to-noun  |=(a=grove ?@(a a [sealed.a $(a pending.a)]))
+  ++  build-grove
+    |=  [a=grove b=(list ,[p=@u q=term])]  ^-  grove
+    %+  roll  b  =<  .(acc a)
+    |=  [[gap=@u v=term] acc=grove]  ^-  grove
+    ?@  acc            [gap acc v]
+    ?:  (gth gap gap.acc)  [gap (to-noun acc) v]
+    acc(pending $(acc pending.acc))
   --
 --
+