Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk

app/dojo.hoon

@@ -54,6 +54,7 @@
           {$ge p/dojo-model}                            ::  generator
           {$dv p/path}                                  ::  core from source
           {$ex p/twig}                                  ::  hoon expression
+          {$sa p/mark}                                  ::  example mark value
           {$as p/mark q/dojo-source}                    ::  simple transmute
           {$do p/twig q/dojo-source}                    ::  gate apply
           {$tu p/(list dojo-source)}                    ::  tuple
@@ -272,6 +273,7 @@
       ;~  pose
         (stag %ex dp-twig)
         (stag %tu (ifix [sel ser] (most ace dp-source)))
+        (stag %sa ;~(pfix tar pam sym))
       ==
     ::
     ++  dp-config                                       ::  ++dojo-config
@@ -361,6 +363,7 @@
       ?-    -.bul
         $ex  [bul +>.$]
         $dv  [bul +>.$]
+        $sa  [bul +>.$]
         $as  =^(mor +>.$ (dy-init-source q.bul) [bul(q mor) +>.$])
         $do  =^(mor +>.$ (dy-init-source q.bul) [bul(q mor) +>.$])
         $ge  =^(mod +>.$ (dy-init-model p.bul) [[%ge mod] +>.$])
@@ -1138,6 +1141,7 @@
           $^  {dy-shown dy-shown}
           $%  {$ur (unit knot) purl:eyre}
               {$dv path}
+              {$sa mark}
               {$as mark dy-shown}
               {$do twig dy-shown}
               {$ge path (list dy-shown) (map term (unit dy-shown))}
@@ -1150,7 +1154,7 @@
       =+  `{@ bil/dojo-build}`a
       |-  ^-  dy-shown
       ?-  -.bil
-        $?($ur $dv)  bil
+        $?($ur $dv $sa)  bil
         $ex  ?.  ?=({$cltr *} p.bil)  p.bil
                  |-  ^-  twig
                  ?~  p.p.bil  !!
@@ -1316,6 +1320,7 @@
         $ge  (dy-silk-config (dy-cage p.p.p.bil) q.p.bil)
         $dv  [/hand [%core he-beak (flop p.bil)]]
         $ex  [/hand (dy-mare p.bil)]
+        $sa  [/hand [%bunt p.bil]]
         $as  [/hand [%cast p.bil [%$ (dy-cage p.q.bil)]]]
         $do  [/hand [%call (dy-mare p.bil) [%$ (dy-cage p.q.bil)]]]
         $tu  :-  /hand

lib/oauth2.hoon

@@ -19,7 +19,14 @@
   |=  {a/purl b/quay}  ^-  hiss
   =.  b  (quay:hep-to-cab b)
   =-  [a %post - ?~(b ~ (some (as-octt +:(tail:earn b))))]
-  (my content-type+['application/x-www-form-urlencoded']~ ~)
+  %^  my
+    :+  %accept
+      'application/json'
+    ~
+    :+  %content-type
+      'application/x-www-form-urlencoded'
+    ~
+    ~
 ::
 ++  mean-wall  !.
   |=  {a/term b/tape}  ^+  !!

sys/hoon.hoon

@@ -9948,8 +9948,6 @@
           scab
           (cold [%base %cell] ket)
         ==
-      :-  '.'
-        scab
       :-  ['a' 'z']
         ;~  pose
           (stag %bcts ;~(plug sym ;~(pfix ;~(pose fas tis) wyde)))
@@ -9964,8 +9962,8 @@
     :~
       :-  ','
         ;~  pose
+          ;~(pfix com wyde)
           (stag %wing rope)
-          ;~(pfix com (stag %ktsg wide))
         ==
       :-  '!'
         ;~  pose
@@ -10014,7 +10012,7 @@
         (stag %bccl (ifix [kel ker] (most ace wyde)))
       :-  '*'
         ;~  pose
-          (stag %bunt ;~(pfix tar wide))
+          (stag %bunt ;~(pfix tar wyde))
           (cold [%base %noun] tar)
         ==
       :-  '@'
@@ -10082,7 +10080,7 @@
             ;~  pfix  tar
               (stag %kthp (stag [%base %noun] ;~(pfix tec wide)))
             ==
-            (stag %kthp ;~(plug wide ;~(pfix tec wide)))
+            (stag %kthp ;~(plug wyde ;~(pfix tec wide)))
             (stag %ktls ;~(pfix lus ;~(plug wide ;~(pfix tec wide))))
             (cook |=(a/twig [[%rock %n ~] a]) wide)
           ==
@@ -10193,7 +10191,7 @@
                     ['.' (runo dot %brdt [~ ~] expa)]
                     ['-' (runo hep %brhp [~ ~] expa)]
                     ['^' (runo ket %brkt [~ ~] expx)]
-                    ['~' (runo sig %brsg [~ ~] expb)]
+                    ['~' (runo sig %brsg [~ ~] exqc)]
                     ['*' (runo tar %brtr [~ ~] exqc)]
                     ['=' (runo tis %brts [~ ~] exqc)]
                     ['?' (runo wut %brwt [~ ~] expa)]
@@ -10203,15 +10201,15 @@
               ;~  pfix  buc
                 %-  stew
                 ^.  stet  ^.  limo
-                :~  ['@' (rune pat %bcpt expb)]
+                :~  ['@' (rune pat %bcpt exqb)]
                     ['_' (rune cab %bccb expa)]
-                    [':' (rune col %bccl exps)]
-                    ['%' (rune cen %bccn exps)]
-                    ['^' (rune ket %bckt expb)]
-                    ['-' (rune hep %bchp expb)]
-                    ['=' (rune tis %bcts expg)]
-                    ['?' (rune wut %bcwt exps)]
-                    [';' (rune sem %bcsm expa)]
+                    [':' (rune col %bccl exqs)]
+                    ['%' (rune cen %bccn exqs)]
+                    ['^' (rune ket %bckt exqb)]
+                    ['-' (rune hep %bchp exqb)]
+                    ['=' (rune tis %bcts exqg)]
+                    ['?' (rune wut %bcwt exqs)]
+                    [';' (rune sem %bcsm exqa)]
                 ==
               ==
             :-  '%'
@@ -10523,6 +10521,7 @@
     ++  expz  |.(loaf(bug &))                           ::  twig with tracing
     ::    root contents
     ::
+    ++  exqa  |.(loan)                                  ::  one twig
     ++  exqb  |.(;~(gunk loan loan))                    ::  two roots
     ++  exqc  |.(;~(gunk loan loaf))                    ::  root then twig
     ++  exqs  |.((butt hunk))                           ::  closed gapped roots