diff --git a/lib/http.hoon b/lib/http.hoon
index deb8fa71c..ee0ae1c4f 100644
--- a/lib/http.hoon
+++ b/lib/http.hoon
@@ -7,12 +7,12 @@
!:
|%
++ request
- $: domain=(list cord) end-point=path
- req-type=$?(%get [%post p=json]) headers=math
- queries=quay
+ _: domain+(list cord) end-point=path
+ req-type+_?($get {$post p=json}) headers=math
+ queries+quay
==
++ send
- |= [ost=bone pour-path=wire params=request]
+ |= {ost+bone pour-path+wire params+request}
:^ ost %them pour-path
`(unit hiss)`[~ (request-to-hiss params)]
::
diff --git a/mar/acto-game.hoon b/mar/acto-game.hoon
index aabf793c1..535d4ae3d 100644
--- a/mar/acto-game.hoon
+++ b/mar/acto-game.hoon
@@ -3,10 +3,10 @@
::
/? 310
!:
-|_ cod=[who=? box=@ boo=@] :: game state
+|_ cod+{who+? box+@ boo+@} :: game state
::
++ grab :: convert from
|%
- ++ noun ,[who=? box=@ boo=@] :: clam from %noun
+ ++ noun {who+? box+@ boo+@} :: clam from $noun
--
--
diff --git a/mar/ask-mail.hoon b/mar/ask-mail.hoon
index 8536c5ce1..e71f9f0b4 100644
--- a/mar/ask-mail.hoon
+++ b/mar/ask-mail.hoon
@@ -2,11 +2,11 @@
:::: /hoon/ask-mail/mar
::
/? 314
-|_ txt=cord
+|_ txt+cord
::
++ grab :: convert from
|%
- ++ noun ,@t :: clam from %noun
+ ++ noun @t :: clam from %noun
++ json (cork so:jo need)
--
++ grow
diff --git a/mar/atom.hoon b/mar/atom.hoon
index f68149061..b9b2fc31d 100644
--- a/mar/atom.hoon
+++ b/mar/atom.hoon
@@ -4,10 +4,10 @@
/? 314
!:
:::: A minimal atom mark
-|_ ato=@
+|_ ato+@
++ grab |%
- ++ noun ,@
- ++ mime |=([* p=octs] q.p)
+ ++ noun @
+ ++ mime |=({* p+octs} q.p)
--
++ grow |%
++ mime [/aplication/x-urb-unknown (taco ato)]
diff --git a/mar/client-secret.hoon b/mar/client-secret.hoon
index 4796b1362..8705583c0 100644
--- a/mar/client-secret.hoon
+++ b/mar/client-secret.hoon
@@ -6,7 +6,7 @@
::
++ grab :: convert from
|%
- ++ noun ,@t :: clam from %noun
+ ++ noun @t :: clam from %noun
++ json (cork so:jo need)
--
--
diff --git a/mar/coffee.hoon b/mar/coffee.hoon
index d34dd5d29..1fb292c06 100644
--- a/mar/coffee.hoon
+++ b/mar/coffee.hoon
@@ -9,8 +9,8 @@
--
++ grab
|%
- ++ mime |=([p=mite q=octs] (,@t q.q))
- ++ noun ,@t
+ ++ mime |=({p+mite q+octs} (@t q.q))
+ ++ noun @t
--
++ grad %mime
--
diff --git a/mar/css.hoon b/mar/css.hoon
index b84027f2c..14b303f50 100644
--- a/mar/css.hoon
+++ b/mar/css.hoon
@@ -11,8 +11,8 @@
--
++ grab
|% :: convert from
- ++ mime |=([p=mite q=octs] (,@t q.q))
- ++ noun ,@t :: clam from %noun
+ ++ mime |=({p+mite q+octs} (@t q.q))
+ ++ noun @t :: clam from %noun
--
++ grad %mime
--
diff --git a/mar/down.hoon b/mar/down.hoon
index 6bac4cb0c..6a1dc35a9 100644
--- a/mar/down.hoon
+++ b/mar/down.hoon
@@ -8,12 +8,12 @@
::::
::
[markdown .]
-|_ don=down
+|_ don+down
++ grab :: convert from
|%
++ noun down :: clam from %noun
++ md
- |= src=@t
+ |= src+@t
=+ [atr mud]=(parse:frontmatter (lore src))
[[%meta atr] (mark:down-jet mud)]
--
diff --git a/mar/elem.hoon b/mar/elem.hoon
index c81941d7b..3e91e8173 100644
--- a/mar/elem.hoon
+++ b/mar/elem.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/elem/mar
::
/? 314
-|_ own=manx
+|_ own+manx
::
++ grow :: convert to
|%
diff --git a/mar/eot.hoon b/mar/eot.hoon
index 85563ee84..772eb2ec6 100644
--- a/mar/eot.hoon
+++ b/mar/eot.hoon
@@ -5,7 +5,7 @@
::
:::: compute
::
-|_ otf=@
+|_ otf+@
::
++ grow :: convert to
|%
@@ -14,8 +14,8 @@
--
++ grab
|%
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @
--
++ grad %mime
--
diff --git a/mar/helm-hi.hoon b/mar/helm-hi.hoon
index d077762f2..2354f81bf 100644
--- a/mar/helm-hi.hoon
+++ b/mar/helm-hi.hoon
@@ -2,11 +2,11 @@
:::: /hoon/helm-hi/mar
::
/? 314
-|_ txt=cord
+|_ txt+cord
::
++ grab :: convert from
|%
- ++ noun ,@t :: clam from %noun
+ ++ noun @t :: clam from %noun
++ json (cork so:jo need)
--
++ grow
diff --git a/mar/hook.hoon b/mar/hook.hoon
index 0a6dc3a0f..177dc8226 100644
--- a/mar/hook.hoon
+++ b/mar/hook.hoon
@@ -40,8 +40,8 @@
--
++ grab
|% :: convert from
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@t :: clam from %noun
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @t :: clam from %noun
++ txt
|= wan=wain
=+ (role wan)
diff --git a/mar/hoon.hoon b/mar/hoon.hoon
index 08a085ead..b02a011c4 100644
--- a/mar/hoon.hoon
+++ b/mar/hoon.hoon
@@ -41,10 +41,10 @@
--
++ grab
|% :: convert from
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@t :: clam from %noun
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @t :: clam from %noun
++ txt
- |= wan=wain
+ |= wan+wain
^- @t
=+ (role wan)
(end 3 (dec (met 3 -)) -)
diff --git a/mar/html.hoon b/mar/html.hoon
index 192a2ab09..0002aec59 100644
--- a/mar/html.hoon
+++ b/mar/html.hoon
@@ -5,7 +5,7 @@
::
:::: compute
::
-|_ htm=@t
+|_ htm+@t
::
++ grow :: convert to
|% ::
@@ -13,6 +13,6 @@
++ hymn (need (poxa htm)) :: to %hymn
-- ::
++ grab |% :: convert from
- ++ noun ,@t :: clam from %noun
- ++ mime |=([p=mite q=octs] q.q) :: retrieve form %mime
+ ++ noun @t :: clam from %noun
+ ++ mime |=({p+mite q+octs} q.q) :: retrieve form $mime
-- --
diff --git a/mar/httpreq.hoon b/mar/httpreq.hoon
index 21bcadc39..5cc900826 100644
--- a/mar/httpreq.hoon
+++ b/mar/httpreq.hoon
@@ -4,6 +4,6 @@
/? 314
/+ http
::
-|_ req=request:http
+|_ req+request:http
++ grow |% ++ tank >req<
-- --
diff --git a/mar/httr.hoon b/mar/httr.hoon
index ac311e122..8e736f7ef 100644
--- a/mar/httr.hoon
+++ b/mar/httr.hoon
@@ -3,7 +3,7 @@
::
/? 314
!:
-|_ hit=httr
+|_ hit+httr
++ grow |% ++ wall (turn wain trip)
++ wain (lore cord)
++ json (need (poja cord))
diff --git a/mar/hymn.hoon b/mar/hymn.hoon
index 43153b94f..3c18947fd 100644
--- a/mar/hymn.hoon
+++ b/mar/hymn.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/hymn/mar
::
/? 314
-|_ own=manx
+|_ own+manx
::
++ grow :: convert to
|%
diff --git a/mar/index.hoon b/mar/index.hoon
index 86e6f07ea..1ffaec21d 100644
--- a/mar/index.hoon
+++ b/mar/index.hoon
@@ -7,17 +7,17 @@
!:
::::
::
-|_ all=(map path marl)
+|_ all+(map path marl)
::
-++ grow :: convert to
+++ grow :: convert to
|%
++ json
%. all
%+ map-to-json
- |=(a=path (crip (spud a)))
- |=(a=marl [%a (turn a react-to-json)])
+ |=(a+path (crip (spud a)))
+ |=(a+marl [%a (turn a react-to-json)])
--
-++ grab |% :: convert from
- ++ noun (map path marl) :: clam from %noun
+++ grab |% :: convert from
+ ++ noun (map path marl) :: clam from %noun
::++ elem |=(a=manx `_all`[[/ ((getall %h1) a)] ~ ~])
-- --
diff --git a/mar/jam.hoon b/mar/jam.hoon
index a11a4103c..3cf56ebec 100644
--- a/mar/jam.hoon
+++ b/mar/jam.hoon
@@ -2,15 +2,15 @@
:::: /hoon/core/jam/mar
::
!:
-|_ mud=@
+|_ mud+@
++ grow
|%
++ mime [/application/octet-stream (taco mud)]
--
++ grab
|% :: convert from
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@ :: clam from %noun
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @ :: clam from %noun
--
++ grad %mime
--
diff --git a/mar/js.hoon b/mar/js.hoon
index 1bb720ed1..ddbf25a30 100644
--- a/mar/js.hoon
+++ b/mar/js.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/js/mar
::
!:
-|_ mud=@
+|_ mud+@
++ grow
|%
++ mime [/application/javascript (taco (,@t mud))]
@@ -13,7 +13,7 @@
--
++ grab
|% :: convert from
- ++ mime |=([p=mite q=octs] (,@t q.q))
+ ++ mime |=({p+mite q+octs} (@t q.q))
++ noun cord :: clam from %noun
--
++ grad %mime
diff --git a/mar/json.hoon b/mar/json.hoon
index 1350e4de0..526965d9b 100644
--- a/mar/json.hoon
+++ b/mar/json.hoon
@@ -14,7 +14,7 @@
--
++ grab
|% :: convert from
- ++ mime |=([p=mite q=octs] (fall (rush (,@t q.q) apex:poja) *json))
+ ++ mime |=({p+mite q+octs} (fall (rush (@t q.q) apex:poja) *json))
++ noun json :: clam from %noun
++ numb jone
++ time jode
diff --git a/mar/load.hoon b/mar/load.hoon
index de150d2aa..0558886f7 100644
--- a/mar/load.hoon
+++ b/mar/load.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/load/mar
::
!:
-|_ man=span
+|_ man+span
++ grab
|% :: convert from
++ noun span :: clam from %noun
diff --git a/mar/log.hoon b/mar/log.hoon
index b918040a9..590ec67a4 100644
--- a/mar/log.hoon
+++ b/mar/log.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/log/mar
::
!:
-|_ man=span
+|_ man+span
++ grab
|% :: convert from
++ noun span :: clam from %noun
diff --git a/mar/markdown.hoon b/mar/markdown.hoon
index 5017e8870..73be87036 100644
--- a/mar/markdown.hoon
+++ b/mar/markdown.hoon
@@ -13,8 +13,8 @@
--
++ grab
|%
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@t
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @t
++ md |=(@t +<)
++ txt
|= wan=wain
diff --git a/mar/md.hoon b/mar/md.hoon
index fa2e3d9b0..afb04b685 100644
--- a/mar/md.hoon
+++ b/mar/md.hoon
@@ -3,7 +3,7 @@
::
/? 314
::
-|_ mud=@t
+|_ mud+@t
++ grow
|%
++ mime [/text/x-markdown (taco mud)]
@@ -12,8 +12,8 @@
--
++ grab
|%
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@t
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @t
++ txt
|= wan=wain
=+ (role wan)
diff --git a/mar/mdy.hoon b/mar/mdy.hoon
index e3104bd11..a8859adc3 100644
--- a/mar/mdy.hoon
+++ b/mar/mdy.hoon
@@ -4,7 +4,7 @@
/? 314
/+ frontmatter
!:
-|_ [atr=(map cord cord) mud=@t]
+|_ {atr+(map cord cord) mud+@t}
++ grow
|%
++ front atr
@@ -14,7 +14,7 @@
--
++ grab
|%
- ++ noun ,[(map cord cord) @t]
+ ++ noun {(map cord cord) @t}
++ md (cork lore txt)
++ txt parse:frontmatter
--
diff --git a/mar/mess.hoon b/mar/mess.hoon
index 75da94758..dbcb94639 100644
--- a/mar/mess.hoon
+++ b/mar/mess.hoon
@@ -3,7 +3,7 @@
::
/? 314
/- mess
-|_ zig=mess
+|_ zig+mess
::
++ grab
|%
diff --git a/mar/mime.hoon b/mar/mime.hoon
index 95932b393..f41f316e6 100644
--- a/mar/mime.hoon
+++ b/mar/mime.hoon
@@ -3,17 +3,17 @@
::
/? 314
!:
-|_ own=mime
+|_ own+mime
++ grab :: convert from
|%
++ noun mime :: clam from %noun
- ++ tape |=(a=_"" [/application/x-urb-unknown (tact a)])
+ ++ tape |=(a+__("") [/application/x-urb-unknown (tact a)])
--
++ grad
|%
++ form %mime
++ diff |=(mime +<)
++ pact |=(mime +<)
- ++ join |=([mime mime] `(unit mime)`~)
+ ++ join |=({mime mime} `(unit mime)`~)
--
--
diff --git a/mar/oauth-tokens.hoon b/mar/oauth-tokens.hoon
index ff55ae744..70b42e9fd 100644
--- a/mar/oauth-tokens.hoon
+++ b/mar/oauth-tokens.hoon
@@ -4,11 +4,11 @@
::
/? 310
!:
-|_ [tok=@t ref=@t]
+|_ {tok+@t ref+@t}
::
++ grab :: converter arm
|%
- ++ noun ,[@t @t] :: clam from noun
+ ++ noun {@t @t} :: clam from noun
++ json (corl need (ot 'access_token'^so 'refresh_token'^so ~):jo)
--
--
diff --git a/mar/oauth2-code.hoon b/mar/oauth2-code.hoon
index c15d0d6a2..5ed589d0d 100644
--- a/mar/oauth2-code.hoon
+++ b/mar/oauth2-code.hoon
@@ -4,11 +4,11 @@
::
/? 310
!:
-|_ cod=cord
+|_ cod+cord
::
++ grab :: converter arm
|%
- ++ noun ,@t :: clam from noun
+ ++ noun @t :: clam from noun
++ json (cork so:jo need) :: (need (so:jo jon))
--
--
diff --git a/mar/otf.hoon b/mar/otf.hoon
index 10632763c..040fcb384 100644
--- a/mar/otf.hoon
+++ b/mar/otf.hoon
@@ -5,7 +5,7 @@
::
:::: compute
::
-|_ otf=mime
+|_ otf+mime
::
++ grow :: convert to
|%
@@ -13,7 +13,7 @@
--
++ grab
|%
- ++ mime |=([mite p=octs] [/font/otf p])
+ ++ mime |=({mite p+octs} [/font/otf p])
++ noun ^mime
--
++ grad %mime
diff --git a/mar/purl.hoon b/mar/purl.hoon
index 05a3c07fa..64d4acd39 100644
--- a/mar/purl.hoon
+++ b/mar/purl.hoon
@@ -2,7 +2,7 @@
:::: /hoon/purl/mar
::
/? 314
-|_ url=purl
+|_ url+purl
::
++ grow |% ++ hiss [url %get ~ ~]
--
diff --git a/mar/react-snip.hoon b/mar/react-snip.hoon
index 185263c7e..dc958f58b 100644
--- a/mar/react-snip.hoon
+++ b/mar/react-snip.hoon
@@ -7,7 +7,7 @@
::::
::
[. react]
-|_ [hed=marl tal=marl]
+|_ {hed+marl tal+marl}
::
++ grow :: convert to
|%
@@ -27,5 +27,5 @@
--
++ grab |% :: convert from
++ noun manx :: clam from %noun
- ++ snip |=(a=[marl marl] a)
+ ++ snip |=(a+{marl marl} a)
-- --
diff --git a/mar/react.hoon b/mar/react.hoon
index adcb4f94c..ea7a5bf96 100644
--- a/mar/react.hoon
+++ b/mar/react.hoon
@@ -7,7 +7,7 @@
::::
::
[. react]
-|_ own=manx
+|_ own+manx
::
++ grow :: convert to
|%
@@ -19,5 +19,5 @@
--
++ grab |% :: convert from
++ noun manx :: clam from %noun
- ++ elem |= a=manx a
+ ++ elem |= a+manx a
-- --
diff --git a/mar/save.hoon b/mar/save.hoon
index 614b98dc4..530de113f 100644
--- a/mar/save.hoon
+++ b/mar/save.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/save/mar
::
!:
-|_ man=span
+|_ man+span
++ grab
|% :: convert from
++ noun span :: clam from %noun
diff --git a/mar/sched.hoon b/mar/sched.hoon
index 6845f1e81..c9ab2a9e6 100644
--- a/mar/sched.hoon
+++ b/mar/sched.hoon
@@ -1,13 +1,13 @@
!:
:::: /hoon/core/sched/mar
::
-|_ dat=(map ,@da cord)
+|_ dat+(map @da cord)
++ grow :: convert to
|% ++ mime [/text/x-sched (tact tape)]
++ tape
- (zing `wall`(turn sorted-list |=([a=@da b=cord] "{} {(trip b)}\0a")))
+ (zing `wall`(turn sorted-list |=({a+@da b+cord} "{} {(trip b)}\0a")))
++ elem =< ;ul: *{(turn sorted-list .)}
- |= [tym=@da ite=cord] ^- manx
+ |= {tym+@da ite+cord} ^- manx
;li: ;{b "{}"}: {(trip ite)}
++ sorted-list
(sort (~(tap by dat)) |=([[l=@ @] [r=@ @]] (lth l r)))
@@ -15,12 +15,12 @@
++ grab
|% :: convert from
++ mime
- |= [p=mite q=octs] ^+ dat
+ |= {p+mite q+octs} ^+ dat
=< (mo (turn (lore q.q) .))
- |= a=@t ^- [@da @t]
+ |= a+@t ^- {@da @t}
%+ rash a
;~ (glue ace)
- (cook |=(a=coin ?>(?=([~ %da @] a) `@da`q.p.a)) nuck:so)
+ (cook |=(a+coin ?>(?=({$~ $da @} a) `@da`q.p.a)) nuck:so)
(cook crip (star prn))
==
--
diff --git a/mar/snip.hoon b/mar/snip.hoon
index 54a8660c1..bda56bf43 100644
--- a/mar/snip.hoon
+++ b/mar/snip.hoon
@@ -6,11 +6,11 @@
|%
++ words 1
++ hedtal
- =| met=marl
- |= a=marl ^- [hed=marl tal=marl]
+ =| met+marl
+ |= a+marl ^- {hed+marl tal+marl}
?~ a [~ ~]
- ?. ?=(%h1 n.g.i.a)
- ?: ?=(%meta n.g.i.a)
+ ?. ?=($h1 n.g.i.a)
+ ?: ?=($meta n.g.i.a)
$(a t.a, met [i.a met])
=+ had=$(a c.i.a)
?^ -.had had
@@ -18,19 +18,19 @@
[c.i.a (weld (flop met) (limit words t.a))]
::
++ limit
- |= [lim=@u mal=marl]
+ |= {lim+@u mal+marl}
=< res
- |- ^- [rem=@u res=marl]
+ |- ^- {rem+@u res+marl}
?~ mal [lim ~]
?~ lim [0 ~]
- =+ ^- [lam=@u hed=manx]
- ?: ?=(_:/(**) i.mal)
+ =+ ^- {lam+@u hed+manx}
+ ?: ?=(__(:/(**)) i.mal)
[lim :/(tay)]:(deword lim v.i.a.g.i.mal)
[rem ele(c res)]:[ele=i.mal $(mal c.i.mal)]
[rem - res]:[hed $(lim lam, mal t.mal)]
::
++ deword
- |= [lim=@u tay=tape] ^- [lim=@u tay=tape]
+ |= {lim+@u tay+tape} ^- {lim+@u tay+tape}
?~ tay [lim tay]
?~ lim [0 ~]
=+ wer=(dot 1^1 tay)
@@ -41,20 +41,20 @@
--
::
!:
-|_ [hed=marl tal=marl]
+|_ {hed+marl tal+marl}
::
-++ grow :: convert to
+++ grow :: convert to
|%
++ mime
=< mime
|%
- ++ elem ;div:(h1:"*{hed}" div:"*{tal}") :: convert to %elem
- ++ hymn ;html:(head:title:"snip" body:"+{elem}") :: convert to %hymn
- ++ html (crip (poxo hymn)) :: convert to %html
- ++ mime [/text/html (taco html)] :: convert to %mime
+ ++ elem ;div:(h1:"*{hed}" div:"*{tal}") :: convert to %elem
+ ++ hymn ;html:(head:title:"snip" body:"+{elem}") :: convert to %hymn
+ ++ html (crip (poxo hymn)) :: convert to %html
+ ++ mime [/text/html (taco html)] :: convert to %mime
--
--
-++ grab |% :: convert from
- ++ noun ,[marl marl] :: clam from %noun
- ++ elem |=(a=manx (hedtal +.a))
+++ grab |% :: convert from
+ ++ noun {marl marl} :: clam from $noun
+ ++ elem |=(a+manx (hedtal +.a))
-- --
diff --git a/mar/styl.hoon b/mar/styl.hoon
index 6af7b1d9c..45b6b160f 100644
--- a/mar/styl.hoon
+++ b/mar/styl.hoon
@@ -2,15 +2,15 @@
:::: /hoon/core/styl/pro
::
/? 314
-|_ mud=@t
+|_ mud+@t
++ grow
|%
++ mime [/text/styl (taco mud)]
--
++ grab
|%
- ++ mime |=([p=mite q=octs] q.q)
- ++ noun ,@t
+ ++ mime |=({p+mite q+octs} q.q)
+ ++ noun @t
--
++ grad %mime
--
diff --git a/mar/tang.hoon b/mar/tang.hoon
index 9e30a6323..59622a5c3 100644
--- a/mar/tang.hoon
+++ b/mar/tang.hoon
@@ -10,11 +10,11 @@
++ elem
=- ;pre:code:"{(trip (role (turn - crip)))}" :: XX
^- wall %- zing ^- (list wall)
- (turn (flop tan) |=(a=tank (wash 0^160 a)))
+ (turn (flop tan) |=(a+tank (wash 0^160 a)))
--
++ grab :: convert from
|%
- ++ noun (list ^tank) :: clam from %noun
- ++ tank |=(a=^tank [a]~)
+ ++ noun (list ^tank) :: clam from %noun
+ ++ tank |=(a+^tank [a]~)
--
--
diff --git a/mar/txt-diff.hoon b/mar/txt-diff.hoon
index dfe739a34..150c941ec 100644
--- a/mar/txt-diff.hoon
+++ b/mar/txt-diff.hoon
@@ -2,7 +2,7 @@
:::: /hoon/term-line/mar
::
/? 314
-|_ txt-diff=(urge cord)
+|_ txt-diff+(urge cord)
::
++ grab :: convert from
|%
diff --git a/mar/txt.hoon b/mar/txt.hoon
index 90e3f262e..7f4043305 100644
--- a/mar/txt.hoon
+++ b/mar/txt.hoon
@@ -3,11 +3,11 @@
::
/? 314
!:
-|_ txt=wain
+|_ txt+wain
::
++ grab :: convert from
|%
- ++ mime |=([p=mite q=octs] (lore q.q))
+ ++ mime |=({p+mite q+octs} (lore q.q))
++ noun wain :: clam from %noun
++ json :(corl lore need so:jo)
--
@@ -21,18 +21,18 @@
|%
++ form %txt-diff
++ diff
- |= tyt=wain
+ |= tyt+wain
^- (urge cord)
(lusk txt tyt (loss txt tyt))
::
++ pact
- |= dif=(urge cord)
+ |= dif+(urge cord)
~| [%pacting dif]
^- wain
(lurk txt dif)
::
++ join
- |= [ali=(urge cord) bob=(urge cord)]
+ |= {ali+(urge cord) bob+(urge cord)}
^- (unit (urge cord))
|^
=. ali (clean ali)
@@ -41,9 +41,9 @@
?~ ali `bob
?~ bob `ali
?- -.i.ali
- %&
+ {$&}
?- -.i.bob
- %&
+ {$&}
?: =(p.i.ali p.i.bob)
%+ bind $(ali t.ali, bob t.bob)
|=(cud=(urge cord) [i.ali cud])
@@ -52,7 +52,7 @@
|=(cud=(urge cord) [i.bob cud])
%+ bind $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
|=(cud=(urge cord) [i.ali cud])
- %|
+ {$|}
?: =(p.i.ali (lent p.i.bob))
%+ bind $(ali t.ali, bob t.bob)
|=(cud=(urge cord) [i.bob cud])
@@ -62,29 +62,29 @@
~
==
::
- %|
+ {$|}
?- -.i.bob
- %| ~
- %&
+ {$|} ~
+ {$&}
?: =(p.i.bob (lent p.i.ali))
%+ bind $(ali t.ali, bob t.bob)
|=(cud=(urge cord) [i.ali cud])
?: (gth p.i.bob (lent p.i.ali))
%+ bind $(ali t.ali, p.i.bob (sub p.i.bob (lent p.i.ali)))
- |=(cud=(urge cord) [i.ali cud])
+ |=(cud+(urge cord) [i.ali cud])
~
==
==
++ clean :: clean
- |= wig=(urge cord)
+ |= wig+(urge cord)
^- (urge cord)
?~ wig ~
?~ t.wig wig
- ?: ?=(%& -.i.wig)
- ?: ?=(%& -.i.t.wig)
+ ?: ?=($& -.i.wig)
+ ?: ?=($& -.i.t.wig)
$(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
- ?: ?=(%| -.i.t.wig)
+ ?: ?=($| -.i.t.wig)
$(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
--
@@ -101,16 +101,16 @@
?~ ali bob
?~ bob ali
?- -.i.ali
- %&
+ {$&}
?- -.i.bob
- %&
+ {$&}
?: =(p.i.ali p.i.bob)
[i.ali $(ali t.ali, bob t.bob)]
?: (gth p.i.ali p.i.bob)
[i.bob $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)]
[i.ali $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))]
::
- %|
+ {$|}
?: =(p.i.ali (lent p.i.bob))
[i.bob $(ali t.ali, bob t.bob)]
?: (gth p.i.ali (lent p.i.bob))
@@ -121,14 +121,14 @@
:: ~ :: here, alice is good for a while, but not for the whole
== :: length of bob's changes
::
- %|
+ {$|}
?- -.i.bob
- %|
+ {$|}
=+ ^- [fic=(unce cord) ali=(urge cord) bob=(urge cord)]
(resolve ali bob)
[fic $(ali ali, bob bob)]
::
- %&
+ {$&}
?: =(p.i.bob (lent p.i.ali))
[i.ali $(ali t.ali, bob t.bob)]
?: (gth p.i.bob (lent p.i.ali))
@@ -174,39 +174,44 @@
^- (urge cord)
?~ wig ~
?~ t.wig wig
- ?: ?=(%& -.i.wig)
- ?: ?=(%& -.i.t.wig)
+ ?: ?=($& -.i.wig)
+ ?: ?=($& -.i.t.wig)
$(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
- ?: ?=(%| -.i.t.wig)
+ ?: ?=($| -.i.t.wig)
$(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
::
++ resolve
- |= [ali=(urge cord) bob=(urge cord)]
- ^- [fic=[%| p=(list cord) q=(list cord)] ali=(urge cord) bob=(urge cord)]
+ |= {ali+(urge cord) bob+(urge cord)}
+ ^- {fic+{$| p+(list cord) q+(list cord)} ali+(urge cord) bob+(urge cord)}
=- [[%| bac (annotate alc boc bac)] ali bob]
- |- ^- $: $: bac=(list cord)
- alc=(list cord)
- boc=(list cord)
+ |- ^- $^
+ _: _: bac+(list cord)
+ alc+(list cord)
+ boc+(list cord)
==
- ali=(urge cord)
- bob=(urge cord)
+ ali+(urge cord)
+ bob+(urge cord)
==
?~ ali [[~ ~ ~] ali bob]
?~ bob [[~ ~ ~] ali bob]
?- -.i.ali
- %&
+ {$&}
?- -.i.bob
- %& [[~ ~ ~] ali bob] :: no conflict
- %|
+ {$&} [[~ ~ ~] ali bob] :: no conflict
+ {$|}
=+ lob=(lent p.i.bob)
?: =(lob p.i.ali)
[[p.i.bob p.i.bob q.i.bob] t.ali t.bob]
?: (lth lob p.i.ali)
[[p.i.bob p.i.bob q.i.bob] [[%& (sub p.i.ali lob)] t.ali] t.bob]
=+ wat=(scag (sub lob p.i.ali) p.i.bob)
- =+ res=$(ali t.ali, bob [[%| (scag (sub lob p.i.ali) p.i.bob) ~] t.bob])
+ =+ ^= res
+ %= $
+ ali t.ali
+ bob [[%| (scag (sub lob p.i.ali) p.i.bob) ~] t.bob]
+ ==
:* :* (welp bac.res wat)
(welp alc.res wat)
(welp boc.res q.i.bob)
@@ -216,16 +221,20 @@
==
==
::
- %|
+ {$|}
?- -.i.bob
- %&
+ {$&}
=+ loa=(lent p.i.ali)
?: =(loa p.i.bob)
[[p.i.ali q.i.ali p.i.ali] t.ali t.bob]
?: (lth loa p.i.bob)
[[p.i.ali q.i.ali p.i.ali] t.ali [[%& (sub p.i.bob loa)] t.bob]]
=+ wat=(slag (sub loa p.i.bob) p.i.ali)
- =+ res=$(ali [[%| (scag (sub loa p.i.bob) p.i.ali) ~] t.ali], bob t.bob)
+ =+ ^= res
+ %= $
+ ali [[%| (scag (sub loa p.i.bob) p.i.ali) ~] t.ali]
+ bob t.bob
+ ==
:* :* (welp bac.res wat)
(welp alc.res q.i.ali)
(welp boc.res wat)
@@ -234,7 +243,7 @@
bob.res
==
::
- %|
+ {$|}
=+ loa=(lent p.i.ali)
=+ lob=(lent p.i.bob)
?: =(loa lob)
diff --git a/mar/unlog.hoon b/mar/unlog.hoon
index f368207e4..3e2ee03ad 100644
--- a/mar/unlog.hoon
+++ b/mar/unlog.hoon
@@ -2,7 +2,7 @@
:::: /hoon/core/unlog/mar
::
!:
-|_ man=span
+|_ man+span
++ grab
|% :: convert from
++ noun span :: clam from %noun
diff --git a/mar/urb.hoon b/mar/urb.hoon
index bcc211e3a..bc592a0ec 100644
--- a/mar/urb.hoon
+++ b/mar/urb.hoon
@@ -4,7 +4,7 @@
/? 314
:: /= dep /$ |=([^ but=path] `@uvH`?>(?=([%dep @ ~] but) (slav %uv i.t.but)))
!:
-|_ own=manx
+|_ own+manx
::
++ grow :: convert to
|%
@@ -15,7 +15,7 @@
|% :: convert from
++ noun manx :: clam from %noun
++ hymn :: inject into %hymn
- |= old=manx old :: moved to %eyre
+ |= old+manx old :: moved to %eyre
:: ~| hymn//mal-formed
:: :: ~| old
:: ?> ?=([[%html ~] [[%head ~] *] [[%body ~] ^] ~] old) :: XX static
diff --git a/mar/urbit.hoon b/mar/urbit.hoon
index 1ae5ccd25..3a8393208 100644
--- a/mar/urbit.hoon
+++ b/mar/urbit.hoon
@@ -4,9 +4,9 @@
/? 314
:::: A minimal urbit mark
!:
-|_ her=@p
+|_ her+@p
++ grab
|%
- ++ noun ,@p
+ ++ noun @p
--
--
diff --git a/mar/user.hoon b/mar/user.hoon
index a96e11732..63a06b0e3 100644
--- a/mar/user.hoon
+++ b/mar/user.hoon
@@ -3,7 +3,7 @@
::
/? 314
/- user
-|_ use=user
+|_ use+user
::
++ grab :: convert from
|%
diff --git a/mar/will.hoon b/mar/will.hoon
index 04cd9e2ba..d603bbf7d 100644
--- a/mar/will.hoon
+++ b/mar/will.hoon
@@ -2,7 +2,7 @@
:::: /hoon/will/mar
::
/? 314
-|_ wyl=(unit will)
+|_ wyl+(unit will)
::
++ grab :: convert from
|%
diff --git a/mar/wipe.hoon b/mar/wipe.hoon
index 1e9f108bf..db6efa88d 100644
--- a/mar/wipe.hoon
+++ b/mar/wipe.hoon
@@ -1 +1 @@
-|=(~ ~)
+|=($~ ~)
diff --git a/mar/woff.hoon b/mar/woff.hoon
index 8b15a9e8d..6979fb54a 100644
--- a/mar/woff.hoon
+++ b/mar/woff.hoon
@@ -5,7 +5,7 @@
::
:::: compute
::
-|_ wof=mime
+|_ wof+mime
::
++ grow :: convert to
|%
@@ -13,7 +13,7 @@
--
++ grab
|%
- ++ mime |=([mite p=octs] [/application/font-woff p])
+ ++ mime |=({mite p+octs} [/application/font-woff p])
++ noun ^mime
--
++ grad %mime
diff --git a/mar/write-paste.hoon b/mar/write-paste.hoon
index 10117692b..16fddb6bd 100644
--- a/mar/write-paste.hoon
+++ b/mar/write-paste.hoon
@@ -1,11 +1,11 @@
-::
+::
:::: /hoon/core/save/mar
::
!:
-|_ [typ=?(%hoon %md %txt) txt=@t]
+|_ {typ+?($hoon $md $txt) txt+@t}
++ grab
|%
- ++ noun ,[?(%hoon %md %txt) @t]
+ ++ noun {?($hoon $md $txt) @t}
++ json
(corl need =>(jo (ot typ/(ci (soft ?(%hoon %md %txt)) so) txt/so ~)))
--
diff --git a/mar/xml.hoon b/mar/xml.hoon
index 580a1ec0c..4f4945492 100644
--- a/mar/xml.hoon
+++ b/mar/xml.hoon
@@ -5,7 +5,7 @@
::
:::: compute
::
-|_ htm=@t
+|_ htm+@t
::
++ grow :: convert to
|% ::
@@ -13,6 +13,6 @@
++ hymn (need (poxa htm)) :: to %hymn
-- ::
++ grab |% :: convert from
- ++ noun ,@t :: clam from %noun
- ++ mime |=([p=mite q=octs] q.q) :: retrieve form %mime
+ ++ noun @t :: clam from %noun
+ ++ mime |=({p+mite q+octs} q.q) :: retrieve form $mime
-- --
diff --git a/sur/sole.hoon b/sur/sole.hoon
index ff4904db8..02f25afd5 100644
--- a/sur/sole.hoon
+++ b/sur/sole.hoon
@@ -1,4 +1,4 @@
-::
+::
:::: /hoon/sole/sur
!:
|%