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

Merge branch 'master' of github.com:urbit/urbit-new

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-04-08 11:46:14 -07:00
commit 8e37b7608c
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arvo/dill.hoon
View File

@ -142,6 +142,7 @@
== :: == ::
++ note-dill :: note to self, odd ++ note-dill :: note to self, odd
$% [%crud p=@tas q=(list tank)] :: $% [%crud p=@tas q=(list tank)] ::
[%init p=ship] ::
[%text p=tape] :: [%text p=tape] ::
[%veer p=@ta q=path r=@t] :: install vane [%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path [%vega p=path] :: reboot by path
@ -155,7 +156,7 @@
== :: == ::
++ note :: ++ note ::
$% [%a note-ames] :: out request $-> $% [%a note-ames] :: out request $->
[%c note-clay] [%c note-clay] ::
[%d note-dill] :: [%d note-dill] ::
[%g note-gall] :: [%g note-gall] ::
== :: == ::
@ -375,11 +376,15 @@
:_(..^$ [hen %pass ~ (note %a p.q.hic)]~) :_(..^$ [hen %pass ~ (note %a p.q.hic)]~)
?: ?=(%flog -.q.hic) ?: ?=(%flog -.q.hic)
:: ~& [%dill-flog +.q.hic] :: ~& [%dill-flog +.q.hic]
?: ?=([%crud %hax-init [%leaf *] ~] p.q.hic)
=+ him=(slav %p (crip p.i.q.p.q.hic))
:_(..^$ ?~(hey.all ~ [u.hey.all %give %init him]~))
:_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~)) :_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~))
=. hey.all ?^(hey.all hey.all `hen) =. hey.all ?^(hey.all hey.all `hen)
?: ?=(%init -.q.hic) ?: ?=(%init -.q.hic)
:: ~& [%call-init hen]
?: =(ore.all `p.q.hic) ?: =(ore.all `p.q.hic)
[~ ..^$] [[hen %give q.hic]~ ..^$]
=: ore.all `p.q.hic =: ore.all `p.q.hic
dug.all ~ dug.all ~
== ==
@ -392,7 +397,8 @@
[[fap %dojo] [fap %talk] ~] [[fap %dojo] [fap %talk] ~]
[[p.q.hic %dojo] [p.q.hic %talk] ~] [[p.q.hic %dojo] [p.q.hic %talk] ~]
=^ moz all abet:(need (ax (need hey.all) [%flow %sole flo])) =^ moz all abet:(need (ax (need hey.all) [%flow %sole flo]))
[moz ..^$] ?: |((lth p.q.hic 256) (gte p.q.hic (bex 64))) [moz ..^$] :: XX HORRIBLE
[:_(moz [(need hey.all) %give %init p.q.hic]) ..^$]
=+ nus=(ax hen q.hic) =+ nus=(ax hen q.hic)
?~ nus ?~ nus
~& [%dill-no-flow q.hic] ~& [%dill-no-flow q.hic]
@ -423,8 +429,10 @@
^- [p=(list move) q=_..^$] ^- [p=(list move) q=_..^$]
?: =(~ ore.all) ?: =(~ ore.all)
?: ?=([%a %init *] q.hin) ?: ?=([%a %init *] q.hin)
:: ~& [%take-init hen]
=. hey.all ?^(hey.all hey.all `hen) =. hey.all ?^(hey.all hey.all `hen)
[[[hen %give +.q.hin] ~] ..^$] [[[hen %give +.q.hin] ~] ..^$]
:: [~ ..^$]
~& [%take-back q.hin] ~& [%take-back q.hin]
[~ ..^$] [~ ..^$]
?. (~(has by dug.all) hen) ?. (~(has by dug.all) hen)

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

@ -26,7 +26,8 @@
$% [%reload p=(list term)] :: reload vanes $% [%reload p=(list term)] :: reload vanes
== :: == ::
++ dill-flog :: sent to %dill ++ dill-flog :: sent to %dill
$% [%veer p=@ta q=path r=@t] :: install vane $% [%crud p=%hax-init [%leaf p=tape] ~] :: initialize ship
[%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path [%vega p=path] :: reboot by path
[%verb ~] :: verbose mode [%verb ~] :: verbose mode
== :: == ::
@ -122,6 +123,13 @@
:_ moz :_ moz
[ost %pass /verb %d %flog %verb ~] [ost %pass /verb %d %flog %verb ~]
== ==
++ he-wish-init
|= him=ship
%_ +>.$
moz
:_ moz
[ost %pass /init %d %flog %crud %hax-init leaf/(scow %p him) ~]
==
-- --
:: ::
++ hake :: poke core ++ hake :: poke core
@ -139,6 +147,11 @@
~& %poke-helm-verb ~& %poke-helm-verb
he-abet:he-wish-verb:(hake ost her) he-abet:he-wish-verb:(hake ost her)
:: ::
++ poke-helm-init
|= [ost=bone her=ship him=ship]
~& %poke-helm-init
he-abet:(he-wish-init:(hake ost her) him)
::
++ poke-helm-reload ++ poke-helm-reload
|= [ost=bone her=ship all=(list term)] |= [ost=bone her=ship all=(list term)]
~& %poke-helm-reload ~& %poke-helm-reload

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

@ -324,10 +324,10 @@
|= num=@ud |= num=@ud
^+ +> ^+ +>
=+ bun=(scow %ud num) =+ bun=(scow %ud num)
=+ pad=(sub 36 (lent bun)) :: =+ pad=(sub 36 (lent bun))
=+ now=`@da`(dis lat.hid 0xffff.ffff.ffff.ffff.0000.0000.0000.0000) :: =+ now=`@da`(dis lat.hid 0xffff.ffff.ffff.ffff.0000.0000.0000.0000)
%+ sh-fact %txt %+ sh-fact %txt
"----------------| [{bun}] {(runt [pad ' '] (scow %da now))}" (runt [(sub 15 (lent bun)) '-'] "[{bun}]")
:: ::
++ sh-repo-house-diff ++ sh-repo-house-diff
|= [one=shelf two=shelf] |= [one=shelf two=shelf]