ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 20:01:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test' into newunix

Browse Source 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/zuse.hoon
This commit is contained in:
Anton Dyudin 2015-06-22 17:19:55 -07:00
commit 9ea8809359
6 changed files with 66 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/ape/dojo.hoon
View File

@ -518,7 +518,7 @@
++ he-dope :: sole user of ++dp ++ he-dope :: sole user of ++dp
|= txt=tape :: |= txt=tape ::
^- (each (unit dojo-command) hair) :: prefix/result ^- (each (unit dojo-command) hair) :: prefix/result
=+ vex=(dp-command:dp [1 1] txt) :: =+ vex=((full dp-command):dp [1 1] txt) ::
?. =(+((lent txt)) q.p.vex) :: fully parsed ?. =(+((lent txt)) q.p.vex) :: fully parsed
[%| p.p.vex (dec q.p.vex)] :: syntax error [%| p.p.vex (dec q.p.vex)] :: syntax error
[%& ?~(q.vex ~ `p.u.q.vex)] :: prefix/complete [%& ?~(q.vex ~ `p.u.q.vex)] :: prefix/complete

55
base/arvo/ames.hoon
View File

@ -11,15 +11,12 @@
== == :: == == ::
$: %a :: to %ames $: %a :: to %ames
$% [%kick p=@da] :: $% [%kick p=@da] ::
== == ::
$: %g :: to %gall
$% [%rote p=sack q=path r=*] ::
[%roth p=sack q=path r=*] ::
== == :: == == ::
$: @tas :: to any $: @tas :: to any
$% [%init p=@p] :: $% [%init p=@p] ::
[%want p=sock q=path r=*] :: [%want p=sock q=path r=*] ::
[%wart p=sock q=@tas r=path s=*] :: [%wart p=sock q=@tas r=path s=*] ::
[%west p=sack q=path r=*] ::
== == == :: == == == ::
++ sign :: in result $<- ++ sign :: in result $<-
$? $: %a :: from %ames $? $: %a :: from %ames
@ -27,12 +24,12 @@
== == :: == == ::
$: %g :: from %gall $: %g :: from %gall
$% [%unto p=cuft] :: $% [%unto p=cuft] ::
[%mack p=(unit tang)] :: message ack
[%mean p=ares] :: XX old, clean up [%mean p=ares] :: XX old, clean up
[%nice ~] :: [%nice ~] ::
== == :: == == ::
$: @tas :: $: @tas ::
$% [%crud p=@tas q=(list tank)] :: by any $% [%crud p=@tas q=(list tank)] :: by any
[%mack p=(unit tang)] :: message ack
== == == :: == == == ::
-- --
:::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -1672,7 +1669,7 @@
:+ (scot %p p.p.bon) :+ (scot %p p.p.bon)
(scot %p q.p.bon) (scot %p q.p.bon)
q.q.bon q.q.bon
[hen %pass pax %g %rote p.bon /hood 0 %m %will wil]~ [hen %pass pax %g %west p.bon /ge/hood 0 %m %will wil]~
?> ?=([@ @ *] t.q.q.bon) ?> ?=([@ @ *] t.q.q.bon)
:_ fox :_ fox
=+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon] =+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon]
@ -1723,51 +1720,14 @@
:_ fox :_ fox
:~ [hen [%slip %c %wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]] :~ [hen [%slip %c %wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]]
== ==
::
%ye :: %ye
:: ~& [%ye bon]
?> =(p.p.bon (sein q.p.bon))
=+ ^= paz ^- (list ,@p)
%+ skim pals:(~(um am [now fox]) p.p.bon)
|=(a=@p =(p.p.bon (sein a)))
:_ fox
%+ turn paz
|= him=ship
:- hen
[%pass /ye %g %rote `sack`p.bon /ye 0 %m %helm-ye ((hard ,@t) r.bon)]
== ==
:: ::
%mulk %mulk
:: ~& [%mulk p.bon q.bon] :: ~& [%mulk p.bon q.bon]
?> ?=([@ @ *] q.q.bon) ?> ?=([@ @ *] q.q.bon)
?> ?=(%q i.q.q.bon) ?> ?=(?(%a %c %e %g) i.q.q.bon)
?+ i.t.q.q.bon =+ pax=[(scot %p p.p.bon) (scot %p q.p.bon) q.q.bon]
~& %mulk-bad :_ fox [hen %pass pax i.q.q.bon %west p.bon t.q.q.bon r.bon]~
:_ fox
:~ :- (claw p.p.bon)
[%sick %wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]
==
::
%ge :: %gall request
=* imp t.t.q.q.bon
?> (levy imp (sane %ta))
=+ ^= pax
:+ (scot %p p.p.bon)
(scot %p q.p.bon)
q.q.bon
:: ~& [%ames-gall-request p.bon imp pax]
:_ fox [hen %pass pax %g %rote p.bon imp r.bon]~
::
%gh :: %gall response
=* imp t.t.q.q.bon
?> (levy imp (sane %ta))
=+ ^= pax
:+ (scot %p p.p.bon)
(scot %p q.p.bon)
q.q.bon
:: ~& [%ames-gall-response p.bon imp pax]
:_ fox [hen %pass pax %g %roth p.bon imp r.bon]~
==
:: ::
%ouzo %ouzo
:: ~& [%send now p.bon `@p`(mug (shaf %flap q.bon))] :: ~& [%send now p.bon `@p`(mug (shaf %flap q.bon))]
@ -1862,6 +1822,9 @@
:: ::
%wont %wont
(~(wise am [now fox]) p.kyz hen q.kyz r.kyz &) (~(wise am [now fox]) p.kyz hen q.kyz r.kyz &)
::
%west
!!
== ==
=> %_(. fox q.fuy) => %_(. fox q.fuy)
=| out=(list move) =| out=(list move)

