urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 01:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	urb/zod/main/app/grep/core.hook
This commit is contained in:
Anton Dyudin 2014-10-07 16:15:20 -07:00 committed by Anton Dyudin
commit b95bacc5bb
3 changed files with 58 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/app/grep/core.hook
View File

@ -2,9 +2,11 @@
++ sign ++ sign
$% $: %g $% $: %g
$% [%nice ~] $% [%nice ~]
[%rush %txt p=cord] $: %rush
[%rush %tang p=(list tank)] $% [%txt p=cord]
[%tang p=(list tank)]
== == == == == ==
== ==
-- --
:: ::
!: !:
@ -13,12 +15,10 @@
|= [ost=bone you=ship arg=cord ~] |= [ost=bone you=ship arg=cord ~]
=. ^arg arg =. ^arg arg
:_ +>.$ :_ +>.$
~& [%grep-subscribing-to /in/[-.imp.hid]]
:~ [ost %pass / %g %show [our.hid +.imp.hid] you /in/[-.imp.hid]] :~ [ost %pass / %g %show [our.hid +.imp.hid] you /in/[-.imp.hid]]
== ==
++ peer ++ peer |=(* `+>)
|=
*
`+>
++ pour ++ pour
|= [ost=bone pax=path sih=*] |= [ost=bone pax=path sih=*]
=+ sih=;;(sign sih) =+ sih=;;(sign sih)

107
main/app/shell/core.hook
View File

@ -32,14 +32,17 @@
[%meta p=vase] :: [%meta p=vase] ::
== == == :: == == == ::
++ mand ,[p=term q=(list twig)] :: ++ mand ,[p=term q=(list twig)] ::
++ pipa ::
$% [%pipe p=mand q=pipa] ::
[%start mand] ::
== ::
++ coma :: ++ coma ::
$% [%start p=term q=(list twig)] :: $? pipa ::
[%end p=(each ,@u cord)] :: [%end p=(each ,@u cord)] ::
[%path p=path] :: [%path p=path] ::
[%hoon p=twig] :: [%hoon p=twig] ::
[%var p=term q=twig] :: [%var p=term q=twig] ::
[%rvar p=term] :: [%rvar p=term] ::
[%pipe p=(list mand)] ::
== :: == ::
++ sign :: ++ sign ::
$% $: %g :: $% $: %g ::
@ -71,23 +74,32 @@
== ==
:: ::
++ args ++ args
;~(pfix ace (more ace wide:(vang & pax))) :: ^- $+(nail (like (list twig)))
(more ace wide:(vang & pax))
:: ::
++ pipe ++ pipe
%+ knee *[mand pipa] |. ~+
;~ pfix bar ;~ pfix bar
%+ more ;~ plug
;~(plug ace bar) ;~(plug sym (maybe (ifix [;~(plug ace sel) ser] args)))
;~(plug ;~(pfix col sym) (ifix [sel ser] args)) ;~(pfix ace pipable)
==
==
::
++ pipable
%+ knee *pipa |. ~+
;~ pose
(stag %start ;~(pfix col ;~(plug sym (maybe ;~(pfix ace args)))))
(stag %pipe pipe)
== ==
:: ::
++ parse ++ parse
^- $+(nail (like coma)) ^- $+(nail (like coma))
=+ paf=?.(=('0' &3.pax) pax pax(&3 (scot da/lat.hid))) =+ paf=?.(=('0' &3.pax) pax pax(&3 (scot da/lat.hid)))
;~ pose ;~ pose
(stag %start ;~(pfix col ;~(plug sym (maybe args(pax paf))))) pipable(pax paf)
(stag %end ;~(pfix sem ;~(pose (stag %& dem) (stag %| sym)))) (stag %end ;~(pfix sem ;~(pose (stag %& dem) (stag %| sym))))
(stag %path (sear plex rood):(vang & pax)) (stag %path (sear plex rood):(vang & pax))
(stag %pipe pipe(pax paf))
(stag %var ;~(plug ;~(pfix tis sym) ;~(pfix ace tall:(vang & paf)))) (stag %var ;~(plug ;~(pfix tis sym) ;~(pfix ace tall:(vang & paf))))
(stag %rvar ;~(pfix ;~(plug tis tis) sym)) (stag %rvar ;~(pfix ;~(plug tis tis) sym))
(stag %hoon tall:(vang & paf)) (stag %hoon tall:(vang & paf))
@ -122,6 +134,7 @@
++ poke-txt ++ poke-txt
|= [ost=bone you=ship txt=cord] |= [ost=bone you=ship txt=cord]
^- [(list move) _+>] ^- [(list move) _+>]
=| inp=(unit span)
?: =('\\' (end 3 1 txt)) ?: =('\\' (end 3 1 txt))
?+ (rsh 3 1 txt) ?+ (rsh 3 1 txt)
:_ +>.$ :_ +>.$
@ -160,15 +173,19 @@
=+ com=(rush txt parse) =+ com=(rush txt parse)
?~ com ?~ com
[+>.$ leaf/"Clarify {(trip txt)}" ~] [+>.$ leaf/"Clarify {(trip txt)}" ~]
|- ^- [con=_+>.^$ tak=$|(~ tank) mof=(list move)]
?- -.u.com ?- -.u.com
%path %path
=. pax p.u.com =. pax p.u.com
[+>.$ leaf/"=% {(spud p.u.com)}" ~] [+>.^$ leaf/"=% {(spud p.u.com)}" ~]
:: ::
%start %start
=+ cil=(scot %ud pid) =+ cil=(scot %ud pid)
=. pid +(pid) =. pid +(pid)
:- +>.$ :- ~ =. pip ?~ inp pip (~(put by pip) u.inp cil)
=. pop ?~ inp pip (~(put by pop) cil u.inp)
=. inp ~
:- +>.^$ :- ~
:* :^ ost %pass /child/[cil]/main :* :^ ost %pass /child/[cil]/main
:+ %g %meta !> :+ %g %meta !>
:* %mess [our.hid cil imp.hid] you :* %mess [our.hid cil imp.hid] you
@ -183,11 +200,11 @@
?: ?=(%& -.p.u.com) ?: ?=(%& -.p.u.com)
=+ cil=(scot %ud p.p.u.com) =+ cil=(scot %ud p.p.u.com)
=+ cin=(trip (~(got by cub.hid) cil)) =+ cin=(trip (~(got by cub.hid) cil))
:- +>.$ :- ~ :- +>.^$ :- ~
:_ (print ost you leaf/"- :{cin}({(trip cil)})" ~) :_ (print ost you leaf/"- :{cin}({(trip cil)})" ~)
[ost %pass /child/[cil] %g %cide cil] [ost %pass /child/[cil] %g %cide cil]
=* cil p.p.u.com =* cil p.p.u.com
=- [+>.$ leaf/"-{<(lent moz)>} :{(trip cil)}" moz] =- [+>.^$ leaf/"-{<(lent moz)>} :{(trip cil)}" moz]
^= moz ^= moz
%+ murn (~(tap by cub.hid)) |= [a=span b=term] %+ murn (~(tap by cub.hid)) |= [a=span b=term]
?. =(b cil) ~ ?. =(b cil) ~
@ -195,58 +212,35 @@
[ost %pass /child/[a] %g %cide a] [ost %pass /child/[a] %g %cide a]
:: ::
%pipe %pipe
~& [%pipsqueak <p.u.com>] ~& [%pipsqueak <p.u.com> <q.u.com>]
=+ ^= por =+ cil=(scot %ud pid)
%+ roll =. pid +(pid)
|- ^- (list ,[p=mand q=(unit mand)]) =. pip ?~ inp pip (~(put by pip) u.inp cil)
?~ p.u.com ~ =. pop ?~ inp pip (~(put by pop) cil u.inp)
:- [i.p.u.com ?~(t.p.u.com ~ `i.t.p.u.com)] =. inp `cil
$(p.u.com t.p.u.com) =+ nex=$(u.com q.u.com)
=< .(pid ^pid, pip ^pip, pop ^pop) :: =. +>.^$ con.nex XX whu??
|= $: [p=mand q=(unit mand)] :+ con.nex tak.nex
mov=(list move) %- welp :_ mof.nex
pid=@u :~ :^ ost %pass /child/[cil]/main
pip=(map span span) :+ %g %meta !>
pop=(map span span) :* %mess [our.hid cil imp.hid] you
== (cat 3 p.p.u.com '-args') (run [%clsg q.p.u.com])
^- [(list move) @u (map span span) (map span span)] ==
=+ cia=(scot %ud pid) [ost %pass /child/[cil]/out %g %show [our.hid cil imp.hid] you /out]
=+ cib=(scot %ud +(pid)) [ost %pass /child/[cil] %g %sire p.p.u.com cil]
=. pid +(pid) ==
=. pip ?~(q pip (~(put by pip) cia cib))
=. pop ?~(q pop (~(put by pop) cib cia))
:_ [pid pip pop]
:^ ^- move
:^ ost %pass /child/[cia]/main
:+ %g %meta !>
:* %mess [our.hid cia imp.hid] you
(cat 3 p.p '-args') (run [%clsg q.p])
==
^- move
[ost %pass /child/[cia]/out %g %show [our.hid cia imp.hid] you /out]
^- move
[ost %pass /child/[cia] %g %sire p.p cia]
^- (list move)
mov
=. pid pid.por
=. pip pip.por
=. pop pop.por
:- +>.$ :- ~
%+ welp
mov.por
:- [ost %give %nice ~]
(print ost you leaf/"piping {<p.u.com>}" ~)
:: ::
%var %var
=. var (~(put by var) p.u.com (run q.u.com)) =. var (~(put by var) p.u.com (run q.u.com))
[+>.$ leaf/"created variable '{(trip p.u.com)}'" ~] [+>.^$ leaf/"created variable '{(trip p.u.com)}'" ~]
:: ::
%rvar %rvar
=. var (~(del by var) p.u.com) =. var (~(del by var) p.u.com)
[+>.$ leaf/"deleted variable '{(trip p.u.com)}'" ~] [+>.^$ leaf/"deleted variable '{(trip p.u.com)}'" ~]
:: ::
%hoon %hoon
[+>.$ (sell (run p.u.com)) ~] [+>.^$ (sell (run p.u.com)) ~]
== ==
:: ::
++ purr ++ purr
@ -281,6 +275,7 @@
?. ?=(?(%rust %rush) +<.sih) ~ ?. ?=(?(%rust %rush) +<.sih) ~
?: (~(has by pip) &2.pax) ?: (~(has by pip) &2.pax)
~& [%yay &2.pax <pip> <pop>] ~& [%yay &2.pax <pip> <pop>]
~& [%spamming-to /in/(~(got by pip) &2.pax) (~(get ju pus.hid) /in/(~(got by pip) &2.pax))]
(spam /in/(~(got by pip) &2.pax) %meta (slot 3 typ sih)) (spam /in/(~(got by pip) &2.pax) %meta (slot 3 typ sih))
~& [%nay &2.pax <pip> <pop>] ~& [%nay &2.pax <pip> <pop>]
%^ print-vase ost our.hid %^ print-vase ost our.hid

2
main/app/terminal/core.hook
View File

@ -235,7 +235,7 @@
++ pour ++ pour
|= [ost=bone pax=path sih=*] |= [ost=bone pax=path sih=*]
^- [(list move) _+>] ^- [(list move) _+>]
=+ sih=;;(sign sih) :: XX gall types =+ sih=((hard sign) sih)
?: ?=(%veer +<.sih) :: vomit ?: ?=(%veer +<.sih) :: vomit
[[ost %give +.sih]~ +>.$] [[ost %give +.sih]~ +>.$]
?: ?=(%vega +<.sih) :: vomit ?: ?=(%vega +<.sih) :: vomit