urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes and improvements.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-04-02 11:50:31 -07:00
parent 28e1bf1a71
commit 2b3a929ad2
3 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
arvo/gall.hoon
View File

@ -159,7 +159,7 @@
[%vega p=path] ::
== == ::
$: %f :: by %ford
$% [%made p=@uvH q=(each cage tang)] ::
$% [%made p=(each bead (list tank))] ::
== == == ::
++ toil (pair duct knob) :: work in progress
-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -410,12 +410,12 @@
:_ ..^$
:_ ~
:- hen
?- -.q.+.sih
?- -.p.+.sih
%|
[%give %crud %gasp-crud p.q.+.sih]
[%give %crud %gasp-crud p.p.+.sih]
::
%&
=+ cay=`cage`p.q.+.sih
=+ cay=`cage`q.p.p.+.sih
?+ -.pax !!
%d [%give (best %rush cay)]
%f [%give (best %rust cay)]
@ -441,9 +441,9 @@
::
%f
:_ ~ :- hen
?- -.q.+.sih
%| [%give %mean ~ %ford-fail p.q.+.sih]
%& [%pass [%r pax] %g %mess [our imp] you `cage`p.q.+.sih]
?- -.p.+.sih
%| [%give %mean ~ %ford-fail p.p.+.sih]
%& [%pass [%r pax] %g %mess [our imp] you `cage`q.p.p.+.sih]
==
::
%g
@ -721,18 +721,17 @@
%_(+>.$ ped.sat pen, mow :(weld new old mow))
::
++ drum :: raw dependencies
|= dep=@uvH
|= dep=(set beam)
^+ +>
?> ?=(^ orm.sat)
%- drug
=+ ped=`(set (pair ship desk))`[[our %main] ~ ~]
ped
::=+ mav=(~(tap by dep) ~)
::|- ^+ ped
::?~ mav ped
::?: =(r.i.mav [%da u.orm.sat])
:: $(mav t.mav, ped (~(put in ped) p.i.mav q.i.mav))
::$(mav t.mav)
=+ mav=(~(tap by dep) ~)
|- ^+ ped
?~ mav ped
?: =(r.i.mav [%da u.orm.sat])
$(mav t.mav, ped (~(put in ped) p.i.mav q.i.mav))
$(mav t.mav)
::
++ ford :: exec to ford
|= [pax=path kas=silk]
@ -776,54 +775,54 @@
|= sih=sign
?> ?=(%f -.sih)
^- [(unit (list tank)) _+>]
?- -.q.+.sih
?- -.p.+.sih
& :- ~
%- obey:(morn (slot 3 q.p.q.+.sih))
(slot 2 q.p.q.+.sih)
| [`p.q.+.sih (give %crud %mack-made p.q.+.sih)]
%- obey:(morn (slot 3 q.q.p.p.+.sih))
(slot 2 q.q.p.p.+.sih)
| [`p.p.+.sih (give %crud %mack-made p.p.+.sih)]
==
::
++ meek :: apply peek
|= sih=sign
^- [(unit cage) _+>]
?> ?=(%f -.sih)
?- -.q.+.sih
& =+ vax=`vase`q.p.q.+.sih
?- -.p.+.sih
& =+ vax=`vase`q.q.p.p.+.sih
?. &(?=(^ q.vax) ?=(@ -.q.vax))
[~ (give %crud %peek-lame *(list tank))]
:: ~> %slog.[0 (skol p:(slot 3 vax))]
:- `[((hard mark) -.q.vax) (slot 3 vax)]
+>.$
| [~ (give %crud %meek-made p.q.+.sih)]
| [~ (give %crud %meek-made p.p.+.sih)]
==
::
++ mick :: apply w/depends
|= sih=sign
?> ?=(%f -.sih)
^- [[p=? q=@uvH] _+>]
:- [-.q.+.sih p.+.sih]
?- -.q.+.sih
& %- obey:(morn (slot 3 q.p.q.+.sih))
(slot 2 q.p.q.+.sih)
| (give %crud %mick-made p.q.+.sih)
^- [(unit (set beam)) _+>]
?- -.p.+.sih
& :- `p.p.p.+.sih
%- obey:(morn (slot 3 q.q.p.p.+.sih))
(slot 2 q.q.p.p.+.sih)
| [~ (give %crud %mick-made p.p.+.sih)]
==
::
++ muck :: apply part
|= sih=sign
^- [(unit (list tank)) _+>]
?> ?=(%f -.sih)
?- -.q.+.sih
& [~ (obey q.p.q.+.sih)]
| [`p.q.+.sih (give %crud %muck-made p.q.+.sih)]
?- -.p.+.sih
& [~ (obey q.q.p.p.+.sih)]
| [`p.p.+.sih (give %crud %muck-made p.p.+.sih)]
==
::
++ murk :: apply park
|= sih=sign
^- [(unit cage) _+>]
?> ?=(%f -.sih)
?- -.q.+.sih
& [`p.q.+.sih +>.$]
| [~ (give %crud %murk-made p.q.+.sih)]
?- -.p.+.sih
& [`q.p.p.+.sih +>.$]
| [~ (give %crud %murk-made p.p.+.sih)]
==
::
++ more :: domestic take
@ -905,8 +904,8 @@
::
%prep
=^ gad +>.$ (mick q.hin)
?. p.gad (drum q.gad)
deal:(drum q.gad)
?~ gad (drum ~)
deal:(drum u.gad)
::
%pull
=^ gud +>.$ (mack q.hin)
@ -1187,10 +1186,8 @@
(goc p.q.kon /pock)
:(goc p.q.kon (rsh 3 ofs p.q.kon) /pock)
=+ hyp=?=(%pock (end 3 4 cog))
=+ ^- err=tape
?.(?=(?(%poke %pock) cog) <cog> "{<cog>} with mark {<p.q.kon>}")
?. (warm cog)
(give(qic.sat ~) %mean ~ %poke-find-fail leaf/err ~)
(give(qic.sat ~) %mean ~ %poke-find-fail ~)
?> ?=(^ huv.sat)
=+ ^= sam
;: slop
@ -1198,9 +1195,10 @@
[[%atom %p] p.kon]
?.(hyp q.q.kon (slop !>(p.q.q.kon) q.q.kon))
==
=+ err=?.(?=(?(%poke %pock) cog) <cog> "{<cog>} with mark <p.q.kon>")
:: ~& [%mess-poke cog]
%+ ford /s/poke
:+ %dude leaf/err
:+ %dude leaf/"poking {err}"
[%call (harm cog (conf (core u.huv.sat))) (cove %$ sam)]
::
%show

