Merge pull request #847 from urbit/fix-userspace-test

fixes userspace :test compilation failures

app/test.hoon

@@ -115,7 +115,7 @@
   ?-    -.a
       %arvo  ~|(%stub !!) ::basically double solid?
       %hoons  ~&((list-hoons p.a ~) ~)
-      %cores  [ost (build-core [- +]:(list-hoons p.a skip=(sy /sys /ren ~)))]~
+      %cores  [ost (build-core [- +]:(list-hoons p.a skip=(sy /sys /ren /tests ~)))]~
       %names  ~&((list-names p.a) ~)
       %marks  ~|(%stub !!) ::TODO restore historical handler
       %renders  [ost (build-rend [- +]:(list-names (weld /ren p.a)))]~
@@ -161,34 +161,12 @@
     :-  /ren/test-gen       "temporarily disabled"
     :-  /ren/tree/index     "temporarily disabled"
     :-  /ren/tree/elem      "temporarily disabled"
+    :-  /ren/urb            "temporarily disabled"
     :-  /ren/x-urb          "temporarily disabled"
     :-  /ren/x-htm          "temporarily disabled"
     :-  /ren/x-collections-snip          "temporarily disabled"
     :-  /ren/x-collections-json          "temporarily disabled"
-    :-  /ren/urb            "temporarily disabled"
   ::
-    :-  /app/gh             "hangs for some reason"
-    :-  /mar/gh             "hangs for some reason"
-    :-  /app/twit           "slow and/or crash"
-    :-  /gen/twit           "slow and/or crash"
-    :-  /mar/twit           "slow and/or crash"
-    :-  /gen/al             "compiler types out-of-date"
-    :-  /gen/ivory          "compiler types out-of-date"
-    :-  /gen/musk           "compiler types out-of-date"
-    :-  /gen/cosmetic       "incomplete"
-    :-  /gen/lust           "incomplete"
-    :-  /gen/scantastic     "incomplete"
-    :-  /gen/curl           "remove?"
-    :-  /gen/curl-hiss      "remove?"
-    :-  /gen/deco             "obsolete syntax"
-    :-  /lib/down-jet         "obsolete syntax"
-    :-  /lib/down-jet/parse   "obsolete syntax"
-    :-  /mar/lens/command     "obsolete syntax"
-    :-  /mar/down             "obsolete syntax"
-    :-  /sur/twitter          "obsolete syntax"
-    :-  /web/pack/css/codemirror-fonts-bootstrap-tree  "obsolete syntax"
-    :-  /web/pack/js/tree-urb                          "obsolete syntax"
-    :-  /web/unmark/all       "obsolete syntax"
     :-  /web/landscape      "/$ doensn't work in tests"
   ==
 ::
@@ -196,14 +174,35 @@
   ^~  ^-  (map path tape)
   %-  my  :~ ::TODO don't hardcode
   ::
-    :-  /app/pipe           "wants 'flavor:hall' to exist"
+    :-  /app/pipe              "wants 'flavor:hall' to exist"
-    :-  /app/mark-dashboard   "wants old ford"
+    :-  /app/mark-dashboard    "wants old ford"
-    :-  /app/static         "wants old ford"
+    :-  /app/static            "wants old ford"
-    :-  /gen/capitalize     "wants unicode-data/txt"
+    :-  /gen/capitalize        "wants unicode-data/txt"
   ::
-    :-  /lib/twitter              "ford can't handle surs from libs"
+    :-  /app/twit              "depends on sur/twitter"
-    :-  /sys/arvo                 "BROKEN"
+    :-  /gen/twit/as           "depends on sur/twitter"
-    :-  /sys/vane/jael            "expects our"
+    :-  /gen/twit/feed         "depends on sur/twitter"
-    :-  /sys/vane/xmas            "expects our"
+    :-  /mar/twit/cred         "depends on sur/twitter"
+    :-  /mar/twit/feed         "depends on sur/twitter"
+    :-  /mar/twit/post         "depends on sur/twitter"
+    :-  /mar/twit/req          "depends on sur/twitter"
+    :-  /mar/twit/usel         "depends on sur/twitter"
+    :-  /lib/twitter           "depends on sur/twitter"
+    :-  /sur/twitter           "crashes with new type system"
+  ::
+    :-  /gen/al                "compiler types out-of-date"
+    :-  /gen/musk              "compiler types out-of-date"
+  ::
+    :-  /gen/cosmetic          "incomplete"
+    :-  /gen/lust              "incomplete"
+    :-  /gen/scantastic        "incomplete"
+  ::
+    :-  /app/gh                "crashes with new type system"
+    :-  /mar/gh/issue-comment  "wants old 'speech:hall'"
+    :-  /mar/gh/issues         "wants old 'speech:hall'"
+  ::
+    :-  /lib/down-jet          "depends on lib/down-jet/parse"
+    :-  /mar/down              "depends on lib/down-jet/parse"
+    :-  /lib/down-jet/parse    "obsolete syntax"
   ==
 --

