Merge branch 'test' of https://github.com/urbit/urbit into test

This commit is contained in:
Philip C Monk 2014-11-11 19:51:06 -05:00
commit 686531fd42
3 changed files with 14 additions and 11 deletions

View File

@ -2718,7 +2718,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 2eF, parsing (ascii) :: :: section 2eF, parsing (ascii) ::
:: ::
++ ace (just ' ') all_p++ ace (just ' ')
++ bar (just '|') ++ bar (just '|')
++ bas (just '\\') ++ bas (just '\\')
++ buc (just '$') ++ buc (just '$')

View File

@ -11,7 +11,8 @@
++ axle :: %kahn state ++ axle :: %kahn state
$: %0 :: $: %0 ::
big=(unit ship) :: main ship, freeze big=(unit ship) :: main ship, freeze
soc=(map monk node) :: state once big soc=(map monk (pair (set duct) node)) :: state once big
red=(map duct monk) :: reverse subscribers
== :: == ::
++ cert (each will ,*) :: urbit or other ++ cert (each will ,*) :: urbit or other
++ gift :: out result <-$ ++ gift :: out result <-$
@ -23,17 +24,18 @@
cet=cert :: certificate cet=cert :: certificate
== :: == ::
++ kiss :: social update ++ kiss :: social update
$: [%that p=monk q=(map monk link)] :: set links $: [%cert p=monk q=cert] :: set certificate
[%this p=monk q=cert] :: set certificate [%feel p=monk] :: watch identity
[%know p=monk q=(map monk link)] :: set forward links
[%nuke ~] :: erase caller
== :: == ::
++ link (pair rank ,@da) :: trust/expiration ++ link (pair rank ,@da) :: trust/expiration
++ rank :: privilege ring ++ rank :: privilege ring
$? %0 :: owner / admin $? %0 :: ownership
%1 :: guardian / employer %1 :: tangible trust
%2 :: partner / employee %2 :: friendship
%3 :: friend / customer %3 :: neutral
%4 :: neighbor/ contact %4 :: enemy
%5 :: zombie
== :: == ::
-- :: -- ::
. == . ==

View File

@ -58,7 +58,8 @@
why=(map duct born) :: hosted ships why=(map duct born) :: hosted ships
how=(map born duct) :: reverse why how=(map born duct) :: reverse why
hut=(map born home) :: storage control hut=(map born home) :: storage control
sto=(set husk) :: storage resources ham=(set hulk) :: block stores
sto=(set husk) :: log stores
com=(set ship) :: compute resources com=(set ship) :: compute resources
== :: == ::
-- :: -- ::