ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-11 16:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anton Dyudin 2015-01-26 16:36:19 -08:00
commit ed616d5055
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arvo/hoon.hoon
View File

@ -9,13 +9,13 @@
(make:all cud) :: else simple compile (make:all cud) :: else simple compile
^= all :: assemble engine ^= all :: assemble engine
=~ :: volume stack =~ :: volume stack
%164 :: version constant %163 :: version constant
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: :::::: volume 0, version stub :::::: :::::: :::::: volume 0, version stub ::::::
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
~% %k.164 ~ ~ :: ~% %k.163 ~ ~ ::
|% :: |% ::
++ hoon %164 :: version stub ++ hoon %163 :: version stub
-- :: -- ::
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: :::::: volume 1, Hoon models :::::: :::::: :::::: volume 1, Hoon models ::::::

2
arvo/zuse.hoon
View File

@ -3167,5 +3167,5 @@
[%chan (list $|(@ud [p=@ud q=@ud]))] :: [%chan (list $|(@ud [p=@ud q=@ud]))] ::
++ wund (list ,[p=life q=ring r=acru]) :: mace in action ++ wund (list ,[p=life q=ring r=acru]) :: mace in action
++ will (list deed) :: certificate ++ will (list deed) :: certificate
++ zuse %314 :: hoon/zuse kelvin ++ zuse %310 :: hoon/zuse kelvin
-- --

4
main/mar/rodeo-command/door.hook
View File

@ -71,9 +71,7 @@
++ stam ++ stam
^- $+(json (unit statement)) ^- $+(json (unit statement))
=- (ot date/di bouquet/(as (ar so)) speech/(of -) ~) =- (ot date/di bouquet/(as (ar so)) speech/(of -) ~)
:~ own/so :~ lin/(ot say/bo txt/so ~)
say/so
lin/(ot say/bo txt/so ~)
:: exp/(cu |=(a=cord [a ~]) so) :: exp/(cu |=(a=cord [a ~]) so)
:: inv/(ot ship/(su fed:ag) party/(su urs:ab) ~) :: inv/(ot ship/(su fed:ag) party/(su urs:ab) ~)
== ==

1
main/mar/rodeo-report/door.hook
View File

@ -81,7 +81,6 @@
|= a=speech |= a=speech
%+ joba -.a %+ joba -.a
?+ -.a !! ?+ -.a !!
?(%own %say) [%s p.a]
%lin (jobe say/[%b p.a] txt/[%s q.a] ~) %lin (jobe say/[%b p.a] txt/[%s q.a] ~)
%exp (jobe code/[%s p.a] ~) %exp (jobe code/[%s p.a] ~)
:: %inv (jobe ship/(jope p.a) party/[%s q.a] ~) :: %inv (jobe ship/(jope p.a) party/[%s q.a] ~)

2
main/sur/rodeo/core.hook
View File

@ -52,7 +52,6 @@
:: XX unify %own and %say to %lin :: XX unify %own and %say to %lin
:: ::
$% [%lan p=span q=@t] :: local announce $% [%lan p=span q=@t] :: local announce
[%own p=@t] :: XX @ or /me
[%exp p=@t] :: hoon line [%exp p=@t] :: hoon line
[%non ~] :: no content (yo) [%non ~] :: no content (yo)
[%ext p=@tas q=*] :: extended action [%ext p=@tas q=*] :: extended action
@ -61,7 +60,6 @@
[%ire p=serial q=speech] :: in-reply-to [%ire p=serial q=speech] :: in-reply-to
[%lin p=? q=@t] :: no=@, text line [%lin p=? q=@t] :: no=@, text line
[%mor p=(list speech)] :: XX deleteme [%mor p=(list speech)] :: XX deleteme
[%say p=@t] :: XX normal line
== :: == ::
++ serial ,@uvH :: unique identity ++ serial ,@uvH :: unique identity
++ partner (each station passport) :: interlocutor ++ partner (each station passport) :: interlocutor