Skip to content
This repository has been archived by the owner on Aug 14, 2019. It is now read-only.

remove +hard, replace with new ;; #1166

Merged
merged 2 commits into from
May 10, 2019
Merged

remove +hard, replace with new ;; #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b2a3d8
remove +hard, replace with new ;;
pilfer-pandex May 9, 2019
8b34af4
fix inappropriate translation in hall-legacy
pilfer-pandex May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/collections.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
|= [seg=@ta out=term]
%^ cat 3
?:(=(%$ out) out (cat 3 out '-'))
((hard @tas) seg)
;;(@tas seg)
[our nam]
::
:: +allowed-by: checks if ship :who is allowed by the permission rules in :dic
Expand Down Expand Up @@ -402,7 +402,7 @@
=/ entries=wain
%+ turn ~(tap by a)
|= b=[knot cord]
=/ c=[term cord] ((hard ,[term cord]) b)
=/ c=[term cord] ;;([term cord] b)
(crip " [{<-.c>} {<+.c>}]")
::
?~ entries ~
Expand Down
2 changes: 1 addition & 1 deletion lib/hall-legacy.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
%- of :~
name+(ot nom+so mon+tors ~)
text+(cu to-wain:format so)
tank+(ot dat+(cu (hard (list tank)) blob) ~)
tank+(ot dat+(cu (list tank) blob) ~)
==
::
++ blob (cu cue (su fel:de-base64:mimes:html))
Expand Down
4 changes: 2 additions & 2 deletions lib/hood/kiln.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
(render "on sync" sud her syd)
~
start-sync
=. let ?. ?=($w p.p.u.rot) let ud:((hard cass:clay) q.q.r.u.rot)
=. let ?. ?=($w p.p.u.rot) let ud:;;(cass:clay q.q.r.u.rot)
=/ =wire /kiln/sync/[syd]/(scot %p her)/[sud]
:: germ: merge mode for sync merges
::
Expand Down Expand Up @@ -625,7 +625,7 @@
?. ?=($path p.pax)
~| "strange path mark: {<p.pax>}"
!!
[((hard path) q.q.pax) ?:(?=($null p.dif) ~ `[%dif dif])]
[;;(path q.q.pax) ?:(?=($null p.dif) ~ `[%dif dif])]
:: ~& > kiln-made+[(turn can head) syd=syd +<.abet]
=+ notated=(skid can |=({path a/(unit miso)} ?=(^ a)))
=+ annotated=(turn `(list (pair path *))`-.notated head)
Expand Down
3 changes: 2 additions & 1 deletion lib/oauth1.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
^- {key/@t sec/@t ~}
?. =(~ `@`key)
~| %oauth-bad-keys
((hard {key/@t sec/@t ~}) (to-wain:format key))
;; {key/@t sec/@t ~}
(to-wain:format key)
%+ mean-wall %oauth-no-keys
"""
Run |init-oauth1 {<`path`dom>}
Expand Down
3 changes: 2 additions & 1 deletion lib/oauth2.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
^- {cid/@t cis/@t ~}
?. =(~ `@`key)
~| %oauth-bad-keys
((hard {cid/@t cis/@t ~}) (to-wain key))
;; {cid/@t cis/@t ~}
(to-wain key)
%+ mean-wall %oauth-no-keys
"""
Run |init-oauth2 {<`path`dom>}
Expand Down
5 changes: 3 additions & 2 deletions lib/test/runner.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@
^- test-func
::
|.
^- tang
((hard tang) .*(test-core nock.run-arm))
;; tang
.* test-core
nock.run-arm
:: +has-test-prefix: does the arm define a test we should run?
::
++ has-test-prefix
Expand Down
4 changes: 2 additions & 2 deletions mar/collections/action.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
++ noun action:collections
++ json
|= jon=^json
%- (hard action:collections)
;; action:collections
=< (action jon)
|%
++ action
Expand Down Expand Up @@ -68,7 +68,7 @@
|= jon=^json
^- (set whom:clay)
=/ x ((ar:dejs (su:dejs fed:ag)) jon)
%- (hard (set whom:clay))
;; (set whom:clay)
%- ~(run in (sy x))
|=(w=@ [& w])
--
Expand Down
20 changes: 10 additions & 10 deletions sys/arvo.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@
::
++ poke |= * :: 47
^- [(list ovum) *]
=> .(+< ((hard ,[now=@da ovo=ovum]) +<))
=> .(+< ;;([now=@da ovo=ovum] +<))
^- [(list ovum) *]
=. +>.$
?+ -.q.ovo
Expand Down Expand Up @@ -652,23 +652,23 @@
=< :: Arvo structural interface
::
|%
++ come |= {@ @ @ (list ovum) vise pone} :: 4
^- {(list ovum) _+>}
++ come |= [@ @ @ (list ovum) vise pone] :: 4
^- [(list ovum) _+>]
~& %hoon-come
=^ rey +>+ (^come +<)
[rey +>.$]
::
++ load |= {@ @ @ (list ovum) vase pane} :: 10
^- {(list ovum) _+>}
++ load |= [@ @ @ (list ovum) vase pane] :: 10
^- [(list ovum) _+>]
~& %hoon-load
=^ rey +>+ (^load +<)
[rey +>.$]
::
++ peek |=(* (^peek ((hard {@da path}) +<))) :: 46
++ peek |=(* (^peek ;;([@da path] +<))) :: 46
::
++ poke |= * :: 47
^- [(list ovum) *]
=> .(+< ((hard ,[now=@da ovo=ovum]) +<))
=> .(+< ;;([now=@da ovo=ovum] +<))
=^ ova +>+.$ (^poke now ovo)
=| out=(list ovum)
|- ^- [(list ovum) *]
Expand All @@ -678,7 +678,7 @@
::
?: ?=(%lyra -.q.i.ova)
%+ fall
(vega now t.ova ({@ @} +.q.i.ova))
(vega now t.ova ;;([@ @] +.q.i.ova))
[~ +>.^$]
:: iterate over effects, handling those on arvo proper
:: and passing the rest through as output
Expand All @@ -687,7 +687,7 @@
=? out ?=(^ vov) [+.vov out]
$(ova t.ova)
::
++ wish |=(* (^wish ((hard @ta) +<))) :: 22
++ wish |=(* (^wish ;;(@ta +<))) :: 22
--
:: Arvo implementation core
::
Expand Down Expand Up @@ -894,7 +894,7 @@
::
++ veer
|= [who=ship now=@da fav=curd]
=> .(fav ((hard {$veer lal/@ta pax/path txt/@t}) fav))
=> .(fav ;;({$veer lal/@ta pax/path txt/@t} fav))
=- ?:(?=(%| -.res) ((slog p.res) +>.$) p.res)
^= res %- mule |.
?: =(%$ lal.fav)
Expand Down
35 changes: 14 additions & 21 deletions sys/hoon.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,6 @@
--
::
++ fore |*(a/$-(* *) |*(b/$-(* *) (pair a b))) :: pair before
++ hard :: force remold
|* han/$-(* *)
|= fud/* ^- han
~_ leaf+"hard"
=+ gol=(han fud)
?>(=(gol fud) gol)
::
::
++ head |*(^ ,:+<-) :: get head
++ same |*(* +<) :: identity
Expand Down Expand Up @@ -11187,7 +11180,7 @@
$type
=+ tyr=|.((dial dole))
=+ vol=tyr(sut lum)
=+ cis=((hard tank) .*(vol [%9 2 %0 1]))
=+ cis=;;(tank .*(vol [%9 2 %0 1]))
:^ ~ %palm
[~ ~ ~ ~]
[[%leaf '#' 't' '/' ~] cis ~]
Expand All @@ -11199,7 +11192,7 @@
|- ^- (list tank)
?~ lum ~
?@ lum !!
[[%leaf (trip ((hard @) -.lum))] $(lum +.lum)]
[[%leaf (trip ;;(@ -.lum))] $(lum +.lum)]
::
$wool
:- ~
Expand Down Expand Up @@ -14526,20 +14519,20 @@
|= [p=xpat n=*]
^- plum
?- p
%hoon (hoon-to-plum 999 ((hard hoon) n))
%json (json-to-plum ((hard json) n))
%manx (manx-to-plum ((hard manx) n))
%nock (nock-to-plum ((hard nock) n))
%path (path-to-plum ((hard path) n))
%plum ((hard plum) n)
%skin (skin-to-plum ((hard skin) n))
%spec (spec-to-plum ((hard spec) n))
%tape (tape-to-plum ((hard tape) n))
%tour (tour-to-plum ((hard tour) n))
%hoon (hoon-to-plum 999 ;;(hoon n))
%json (json-to-plum ;;(json n))
%manx (manx-to-plum ;;(manx n))
%nock (nock-to-plum ;;(nock n))
%path (path-to-plum ;;(path n))
%plum ;;(plum n)
%skin (skin-to-plum ;;(skin n))
%spec (spec-to-plum ;;(spec n))
%tape (tape-to-plum ;;(tape n))
%tour (tour-to-plum ;;(tour n))
%type =/ ttp type-to-plum
((hard plum) .*(ttp(+< n) [9 2 0 1]))
;;(plum .*(ttp(+< n) [9 2 0 1]))
%vase =/ vtp vase-to-plum
=/ =plum ((hard plum) .*(vtp(+< n) [9 2 0 1]))
=/ =plum ;;(plum .*(vtp(+< n) [9 2 0 1]))
(rune '!>' ~ ~ ~[plum])
[%gate *] (render-gate sample.p product.p)
[%gear *] '%gear' :: XX TODO
Expand Down
12 changes: 6 additions & 6 deletions sys/vane/ames.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@
%none
:: ~& %chew-none
=. puz (bilk:puz now)
(chow ((hard meal) (cue msg)))
(chow ;;(meal (cue msg)))
::
%fast
:: ~& %chew-fast
Expand All @@ -919,24 +919,24 @@
?~ dey +>.$
=. puz (bilk:puz now)
=^ key diz u.dey
(chow(aut sin) ((hard meal) (cue (dy:cub:sen:gus key bod))))
(chow(aut sin) ;;(meal (cue (dy:cub:sen:gus key bod))))
::
%full
:: ~& %chew-full
=/ mex ((hard full:pact) (cue msg))
=/ mex ;;(full:pact (cue msg))
=. diz (deng law.mex)
=/ wug cluy:diz
?> =(lyf.wug from.lyf.mex)
=/ gey (sev:gus to.lyf.mex)
=/ sem (need (tear:as:q.gey pub:ex:cub.wug txt.mex))
=/ mes ((hard (pair @ @)) (cue sem))
=/ mes ;;((pair @ @) (cue sem))
=. diz (wasc:diz p.mes)
=. puz (bilk:puz now)
(west(msg q.mes))
::
%open
:: ~& %chew-open
=/ mex ((hard open:pact) (cue msg))
=/ mex ;;(open:pact (cue msg))
=. diz (deng law.mex)
=/ wug cluy:diz
?> =(lyf.wug from.lyf.mex)
Expand Down Expand Up @@ -1269,7 +1269,7 @@
=/ task=task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
=. any.ton.fox eny
=^ duy ..knob (knob hen task)
[duy ..^$]
Expand Down
2 changes: 1 addition & 1 deletion sys/vane/behn.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
=/ =task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
::
=/ event-core (per-event [our now hen] state)
::
Expand Down
Loading