58
base/arvo/clay.hoon
View File

@ -42,7 +42,7 @@
== :: == ::
++ note :: out request $-> ++ note :: out request $->
$% $: %a :: to %ames $% $: %a :: to %ames
$% [%want p=sock q=path r=*] :: $% [%wont p=sock q=path r=*] ::
== == :: == == ::
$: %c :: to %clay $: %c :: to %clay
$% [%info p=@p q=@tas r=nori] :: internal edit $% [%info p=@p q=@tas r=nori] :: internal edit
@ -61,8 +61,7 @@
== == == :: == == == ::
++ sign :: in result $<- ++ sign :: in result $<-
$? $: %a :: by %ames $? $: %a :: by %ames
$% [%waft p=sock q=*] :: $% [%woot p=ship q=coop] ::
[%went p=ship q=cape] ::
== == :: == == ::
$: %c :: by %clay $: %c :: by %clay
$% [%note p=@tD q=tank] :: $% [%note p=@tD q=tank] ::
@ -156,7 +155,7 @@
%+ turn (flop say) %+ turn (flop say)
|= [a=duct b=path c=ship d=[p=@ud q=riff]] |= [a=duct b=path c=ship d=[p=@ud q=riff]]
:- a :- a
[%pass b %a %want [who c] [%q %re p.q.d (scot %ud p.d) ~] q.d] [%pass b %a %wont [who c] [%c %question p.q.d (scot %ud p.d) ~] q.d]
:: ::
tag tag
== ==
@ -2552,15 +2551,27 @@
[-.woo (posh q.p.q.hic p.q.q.hic +.woo ruf)] [-.woo (posh q.p.q.hic p.q.q.hic +.woo ruf)]
[mos ..^$] [mos ..^$]
:: ::
%wart %west
?> ?=(%re q.q.hic) ?: ?=([%question *] q.q.hic)
=+ ryf=((hard riff) s.q.hic) =+ ryf=((hard riff) r.q.hic)
:_ ..^$ :_ ..^$
:~ :- hen :~ [hen %give %mack ~]
:^ %pass [(scot %p p.p.q.hic) (scot %p q.p.q.hic) r.q.hic] :- hen
%c :^ %pass [(scot %p p.p.q.hic) (scot %p q.p.q.hic) t.q.q.hic]
[%warp [p.p.q.hic p.p.q.hic] ryf] %c
== [%warp [p.p.q.hic p.p.q.hic] ryf]
==
?> ?=([%answer @ @ ~] q.q.hic)
=+ syd=(slav %tas i.t.q.q.hic)
=+ inx=(slav %ud i.t.t.q.q.hic)
=+ ^= zat
=< wake
%- take-foreign-update:(do now hen p.q.hic syd ruf)
[inx ((hard (unit rand)) r.q.hic)]
=^ mos ruf
=+ zot=abet.zat
[-.zot (posh q.p.q.hic syd +.zot ruf)]
[[[hen %give %mack ~] mos] ..^$(ran.ruf ran.zat)] :: merge in new obj
:: ::
%wegh %wegh
:_ ..^$ :_ ~ :_ ..^$ :_ ~
@ -2776,19 +2787,6 @@
[~ ..^$] [~ ..^$]
:: ::
%note [[hen %give +.q.hin]~ ..^$] %note [[hen %give +.q.hin]~ ..^$]
%waft
?> ?=([@ @ ~] tea)
=+ syd=(slav %tas i.tea)
=+ inx=(slav %ud i.t.tea)
=+ ^= zat
=< wake
%- take-foreign-update:(do now hen p.+.q.hin syd ruf)
[inx ((hard (unit rand)) q.+.q.hin)]
=^ mos ruf
=+ zot=abet.zat
[-.zot (posh q.p.+.q.hin syd +.zot ruf)]
[mos ..^$(ran.ruf ran.zat)] :: merge in new obj
::
%wake %wake
=+ dal=(turn (~(tap by fat.ruf) ~) |=([a=@p b=room] a)) =+ dal=(turn (~(tap by fat.ruf) ~) |=([a=@p b=room] a))
=| mos=(list move) =| mos=(list move)
@ -2806,14 +2804,14 @@
=+ him=(slav %p i.t.tea) =+ him=(slav %p i.t.tea)
:_ ..^$ :_ ..^$
:~ :* hen %pass ~ %a :~ :* hen %pass ~ %a
%want [our him] [%r %re %c t.t.tea] %wont [our him] [%c %answer t.t.tea]
(bind p.+.q.hin rant-to-rand) (bind p.+.q.hin rant-to-rand)
== ==
== ==
:: ::
%went %woot
?: =(%good q.+.q.hin) [~ ..^$] ?~ q.q.hin [~ ..^$]
~& [%clay-lost p.+.q.hin tea] ~& [%clay-lost p.q.hin q.q.hin tea]
[~ ..^$] [~ ..^$]
== ==
:: ::

