mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-20 23:18:00 +03:00
Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk
This commit is contained in:
Fang
commit
e59b37eafc
@ -7,7 +7,7 @@
|
||||
[. sole]
|
||||
=, space:userlib
|
||||
=, format
|
||||
!:
|
||||
!:
|
||||
:: :: ::
|
||||
:::: :: ::::
|
||||
:: :: ::
|
||||
|
||||
@ -181,7 +181,7 @@
|
||||
++ poke-write-plan-account (wrap poke-plan-account):from-write
|
||||
++ poke-write-tree (wrap poke-tree):from-write
|
||||
++ poke-write-wipe (wrap poke-wipe):from-write
|
||||
++ poke-wyll (wrap poke-wyll):from-helm
|
||||
++ poke-will (wrap poke-will):from-helm
|
||||
++ quit-drum-phat (wrap quit-phat):from-drum
|
||||
++ reap-drum-phat (wrap reap-phat):from-drum
|
||||
++ woot-helm (wrap take-woot):from-helm
|
||||
|
||||
@ -616,7 +616,7 @@
|
||||
::
|
||||
++ proc-inline :: parse inline kids
|
||||
|= pac/_pars:inli :: cache
|
||||
|= a/elem
|
||||
|= a/elem ^+ a
|
||||
?^ -.a a(q (flop (turn q.a ..$)))
|
||||
?+ -.a a
|
||||
$code
|
||||
|
||||
@ -166,6 +166,29 @@
|
||||
%- emil
|
||||
%- flop ^- (list card)
|
||||
=+ top=`path`/(scot %p our)/home/(scot %da now)/sys
|
||||
:- [%flog /reset %vega (weld top /hoon) (weld top /ovra)]
|
||||
%+ turn
|
||||
^- (list {p/@tas q/path})
|
||||
:~ [%$ /zuse]
|
||||
[%a /vane/ames]
|
||||
[%b /vane/behn]
|
||||
[%c /vane/clay]
|
||||
[%d /vane/dill]
|
||||
[%e /vane/eyre]
|
||||
[%f /vane/ford]
|
||||
[%g /vane/gall]
|
||||
==
|
||||
|= {p/@tas q/path}
|
||||
=+ way=`path`(welp top q)
|
||||
=+ txt=.^(@ %cx (welp way /hoon))
|
||||
~& [%reset-veer p way]
|
||||
[%flog /reset %veer p way txt]
|
||||
::
|
||||
++ poke-meset :: reset system (new)
|
||||
|= hood-reset =< abet
|
||||
%- emil
|
||||
%- flop ^- (list card)
|
||||
=+ top=`path`/(scot %p our)/home/(scot %da now)/sys
|
||||
=+ hun=.^(@ %cx (welp top /hoon/hoon))
|
||||
=+ arv=.^(@ %cx (welp top /arvo/hoon))
|
||||
:- [%flog /reset [%velo `@t`hun `@t`arv]]
|
||||
@ -187,7 +210,7 @@
|
||||
=+ txt=.^(@ %cx (welp way /hoon))
|
||||
[%flog /reset %veer p way txt]
|
||||
::
|
||||
++ poke-wyll :: hear certificate
|
||||
++ poke-will :: hear certificate
|
||||
|= wil/(unit wyll:ames)
|
||||
?> ?=(^ bur)
|
||||
?> ?=(^ wil)
|
||||
|
||||
11
mar/will.hoon
Normal file
11
mar/will.hoon
Normal file
@ -0,0 +1,11 @@
|
||||
::
|
||||
:::: /hoon/will/mar
|
||||
::
|
||||
/? 310
|
||||
|_ wyl/(unit wyll:ames)
|
||||
::
|
||||
++ grab :: convert from
|
||||
|%
|
||||
++ noun (unit wyll:ames) :: clam from %noun
|
||||
--
|
||||
--
|
||||
@ -19,7 +19,7 @@
|
||||
:: urb:front attrs confuse RSS validators, readers
|
||||
=+ no-meta=|=(a/marl ^+(a ?~(a ~ ?.(?=($meta n.g.i.a) a $(a t.a)))))
|
||||
::
|
||||
%- crip %- print
|
||||
%- crip %- en-xml
|
||||
;rss(version "2.0")
|
||||
;channel
|
||||
;title: *{hed.sum}
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
;script(type "text/javascript", src "{(cdnjs "react/0.14.6/react")}");
|
||||
;script(type "text/javascript", src "{(cdnjs "react/0.14.6/react-dom")}");
|
||||
;script(type "text/javascript", src "{(cdnjs "flux/2.1.1/Flux")}");
|
||||
;* (turn (~(tap by extras)) |=({@ a/@t} ;script(type "text/javascript"):"{(trip a)}"))
|
||||
;* (turn ~(tap by extras) |=({@ a/@t} ;script(type "text/javascript"):"{(trip a)}"))
|
||||
:: ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js");
|
||||
:: ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/".
|
||||
:: "codemirror/4.3.0/mode/markdown/markdown.min.js");
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
++ plist (list {term $@(mark plist)})
|
||||
++ query
|
||||
$% {$kids p/(list query)}
|
||||
{$ktts $t}
|
||||
{$name $t}
|
||||
{$path $t}
|
||||
{$spur $t}
|
||||
::
|
||||
{$dtls $t}
|
||||
{$bump $t}
|
||||
{$beak $t}
|
||||
{$comt $j}
|
||||
{$plan $j}
|
||||
@ -56,11 +56,11 @@
|
||||
|= a/query
|
||||
:- -.a
|
||||
?- -.a
|
||||
$ktts (from-type +.a ?^(s.bem i.s.bem q.bem))
|
||||
$name (from-type +.a ?^(s.bem i.s.bem q.bem))
|
||||
$beak (from-type +.a (crip (spud (en-beam bem(s /)))))
|
||||
$path (from-type +.a (crip (spud (flop s.bem))))
|
||||
$spur (from-type +.a (crip (spud s.bem)))
|
||||
$dtls (from-type +.a bump.dat)
|
||||
$bump (from-type +.a bump.dat)
|
||||
$plan (from-type +.a plan.dat)
|
||||
$comt (from-type +.a comt.dat)
|
||||
$head (from-type +.a head.dat)
|
||||
|
||||
@ -63,9 +63,9 @@
|
||||
++ endpoint (normalize (fork-clams (heads doc-data)))
|
||||
++ heads |*(a/(pole) ?~(a a [-<.a (heads +.a)]))
|
||||
++ fork-clams
|
||||
|* a/{_{term *} (pole _{term *})} :: ^- _{term *}
|
||||
?~ +.a -.a
|
||||
?(-.a (fork-clams +.a))
|
||||
|* a/(pair _{term *} (pole _{term *})) :: ^- _{term *}
|
||||
?~ q.a p.a
|
||||
?(p.a (fork-clams q.a))
|
||||
::
|
||||
++ normalize :: XX smarter pretty-printing
|
||||
|* a/_{@ *} :: ^+ a
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
::
|
||||
++ add :: unsigned addition
|
||||
~/ %add
|
||||
|= {a/@ b/@}
|
||||
|= [a=@ b=@]
|
||||
^- @
|
||||
?: =(0 a) b
|
||||
$(a (dec a), b +(b))
|
||||
@ -9946,6 +9946,8 @@
|
||||
(stag %bcwt ;~(pfix wut (ifix [pel per] (most ace wyde))))
|
||||
(cold [%base %bean] wut)
|
||||
==
|
||||
:- '~'
|
||||
(cold [%base %null] sig)
|
||||
:- '^'
|
||||
;~ pose
|
||||
scab
|
||||
@ -10066,7 +10068,7 @@
|
||||
(stag %dtts ;~(pfix tis (ifix [pel per] ;~(glam wide wide))))
|
||||
:- '?'
|
||||
;~ pose
|
||||
(stag %bcwt ;~(pfix wut (ifix [pel per] (most ace wide))))
|
||||
(stag %bcwt ;~(pfix wut (ifix [pel per] (most ace wyde))))
|
||||
(cold [%base %bean] wut)
|
||||
==
|
||||
:- '['
|
||||
|
||||
@ -486,7 +486,9 @@
|
||||
?: ?=($veer -.q.i.ova)
|
||||
$(ova t.ova, +>+.^$ (veer now q.i.ova))
|
||||
?: ?=($vega -.q.i.ova)
|
||||
(fall (vega now t.ova (path +.q.i.ova)) [~ +>.^$])
|
||||
%+ fall
|
||||
(vega now t.ova (path +<.q.i.ova) (path +>.q.i.ova))
|
||||
[~ +>.^$]
|
||||
?: ?=($mass -.q.i.ova)
|
||||
=+ avo=$(ova t.ova)
|
||||
:_ +.avo
|
||||
@ -550,17 +552,24 @@
|
||||
[zef +>.$]
|
||||
::
|
||||
++ vega :: reboot kernel
|
||||
|= {now/@da ova/(list ovum) hap/path}
|
||||
|= {now/@da ova/(list ovum) hap/path zup/path}
|
||||
^- (unit {p/(list ovum) q/*})
|
||||
=- ?:(?=($| -.res) ((slog p.res) ~) `p.res)
|
||||
^= res %- mule |.
|
||||
=+ pax=(weld hap `path`[%hoon ~])
|
||||
~& [%vega-start hap]
|
||||
=+ wax=(weld zup `path`[%hoon ~])
|
||||
~& [%vega-start-hoon hap]
|
||||
=+ src=((hard @t) (need (peek now cx+pax)))
|
||||
=+ saz=(shax src)
|
||||
=+ arv=((hard @t) (need (peek now cx+wax)))
|
||||
=+ gen=(rain hap src)
|
||||
~& %vega-parsed
|
||||
=+ ken=.*(0 q:(~(mint ut %noun) %noun gen))
|
||||
=+ one=(~(mint ut %noun) %noun gen)
|
||||
~& %vega-compiled
|
||||
~& [%vega-arvo zup]
|
||||
=+ two=(~(mint ut p.one) %noun (rain zup arv))
|
||||
~& %vega-minted
|
||||
=+ ken=.*(0 [7 q.one q.two])
|
||||
~& [%vega-kernel `@ux`(mug ken)]
|
||||
=+ ^= nex
|
||||
=+ gat=.*(ken .*(ken [0 87]))
|
||||
(need ((hard (unit @)) .*([-.gat [[now ~] +>.gat]] -.gat)))
|
||||
@ -569,7 +578,8 @@
|
||||
=+ gat=.*(ken .*(ken [0 ?:(=(nex hoon) 86 11)]))
|
||||
=+ sam=[eny ova q.niz]
|
||||
=+ raw=.*([-.gat [sam +>.gat]] -.gat)
|
||||
[[[~ %vega hap] ((list ovum) -.raw)] +.raw]
|
||||
=+ yep=((list ovum) -.raw)
|
||||
[[[~ %vega hap] yep] +.raw]
|
||||
::
|
||||
++ veer :: install vane/tang
|
||||
|= {now/@da fav/curd}
|
||||
|
||||
@ -185,7 +185,7 @@
|
||||
0w0 :: 68, ~sub, Curtis Yarvin
|
||||
0w0 :: 69, ~pet, Curtis Yarvin
|
||||
0w0 :: 70, ~rul, Curtis Yarvin
|
||||
0w0 :: 71, ~syn, Henry Ault
|
||||
0w0 :: 71, ~syn, Pantera
|
||||
0w0 :: 72, ~reg, Henry Ault
|
||||
0w0 :: 73, ~tyd, Henry Ault
|
||||
0w0 :: 74, ~sup, Henry Ault
|
||||
@ -271,7 +271,7 @@
|
||||
0w0 :: 154, ~tus, Tlon
|
||||
0w0 :: 155, ~tyc, Tlon
|
||||
0w0 :: 156, ~leg, Tlon
|
||||
0w0 :: 157, ~nem, Tlon
|
||||
0w0 :: 157, ~nem, Jeremy Tunnell
|
||||
0w0 :: 158, ~fer, Tlon
|
||||
0w0 :: 159, ~mer, Tlon
|
||||
0w1E.bDeR7.cuQmt.Uc5CS.OSyMx :: 160, ~ten, Tlon
|
||||
@ -310,7 +310,7 @@
|
||||
0w0 :: 193, ~duc, Tlon
|
||||
0w0 :: 194, ~fur, Tlon
|
||||
0w0 :: 195, ~fex, Tlon
|
||||
0w0 :: 196, ~nul, Tlon
|
||||
0w0 :: 196, ~nul, Matthew Liston
|
||||
0w0 :: 197, ~luc, Tlon
|
||||
0w0 :: 198, ~len, Tlon
|
||||
0w0 :: 199, ~ner, Tlon
|
||||
@ -1599,7 +1599,7 @@
|
||||
==
|
||||
::
|
||||
$cake
|
||||
~? ?=(^ r.bon) [%cake-woot-bad hen]
|
||||
~? ?=(^ r.bon) [%cake-woot-bad hen r.bon]
|
||||
:_ fox
|
||||
:~ [s.bon %give %woot q.p.bon r.bon]
|
||||
==
|
||||
|
||||
@ -325,7 +325,7 @@
|
||||
== ::
|
||||
++ note :: out request $->
|
||||
$% $: $a :: to %ames
|
||||
$% {$wont p/sock q/path r/*} ::
|
||||
$% {$want p/sock q/path r/*} ::
|
||||
== == ::
|
||||
$: $c :: to %clay
|
||||
$% {$info p/@p q/@tas r/nori} :: internal edit
|
||||
@ -641,7 +641,7 @@
|
||||
::
|
||||
++ send-over-ames
|
||||
|= {a/duct b/path c/ship d/{p/@ud q/riff}}
|
||||
(emit a %pass b %a %wont [our c] [%c %question p.q.d (scot %ud p.d) ~] q.d)
|
||||
(emit a %pass b %a %want [our c] [%c %question p.q.d (scot %ud p.d) ~] q.d)
|
||||
::
|
||||
:: Create a request that cannot be filled immediately.
|
||||
::
|
||||
@ -3296,15 +3296,17 @@
|
||||
[mos ..^$]
|
||||
::
|
||||
$init
|
||||
:_ %_ ..^$
|
||||
fat.ruf
|
||||
?< (~(has by fat.ruf) p.q.hic)
|
||||
(~(put by fat.ruf) p.q.hic [-(hun hen)]:[*room .])
|
||||
==
|
||||
=+ [bos=(sein:title p.q.hic) can=(clan:title p.q.hic)]
|
||||
%- zing ^- (list (list move))
|
||||
:~ ?: =(bos p.q.hic) ~
|
||||
[hen %pass /init-merge %c %merg p.q.hic %base bos %kids da+now %init]~
|
||||
::
|
||||
:: this used to start the initial merge, which is now
|
||||
:: not a necessary part of the boot sequence.
|
||||
::
|
||||
:- ~
|
||||
%_ ..^$
|
||||
fat.ruf
|
||||
?< (~(has by fat.ruf) p.q.hic)
|
||||
(~(put by fat.ruf) p.q.hic [-(hun hen)]:[*room .])
|
||||
~
|
||||
==
|
||||
::
|
||||
$into
|
||||
@ -3665,8 +3667,8 @@
|
||||
=+ our=(slav %p i.tea)
|
||||
=+ him=(slav %p i.t.tea)
|
||||
:_ ..^$
|
||||
:~ :* hen %pass /writ-wont %a
|
||||
%wont [our him] [%c %answer t.t.tea]
|
||||
:~ :* hen %pass /writ-want %a
|
||||
%want [our him] [%c %answer t.t.tea]
|
||||
(bind p.+.q.hin rant-to-rand)
|
||||
==
|
||||
==
|
||||
@ -4122,8 +4124,8 @@
|
||||
=+ our=(slav %p i.tea)
|
||||
=+ him=(slav %p i.t.tea)
|
||||
:_ +>.$
|
||||
:~ :* hen %pass /writ-wont %a
|
||||
%wont [our him] [%c %answer t.t.tea]
|
||||
:~ :* hen %pass /writ-want %a
|
||||
%want [our him] [%c %answer t.t.tea]
|
||||
(bind p.+.hin rant-to-rand)
|
||||
==
|
||||
==
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
{$init p/ship} ::
|
||||
{$text p/tape} ::
|
||||
{$veer p/@ta q/path r/@t} :: install vane
|
||||
{$vega p/path} :: reboot by path
|
||||
{$vega p/path q/path} :: reboot by path
|
||||
{$velo p/@t q/@t} :: reboot by path
|
||||
{$verb $~} :: verbose mode
|
||||
== ::
|
||||
|
||||
@ -298,7 +298,7 @@
|
||||
0w0 :: 193, ~duc, Tlon
|
||||
0w0 :: 194, ~fur, Tlon
|
||||
0w0 :: 195, ~fex, Tlon
|
||||
0w0 :: 196, ~nul, Tlon
|
||||
0w0 :: 196, ~nul, Matthew Liston
|
||||
0w0 :: 197, ~luc, Tlon
|
||||
0w0 :: 198, ~len, Tlon
|
||||
0w0 :: 199, ~ner, Tlon
|
||||
|
||||
@ -511,7 +511,7 @@
|
||||
{$mass p/mass} :: memory usage
|
||||
{$send p/lane:ames q/@} :: transmit packet
|
||||
{$veer p/@ta q/path r/@t} :: install vane
|
||||
{$vega p/path} :: old reboot
|
||||
{$vega p/path q/path} :: old reboot
|
||||
{$velo p/@t q/@t} :: reboot
|
||||
{$verb $~} :: verbose mode
|
||||
== ::
|
||||
@ -532,7 +532,7 @@
|
||||
{$talk p/tank} ::
|
||||
{$text p/tape} ::
|
||||
{$veer p/@ta q/path r/@t} :: install vane
|
||||
{$vega p/path} :: old reboot
|
||||
{$vega p/path q/path} :: old reboot
|
||||
{$velo p/@t q/@t} :: reboot
|
||||
{$verb $~} :: verbose mode
|
||||
== ::
|
||||
@ -593,7 +593,7 @@
|
||||
{$heft $~} ::
|
||||
{$text p/tape} ::
|
||||
{$veer p/@ta q/path r/@t} :: install vane
|
||||
{$vega p/path} :: old reboot
|
||||
{$vega p/path q/path} :: old reboot
|
||||
{$velo p/@t q/@t} :: reboot
|
||||
{$verb $~} :: verbose mode
|
||||
== ::
|
||||
@ -623,7 +623,7 @@
|
||||
{$thou p/httr} :: raw http response
|
||||
{$thus p/@ud q/(unit hiss)} :: http request+cancel
|
||||
{$veer p/@ta q/path r/@t} :: drop-through
|
||||
{$vega p/path} :: drop-through
|
||||
{$vega p/path q/path} :: drop-through
|
||||
{$velo p/@t q/@t} :: drop-through
|
||||
{$mini-jael-gift *}
|
||||
== ::
|
||||
@ -4332,7 +4332,7 @@
|
||||
|= who/ship ^- ship
|
||||
=+ mir=(clan who)
|
||||
?- mir
|
||||
$czar ~zod
|
||||
$czar who
|
||||
$king (end 3 1 who)
|
||||
$duke (end 4 1 who)
|
||||
$earl (end 5 1 who)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user