urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-08 14:09:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'ohaitch/uglify-dial', 'ohaitch/fix-parsf' and 'ohaitch/fix-eyre-beak'

Browse Source 
Update type prettyprinting to Hoon 151 compliance
Fix electroplating bug in ++parsf
Don't use invalid "revision 0" in eyre
This commit is contained in:
Raymond Pasco 2016-02-20 05:27:15 -05:00
commit 4b0ca55da3
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arvo/eyre.hoon
View File

@ -846,7 +846,8 @@
:: ::
++ back :: %ford bounce ++ back :: %ford bounce
|= {tea/whir mar/mark cay/cage} |= {tea/whir mar/mark cay/cage}
(pass-note tea (ford-req -.top [%cast mar $+cay])) =+ bek=?+(r.top -.top {$ud $0} -.top(r da+now))
(pass-note tea (ford-req bek [%cast mar $+cay]))
:: ::
++ del-deps ++ del-deps
|= {a/@uvH b/(each duct ixor)} ^+ +>.$ |= {a/@uvH b/(each duct ixor)} ^+ +>.$

19
arvo/hoon.hoon
View File

@ -7392,7 +7392,7 @@
$noun :_(gid [%leaf '*' ~]) $noun :_(gid [%leaf '*' ~])
$path :_(gid [%leaf '/' ~]) $path :_(gid [%leaf '/' ~])
$span :_(gid [%leaf '#' 't' ~]) $span :_(gid [%leaf '#' 't' ~])
$void :_(gid [%leaf '#' ~]) $void :_(gid [%leaf '#' '!' ~])
$wool :_(gid [%leaf '*' '"' '"' ~]) $wool :_(gid [%leaf '*' '"' '"' ~])
$wall :_(gid [%leaf '*' '\'' '\'' ~]) $wall :_(gid [%leaf '*' '\'' '\'' ~])
$yarn :_(gid [%leaf '"' '"' ~]) $yarn :_(gid [%leaf '"' '"' ~])
@ -7408,7 +7408,7 @@
:: ::
{$face *} {$face *}
=^ cox gid $(q.ham q.q.ham) =^ cox gid $(q.ham q.q.ham)
:_(gid [%palm [['=' ~] ~ ~ ~] [%leaf (trip p.q.ham)] cox ~]) :_(gid [%palm [['/' ~] ~ ~ ~] [%leaf (trip p.q.ham)] cox ~])
:: ::
{$list *} {$list *}
=^ cox gid $(q.ham q.q.ham) =^ cox gid $(q.ham q.q.ham)
@ -7420,21 +7420,21 @@
:: ::
{$plot *} {$plot *}
=^ coz gid (many p.q.ham) =^ coz gid (many p.q.ham)
:_(gid [%rose [[' ' ~] ['[' ~] [']' ~]] coz]) :_(gid [%rose [[' ' ~] ['{' ~] ['}' ~]] coz])
:: ::
{$pear *} {$pear *}
:_(gid [%leaf '%' ~(rend co [%$ p.q.ham q.q.ham])]) :_(gid [%leaf '$' ~(rend co [%$ p.q.ham q.q.ham])])
:: ::
{$stop *} {$stop *}
=+ num=~(rend co [%$ %ud p.q.ham]) =+ num=~(rend co [%$ %ud p.q.ham])
?: (~(has in gid) p.q.ham) ?: (~(has in gid) p.q.ham)
:_(gid [%leaf '$' num]) :_(gid [%leaf '#' num])
=^ cox gid =^ cox gid
%= $ %= $
gid (~(put in gid) p.q.ham) gid (~(put in gid) p.q.ham)
q.ham (~(got by p.ham) p.q.ham) q.ham (~(got by p.ham) p.q.ham)
== ==
:_(gid [%palm [['.' ~] ['^' '$' num] ~ ~] cox ~]) :_(gid [%palm [['.' ~] ~ ~ ~] [%leaf ['^' '#' num]] cox ~])
:: ::
{$tree *} {$tree *}
=^ cox gid $(q.ham q.q.ham) =^ cox gid $(q.ham q.q.ham)
@ -10374,6 +10374,7 @@
++ pi-tell :: produce dump ++ pi-tell :: produce dump
|= day/doss |= day/doss
^- (list tape) ^- (list tape)
?: =(day *doss) ~
=+ tot=(pi-moth mon.day) =+ tot=(pi-moth mon.day)
;: welp ;: welp
[(welp "events: " (pi-mumm mon.day)) ~] [(welp "events: " (pi-mumm mon.day)) ~]
@ -10400,7 +10401,8 @@
?: =(~ out.hup) ~ ?: =(~ out.hup) ~
:- "into:" :- "into:"
%+ turn %+ turn
(~(tap by out.hup) ~) %+ sort (~(tap by out.hup) ~)
|=({{* a/@ud} {* b/@ud}} (gth a b))
|= {pax/path num/@ud} |= {pax/path num/@ud}
^- tape ^- tape
:(welp " " (spud pax) ": " (scow %ud num)) :(welp " " (spud pax) ": " (scow %ud num))
@ -10408,7 +10410,8 @@
?: =(~ inn.hup) ~ ?: =(~ inn.hup) ~
:- "from:" :- "from:"
%+ turn %+ turn
(~(tap by inn.hup) ~) %+ sort (~(tap by inn.hup) ~)
|=({{* a/@ud} {* b/@ud}} (gth a b))
|= {pax/path num/@ud} |= {pax/path num/@ud}
^- tape ^- tape
:(welp " " (spud pax) ": " (scow %ud num)) :(welp " " (spud pax) ": " (scow %ud num))

2
arvo/zuse.hoon
View File

@ -1024,7 +1024,7 @@
(scan a (parsf b)) (scan a (parsf b))
++ parsf :: make parser from: ++ parsf :: make parser from:
|^ |* a/(pole _;/(*{$^(rule tape)})) :: ;"chars{rule}chars" |^ |* a/(pole _;/(*{$^(rule tape)})) :: ;"chars{rule}chars"
%- cook :_ (bill (norm a)) =- (cook - (bill (norm a)))
|* (list) |* (list)
?~ +< ~ ?~ +< ~
?~ t i ?~ t i