19
base/arvo/eyre.hoon
View File

@ -9,7 +9,7 @@
++ move ,[p=duct q=(mold note gift)] :: local move ++ move ,[p=duct q=(mold note gift)] :: local move
++ note :: out request $-> ++ note :: out request $->
$% $: %a :: to %ames $% $: %a :: to %ames
$% [%want p=sock q=[path *]] :: $% [%wont p=sock q=[path *]] ::
== == :: == == ::
$: %d :: to %dill $: %d :: to %dill
$% [%flog p=[%crud p=@tas q=(list tank)]] :: $% [%flog p=[%crud p=@tas q=(list tank)]] ::
@ -31,7 +31,7 @@
== == == :: == == == ::
++ sign :: in result $<- ++ sign :: in result $<-
$? $: %a :: by %ames $? $: %a :: by %ames
$% [%went p=ship q=cape] :: $% [%woot p=ship q=coop] ::
== == :: == == ::
$: %g :: by %gall $: %g :: by %gall
$% [%unto p=cuft] :: within agent $% [%unto p=cuft] :: within agent
@ -615,11 +615,12 @@
:: ford-kill :: XX discriminate :: ford-kill :: XX discriminate
+>.$(ded (~(put in ded) hen)) +>.$(ded (~(put in ded) hen))
:: ::
%wart :: remote request %west :: remote request
=+ mez=((soft gram) r.kyz) =. mow :_(mow [hen %give %mack ~])
=+ mez=((soft gram) q.kyz)
?~ mez ?~ mez
~& [%strange-wart p.kyz q.kyz] ~& e/[%strange-west p.kyz]
+>.$ ~|(%strange-west !!)
?- -<.u.mez ?- -<.u.mez
%aut abet:(logon:(ses-ya p.u.mez) q.p.kyz) %aut abet:(logon:(ses-ya p.u.mez) q.p.kyz)
%hat (foreign-hat:(ses-ya p.u.mez) q.p.kyz q.u.mez) %hat (foreign-hat:(ses-ya p.u.mez) q.p.kyz q.u.mez)
@ -641,7 +642,7 @@
(ames-gram q.p.kyz hat/~ p.u.mez our-host) (ames-gram q.p.kyz hat/~ p.u.mez our-host)
== ==
:: ::
%wegh !! %wegh !! :: handled elsewhere
== ==
:: ::
++ axom :: old response ++ axom :: old response
@ -661,7 +662,7 @@
:: =. +> ?+(tee +> [%of ^] pop-duct:(ire-ix p.tee)) :: =. +> ?+(tee +> [%of ^] pop-duct:(ire-ix p.tee))
:: (emule |.(~|(gall-dumb/tee !!))) :: (emule |.(~|(gall-dumb/tee !!)))
:: ::
%went +>.$ %woot +>.$
%thou %thou
?+ -.tee !! ?+ -.tee !!
%ay (ames-gram (slav %p p.tee) got/~ (slav %uv q.tee) |2.sih) %ay (ames-gram (slav %p p.tee) got/~ (slav %uv q.tee) |2.sih)
@ -791,7 +792,7 @@
:: [| [~ 8.445] `/localhost] :: XX testing :: [| [~ 8.445] `/localhost] :: XX testing
:: ::
++ ames-gram ++ ames-gram
|=([him=ship gam=gram] (pass-note ~ %a %want [our him] [%e -.gam] +.gam)) |=([him=ship gam=gram] (pass-note ~ %a %wont [our him] [%e -.gam] +.gam))
:: ::
++ back :: %ford bounce ++ back :: %ford bounce
|= [tea=whir mar=mark cay=cage] |= [tea=whir mar=mark cay=cage]

