Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Max G 2015-06-26 21:26:04 +03:00
commit edf700b2a7
2 changed files with 11 additions and 3 deletions

View File

@ -381,7 +381,6 @@
=+ sar=(lobes-at-path:ze u.nab r.q.rav)
=+ ear=(lobes-at-path:ze top r.q.rav)
=. +>.$
?: =(sar ear) +>.$
(bleb hen u.nab ?:(p.rav ~ `[u.nab top]))
?^ huy
(blub hen)
@ -868,7 +867,8 @@
=+ let=let
=+ hut=(~(uni by hut.ran) nut)
=+ lat=(~(uni by lat.ran) nat)
=+ =+ yon=`aeon`1 :: sanity check
=+ ?: =(0 let) ~
=+ yon=`aeon`1 :: sanity check
|-
~| yon=yon
=+ tak=(~(got by hit) yon)
@ -1453,6 +1453,8 @@
^- nako
:+ hit.dom
let.dom
?~ =(0 b)
[~ ~]
(data-twixt-takos (~(get by hit.dom) a) (aeon-to-tako b))
::
++ query :: query:ze
@ -2493,7 +2495,6 @@
[mos ..^$]
::
%mont
=. hez.ruf ?^(hez.ruf hez.ruf `[[%$ %sync ~] ~])
=+ pot=(~(get by mon.ruf) p.q.hic)
?^ pot
~& [%already-mounted pot]

View File

@ -710,6 +710,13 @@ variants of `10` as equivalent.)
------------------------------------------------------------------------
Op 11: Retrieve
-----------
**operator 11** retrieves data from the global namespace at the path it is given.
nock 11 is an additional nock operation provided by arvo to provide access to the global namespace. It's provided by arvo, so even though it's not technically a part of the nock, any code that arvo runs has access to it. When nock running on top of arvo hits nock 11, it either produces a value or blocks. The most common usage is with clay, where ^(%cx /path/to/file) will produce the referred-to-file.
Crash default
-------------