2
main/app/helm/core.hook
View File

@ -159,12 +159,10 @@
::
++ poke-will
|= [ost=bone you=ship wil=(unit will)]
~& %poke-helm-will
?> ?=(^ bur)
:_ +>.$(bur ~)
?~ wil
[ost %give %mean ~ %rejected ~]~
~& [%poke-will-good bur]
:~ [ost %pass / %a %cash p.u.bur q.u.bur u.wil]
[ost %pass / %c %plug our.hid %main (sein our.hid) %main]
[ost %pass / %c %plug our.hid %arvo (sein our.hid) %arvo]

23
main/app/talk/core.hook
View File

@ -131,7 +131,7 @@
=. nez (welp pre nez)
?. (lth lez len) nez
(runt [(sub len lez) '-'] nez)
:(welp pre (scag (dec len) nez) ">")
:(welp pre (scag (dec len) nez) "+")
--
|_ [hid=hide house]
++ ra :: transaction core
@ -1060,18 +1060,33 @@
==
::
++ tr-line ^- tape :: one-line print
=+ txt=tr-text
=+ eck=?:((~(has by aud) [%& our.hid man]) '|' '-')
?: =(who our.hid)
:* '<'
eck
~(te-whom te man pals)
?: p.sep
(weld "> " txt)
(weld "@ " txt)
==
:* '>'
eck
++ tr-text
^- tape
=+ txt=tr-text
?~ txt ~
(welp tr-prof txt)
::
++ tr-pals ^- (set partner) :: audience to set
++ tr-pals ^- (set partner) :: convert to partners
%- ~(gas in *(set partner))
%+ turn (~(tap by aud))
|=([a=partner *] a)
::
++ tr-prof ^- tape :: prefix
=+ dul=[%& our.hid man]
?: =(who our.hid)
?: =(who our.hid>)
:* '<'
?:((~(has by aud) dul) '|' '-')
(~(sn-curt sn [who (main who)]) |)