32
base/arvo/gall.hoon
View File

@ -227,7 +227,7 @@
== ==
%+ mo-pass %+ mo-pass
[%sys %way -.q.caz ~] [%sys %way -.q.caz ~]
`note-arvo`[%a %wont [our him] [%q %ge p.caz ~] [num roc]] `note-arvo`[%a %wont [our him] [%g %ge p.caz ~] [num roc]]
:: ::
++ mo-baal :: error convert a ++ mo-baal :: error convert a
|= art=(unit ares) |= art=(unit ares)
@ -344,7 +344,7 @@
(mo-pass [%sys pax] %g %deal [him our] dap %pump ~) (mo-pass [%sys pax] %g %deal [him our] dap %pump ~)
~& [%diff-bad-ack q.+>.sih] :: should not happen ~& [%diff-bad-ack q.+>.sih] :: should not happen
=. +>.$ (mo-pass [%sys pax] %g %deal [him our] dap %pull ~) =. +>.$ (mo-pass [%sys pax] %g %deal [him our] dap %pull ~)
(mo-pass [%sys pax] %a %wont [our him] [%q %gh dap ~] [num %x ~]) (mo-pass [%sys pax] %a %wont [our him] [%g %gh dap ~] [num %x ~])
:: ::
%rep :: reverse request %rep :: reverse request
?> ?=([@ @ @ ~] t.pax) ?> ?=([@ @ @ ~] t.pax)
@ -378,10 +378,10 @@
?- -.cuf ?- -.cuf
%coup (mo-give %mack p.cuf) %coup (mo-give %mack p.cuf)
%diff %+ mo-pass [%sys %red t.pax] %diff %+ mo-pass [%sys %red t.pax]
[%a %wont [our him] [%q %gh dap ~] [num %d p.p.cuf q.q.p.cuf]] [%a %wont [our him] [%g %gh dap ~] [num %d p.p.cuf q.q.p.cuf]]
%doff !! %doff !!
%quit %+ mo-pass [%sys pax] %quit %+ mo-pass [%sys pax]
[%a %wont [our him] [%q %gh dap ~] [num %x ~]] [%a %wont [our him] [%g %gh dap ~] [num %x ~]]
%reap (mo-give %mack p.cuf) %reap (mo-give %mack p.cuf)
== ==
:: ::
@ -1141,28 +1141,18 @@
:: ~& [%gall-init p.q.hic] :: ~& [%gall-init p.q.hic]
[~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))] [~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))]
:: ::
%rote %west
:: ~& [%gall-rote p.q.hic]
?. (~(has by pol.all) p.p.q.hic) ?. (~(has by pol.all) p.p.q.hic)
~& [%gall-not-ours p.q.hic] ~& [%gall-not-ours p.q.hic]
[~ ..^$] [~ ..^$]
?> ?=([@ ~] q.q.hic) ?> ?=([?(%ge %gh) @ ~] q.q.hic)
=+ dap=i.q.q.hic =+ dap=i.t.q.q.hic
=+ our=p.p.q.hic
=+ him=q.p.q.hic
=+ mes=((hard ,[@ud rook]) r.q.hic)
=< mo-abet
(mo-gawk:(mo-abed:mo our hen) him dap mes)
::
%roth
:: ~& [%gall-roth p.q.hic]
?. (~(has by pol.all) p.p.q.hic)
~& [%gall-not-ours p.q.hic]
[~ ..^$]
?> ?=([@ ~] q.q.hic)
=+ dap=i.q.q.hic
=+ our=p.p.q.hic =+ our=p.p.q.hic
=+ him=q.p.q.hic =+ him=q.p.q.hic
?: ?=(%ge i.q.q.hic)
=+ mes=((hard ,[@ud rook]) r.q.hic)
=< mo-abet
(mo-gawk:(mo-abed:mo our hen) him dap mes)
=+ mes=((hard ,[@ud roon]) r.q.hic) =+ mes=((hard ,[@ud roon]) r.q.hic)
=< mo-abet =< mo-abet
(mo-gawd:(mo-abed:mo our hen) him dap mes) (mo-gawd:(mo-abed:mo our hen) him dap mes)