gen/deco.hoon

@@ -99,7 +99,7 @@
     ::
     ::  arms producing molds are introduced with {+$}.  the
     ::  compiler will copy the arm decoration onto its product
-    +|
+    :: +|
     +$  spot  [p=@ q=@]                                 ::  a coordinate
     +$  tops                                            ::  also a coordinate
       [p=@ q=@]
@@ -121,7 +121,7 @@
     ::
     ::  other languages might call these "type constructors"
     ::  or "higher-kinded types".
-    +|
+    :: +|
     ++  binary-tree                                     ::  tree pattern
       |*  a=$-(* *)
       $@(~ [n=a l=(binary-tree a) r=(binary-tree a)])
@@ -129,7 +129,7 @@
     ::  #  %constant
     ::  #
     ::    if you have constants, put them in their own chapter.
-    +|
+    :: +|
     ++  answer                                          ::  answer to everything
       42
     --
@@ -170,7 +170,7 @@
   =/  foo  (add 2 2)
   =/  bar  (add (mul num foo) 2)
   =/  moo  (mul num bar)                                ::  for all the cows
-  "goodbye and {(scot %ud moo)}, {(rip 3 txt)}"
+  "goodbye and {(scow %ud moo)}, {(rip 3 txt)}"
 ::
 ++  say-minimum                                         ::  minimal decoration
   |=  txt=term

gen/ivory.hoon

@@ -31,7 +31,7 @@
 ::
 ::  whole-hoon: arvo within compiler
 ::
-=+  whole-hoon=`hoon`[%tsgr compiler-hoon [%tsgr [%$ 7] (ream arvo-source)]]
+=+  whole-hoon=`hoon`[%tsbn compiler-hoon [%tsbn [%$ 7] (ream arvo-source)]]
 ::
 ::  compile the whole schmeer
 ::

mar/lens/command.hoon

@@ -2,13 +2,13 @@
 /+    old-zuse
 ::
 =,  old-zuse
-|_  com/command:lens
+|_  com/command:^^lens
 ++  grab
   |%
-  ++  noun  command:lens
+  ++  noun  command:^^lens
   ++  json
     |=  jon/^json
-    ^-  command:lens
+    ^-  command:^^lens
     ~|  jon=jon
     %-  need
     %.  jon
@@ -19,7 +19,7 @@
         ==
     |%
     ++  source
-      ^-  $-(^json (unit source:lens))
+      ^-  $-(^json (unit source:^^lens))
       |=  jon/^json
       =+  tuple=%.(jon (ar source))
       ?^  tuple
@@ -42,7 +42,7 @@
         hoon+(ot code+so:jo next+source ~)
       ==
     ++  sink
-      ^-  $-(^json (unit sink:lens))
+      ^-  $-(^json (unit sink:^^lens))
       %-  of  :~
         stdout+|=(^json (some ~))
         output-file+so:jo

sur/sole.hoon

@@ -77,7 +77,7 @@
   %^    trel                                            ::  fetch and continue
       (unit knot)
     hiss:eyre
-  $-(httr:eyre $;(..$))
+  $-(httr:eyre (sole-request out))
 --
 |%
 ::                                                      ::

web/pack/css/codemirror-fonts-bootstrap-tree.hoon

@@ -1,11 +0,0 @@
-::  All tree css
-::
-::::  /hoon/codemirror-fonts-bootstrap-tree/pack/web
-  ::
-/^  (list @t)
-  /.    /:/===/web/lib/css/codemirror:/css/
-        /:/===/web/lib/css/fonts:/css/
-        /:/===/web/lib/css/bootstrap:/css/
-        /:/===/web/tree/main:/css/
-  ==
-(rap 3 -.-)

web/pack/js/tree-urb.hoon

@@ -1,9 +0,0 @@
-::  All tree js
-::
-::::  /hoon/tree-urb/pack/web
-  ::
-/^  (list @t)
-  /.    /:/===/web/tree/main:/js/
-        /:/===/web/lib/js/urb:/js/
-  ==
-(rap 3 -.-)

web/unmark/all.hoon

@@ -48,7 +48,7 @@
     {@ {$id *} *}   g.a(a t.a.g.a)
     {$$ {$$ *} ~}
       =<  g.a(v.i.a (tufa (turn (tuba v.i.a.g.a) .)))
-      |=(b/@c `@`?+(b b ~-~201c. '"', ~-~201d. '"'))
+      |=(b/@c `@`?+(b b %~-~201c. '"', %~-~201d. '"'))
   ==
 --
 ::