mirror of
https://github.com/urbit/shrub.git
synced 2024-12-12 10:29:01 +03:00
Merge branch 'shell' into dish
Conflicts: urb/urbit.pill
This commit is contained in:
Ubuntu
commit
2d6377f530
@ -789,7 +789,7 @@
|
||||
~
|
||||
:*
|
||||
^= rob
|
||||
%- roly
|
||||
%- role
|
||||
:~ 'User-agent: *'
|
||||
'Disallow: /'
|
||||
==
|
||||
|
||||
@ -74,7 +74,6 @@
|
||||
== ::
|
||||
++ gate $+(* *) :: general gate
|
||||
++ hair ,[p=@ud q=@ud] :: parsing trace
|
||||
++ hapt (list ,@ta) :: XX not used
|
||||
++ like |* a=_,* :: generic edge
|
||||
|= b=_`*`[(hair) ~] ::
|
||||
:- p=(hair -.b) ::
|
||||
@ -327,10 +326,6 @@
|
||||
++ tyre (list ,[p=term q=twig]) ::
|
||||
++ tyke (list (unit twig)) ::
|
||||
++ tram (list ,[p=wing q=twig]) ::
|
||||
++ tone $% [%0 p=*] ::
|
||||
[%1 p=(list)] ::
|
||||
[%2 p=(list ,[@ta *])] ::
|
||||
== ::
|
||||
:: :::::: virtual nock
|
||||
++ nock $& [p=nock q=nock] :: autocons
|
||||
$% [%0 p=@] :: axis select
|
||||
@ -346,6 +341,10 @@
|
||||
[%10 p=?(@ [p=@ q=nock]) q=nock] :: hint
|
||||
[%11 p=nock] :: grab data from sky
|
||||
== ::
|
||||
++ tone $% [%0 p=*] ::
|
||||
[%1 p=(list)] ::
|
||||
[%2 p=(list ,[@ta *])] ::
|
||||
== ::
|
||||
++ toon $% [%0 p=*] ::
|
||||
[%1 p=(list)] ::
|
||||
[%2 p=(list tank)] ::
|
||||
@ -1875,22 +1874,6 @@
|
||||
$(a l.a)
|
||||
$(a r.a)
|
||||
::
|
||||
+- mer :: puts b in a, sorted
|
||||
~/ %mer
|
||||
|* b=_a
|
||||
|- ^+ a
|
||||
?~ b
|
||||
a
|
||||
?~ a
|
||||
b
|
||||
?. (vor n.a n.b)
|
||||
$(a b, b a)
|
||||
?: =(n.b n.a)
|
||||
[n.a $(a l.a, b l.b) $(a r.a, b r.b)]
|
||||
?: (hor n.b n.a)
|
||||
$(a [n.a $(a l.a, b [n.b l.b ~]) r.a], b r.b)
|
||||
$(a [n.a l.a $(a r.a, b [n.b ~ r.b])], b l.b)
|
||||
::
|
||||
+- int :: intersection
|
||||
~/ %int
|
||||
|* b=_a
|
||||
@ -2173,12 +2156,6 @@
|
||||
b
|
||||
$(a r.a, b [n.a $(a l.a)])
|
||||
::
|
||||
+- tur :: turn
|
||||
|* b=$+([* *] *)
|
||||
|-
|
||||
?~ a ~
|
||||
[n=[p=p.n.a q=(b p.n.a q.n.a)] l=$(a l.a) r=$(a r.a)]
|
||||
::
|
||||
+- uni :: union, merge
|
||||
~/ %uni
|
||||
|* b=_a
|
||||
@ -2779,8 +2756,8 @@
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: section 2eG, parsing (whitespace) ::
|
||||
::
|
||||
++ dog ;~(plug dot gay) ::
|
||||
++ doh ;~(plug ;~(plug hep hep) gay) ::
|
||||
++ dog ;~(plug dot gay) :: . number separator
|
||||
++ doh ;~(plug ;~(plug hep hep) gay) :: -- phon separator
|
||||
++ dun (cold ~ ;~(plug hep hep)) :: -- (phep) to ~
|
||||
++ duz (cold ~ ;~(plug tis tis)) :: == (stet) to ~
|
||||
++ gah (mask [`@`10 ' ' ~]) :: newline or ace
|
||||
@ -2845,13 +2822,13 @@
|
||||
(boss 256 (star qat))
|
||||
==
|
||||
::
|
||||
++ soqs ;~(plug soq soq soq)
|
||||
++ sym
|
||||
++ soqs ;~(plug soq soq soq) :: delimiting '''
|
||||
++ sym :: symbol
|
||||
%+ cook
|
||||
|=(a=tape (rap 3 ^-((list ,@) a)))
|
||||
;~(plug low (star ;~(pose nud low hep)))
|
||||
::
|
||||
++ ven ;~ (comp |=([a=@ b=@] (peg a b)))
|
||||
++ ven ;~ (comp |=([a=@ b=@] (peg a b))) :: +>- axis syntax
|
||||
bet
|
||||
=+ hom=`?`|
|
||||
|= tub=nail
|
||||
@ -4565,7 +4542,7 @@
|
||||
!!
|
||||
$(lub res, tez [(end 3 meg lub) tez])
|
||||
::
|
||||
++ roly :: line list to atom
|
||||
++ role :: line list to atom
|
||||
|= tez=(list ,@t)
|
||||
(rap 3 (turn tez |=(a=@t (cat 3 a 10))))
|
||||
::
|
||||
@ -4582,7 +4559,7 @@
|
||||
::
|
||||
%c
|
||||
=+ dst=(lore ((hard ,@) src))
|
||||
%- roly
|
||||
%- role
|
||||
?+ -.q.don ~|(%unsupported !!)
|
||||
%a ((hard (list ,@t)) q.q.don)
|
||||
%c (lurk dst p.q.don)
|
||||
@ -4620,7 +4597,7 @@
|
||||
?+ pum ~|(%unsupported !!)
|
||||
%a dst
|
||||
%b (jam dst)
|
||||
%c (roly ((hard (list ,@)) dst))
|
||||
%c (role ((hard (list ,@)) dst))
|
||||
==
|
||||
::
|
||||
++ lurk :: apply list patch
|
||||
|
||||
@ -1595,7 +1595,7 @@
|
||||
?. con !!
|
||||
%- some
|
||||
:- %ins
|
||||
%- roly
|
||||
%- role
|
||||
%- annotate
|
||||
:- us
|
||||
:- th
|
||||
@ -1696,7 +1696,7 @@
|
||||
=. lat lut
|
||||
=+ ^= far
|
||||
^- (map path lobe)
|
||||
%- ~(tur by (forge par for s t))
|
||||
%- ~(urn by (forge par for s t))
|
||||
|= [k=path v=blob] (blob-to-lobe v)
|
||||
=+ u=(make-yaki [r.par r.for ~] far `@da`0) :: fake yaki
|
||||
:- u
|
||||
@ -1704,7 +1704,7 @@
|
||||
=< -
|
||||
%- update-lat
|
||||
:_ ~
|
||||
%- ~(tur by q.u)
|
||||
%- ~(urn by q.u)
|
||||
|= [path k=lobe]
|
||||
(lobe-to-blob k)
|
||||
::
|
||||
|
||||
@ -92,10 +92,10 @@
|
||||
;~ pose
|
||||
(stag %run ;~(plug (star ;~(sfix (task(tol %0) bar) ace)) (task col)))
|
||||
(stag %end ;~(pfix sem ;~(pose (stag %& dem) (stag %| sym))))
|
||||
(stag %path (full ;~(sfix loca(pax paf) (star ace))))
|
||||
(stag %del ;~(pfix hep ace loca))
|
||||
(stag %mut ;~(pfix col ace ;~(plug loca expg)))
|
||||
(stag %ins ;~(pfix lus ace ;~(plug loca (opts expg))))
|
||||
(stag %path (full ;~(sfix loca(pax paf) (star ace))))
|
||||
(stag %var ;~(plug ;~(pfix tis sym) expg))
|
||||
(stag %rvar ;~(pfix ;~(plug tis tis) sym))
|
||||
(stag %hoon expr)
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
^- _.
|
||||
%= .
|
||||
elf.ful
|
||||
%- ~(tur by elf.ful)
|
||||
%- ~(urn by elf.ful)
|
||||
|= [r=room [d=@da n=@ud]]
|
||||
=+ lov=(fall (~(get by lov.par) r) *loft)
|
||||
[d num.lov]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user