11
base/arvo/zuse.hoon
View File

@ -2316,6 +2316,7 @@
[%wake ~] :: timer activate [%wake ~] :: timer activate
[%want p=sock q=path r=*] :: send message [%want p=sock q=path r=*] :: send message
[%wegh ~] :: report memory [%wegh ~] :: report memory
[%west p=sack q=path r=*] :: network request
[%wont p=sock q=path r=*] :: e2e send message [%wont p=sock q=path r=*] :: e2e send message
== :: == ::
:: ::
@ -2331,6 +2332,7 @@
++ gift-clay :: out result <-$ ++ gift-clay :: out result <-$
$% [%ergo p=@tas q=mode] :: version update $% [%ergo p=@tas q=mode] :: version update
[%hill p=(list ,@tas)] :: mount points [%hill p=(list ,@tas)] :: mount points
[%mack p=(unit tang)] :: ack
[%mass p=mass] :: memory usage [%mass p=mass] :: memory usage
[%mere p=(each (set path) (pair term tang))] :: merge result [%mere p=(each (set path) (pair term tang))] :: merge result
[%note p=@tD q=tank] :: debug message [%note p=@tD q=tank] :: debug message
@ -2345,9 +2347,9 @@
[%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks [%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks
[%mont p=@tas q=@p r=@tas s=path] :: mount to unix [%mont p=@tas q=@p r=@tas s=path] :: mount to unix
[%ogre p=$|(@tas beam)] :: delete mount point [%ogre p=$|(@tas beam)] :: delete mount point
[%wart p=sock q=@tas r=path s=*] :: network request
[%warp p=sock q=riff] :: file request [%warp p=sock q=riff] :: file request
[%wegh ~] :: report memory [%wegh ~] :: report memory
[%west p=sack q=path r=*] :: network request
== :: == ::
:: ::
:::: ::::
@ -2438,6 +2440,7 @@
:::: %eyre :::: %eyre
:: ::
++ gram :: inter-ship message ++ gram :: inter-ship message
=+ fuz=,[path *] :: ames format
$? [[%lon ~] p=hole] :: login request $? [[%lon ~] p=hole] :: login request
[[%aut ~] p=hole] :: login reply [[%aut ~] p=hole] :: login reply
[[%hat ~] p=hole q=hart] :: login redirect [[%hat ~] p=hole q=hart] :: login redirect
@ -2454,11 +2457,12 @@
[%they p=@ud q=httr] :: inbound response [%they p=@ud q=httr] :: inbound response
[%this p=? q=clip r=httq] :: inbound request [%this p=? q=clip r=httq] :: inbound request
[%thud ~] :: inbound cancel [%thud ~] :: inbound cancel
[%wart p=sack q=@tas r=_`[path *]`*gram] :: urbit message
[%wegh ~] :: report memory [%wegh ~] :: report memory
[%west p=sack q=fuz:gram] :: network request
== :: == ::
++ gift-eyre :: out result <-$ ++ gift-eyre :: out result <-$
$% [%mass p=mass] :: memory usage $% [%mass p=mass] :: memory usage
[%mack p=(unit tang)] :: message ack
[%sigh p=cage] :: marked http response [%sigh p=cage] :: marked http response
[%thou p=httr] :: raw http response [%thou p=httr] :: raw http response
[%thus p=@ud q=(unit hiss)] :: http request/cancel [%thus p=@ud q=(unit hiss)] :: http request/cancel
@ -2575,8 +2579,7 @@
$% [%conf p=dock q=culm] :: configure app $% [%conf p=dock q=culm] :: configure app
[%init p=ship] :: set owner [%init p=ship] :: set owner
[%deal p=sock q=cush] :: full transmission [%deal p=sock q=cush] :: full transmission
[%rote p=sack q=path r=*] :: remote request [%west p=sack q=path r=*] :: network request
[%roth p=sack q=path r=*] :: remote response
[%wegh ~] :: report memory [%wegh ~] :: report memory
== :: == ::
++ gift-gall :: outgoing result ++ gift-gall :: outgoing result