From 2eb534980256ca8598333616f3bceb164183a9e9 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Fri, 1 Dec 2017 18:23:33 -0800
Subject: [PATCH] add base path, =dub arguments to +solid

---
 gen/solid.hoon | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/gen/solid.hoon b/gen/solid.hoon
index 35e061130..355b0e34b 100644
--- a/gen/solid.hoon
+++ b/gen/solid.hoon
@@ -11,26 +11,44 @@
   !:
 :-  %say
 |=  $:  {now/@da eny/@uvJ bec/beak}
-        {$~ $~}
+        {arg/$@($~ {top/path $~}) dub/_|}
     ==
 :-  %noun
-=+  top=`path`/(scot %p p.bec)/[q.bec]/(scot %da now)/sys
-=+  pax=`path`(weld top `path`[%hoon ~])
-=+  arp=`path`(weld top `path`[%ovra ~])
+?~  arg  $(arg ~[top=`path`/(scot %p p.bec)/[q.bec]/(scot %da now)/sys])
+=+  pax=`path`(weld top.arg `path`[%hoon ~])
+=+  arp=`path`(weld top.arg `path`[%ovra ~])
 ~&  %solid-start
 =+  txt=.^(@t %cx (weld pax `path`[%hoon ~]))
 =+  rax=.^(@t %cx (weld arp `path`[%hoon ~]))
 =+  ^=  ken
-    =-  ?:(?=($& -.res) p.res ((slog p.res) ~))
+    =-  ?:(?=($& -.res) p.res (mean (flop p.res)))
     ^=  res  %-  mule  |.
     ~&  %solid-loaded
     =+  gen=(rain pax txt)
     ~&  %solid-parsed
     =+  one=(~(mint ut %noun) %noun gen)
     ~&  %solid-compiled
-    =+  two=(~(mint ut p.one) %noun (rain arp rax))
-    ~&  %solid-arvo
-    [7 q.one q.two]
+    ?.  dub
+      =+  two=(~(mint ut p.one) %noun (rain arp rax))
+      ~&  %solid-arvo
+      [7 q.one q.two]
+    =/  tri
+      '''
+      :: XX moveme to, uh arvo probably, this depends on too many names
+      |=  [pax=path txt=@t arp=path rax=@t]
+      =+  gen=(rain pax txt)
+      ~&  %solid-double-parsed
+      =+  one=(~(mint ut %noun) %noun gen)
+      ~&  %solid-double-compiled
+      =+  two=(~(mint ut p.one) %noun (rain arp rax))
+      ~&  %solid-arvo
+      [7 q.one q.two]
+      '''
+    =+  all=.*(0 q.one)
+    .*  all
+    :+  7  =<(+ .*(all [9 2 0+2 1+[p.one tri] 0+7]))
+    [9 2 0+2 1+[pax txt arp rax] 0+7]
+::
 ~&  [%solid-kernel `@ux`(mug ken)]
 :-  ken
 =+  all=.*(0 ken)
@@ -46,7 +64,7 @@
     ==
 |-  ^+  all
 ?~  vay  all
-=+  pax=(weld top q.i.vay)
+=+  pax=(weld top.arg q.i.vay)
 =+  txt=.^(@ %cx (weld pax `path`[%hoon ~]))
 =+  sam=[now `ovum`[[%gold ~] [%veer p.i.vay pax txt]]]
 ~&  [%solid-veer i.vay]