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

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

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2015-01-19 14:05:12 -08:00
commit d8da2f2828
21 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arvo/gall.hoon
View File

@ -1008,8 +1008,8 @@
::
++ said :: sayz, done wrong
|= vud=vase
:: =- [p.fob (weld (flop q.fob) mow)]
:: ^= fob
=- [p.fob (weld (flop q.fob) mow)]
^= fob
|- ^- (pair (list toil) (list move))
?: =(~ q.vud) [~ ~]
=+ sud=(sump (slot 2 vud))

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

@ -4,7 +4,7 @@
$% [%went p=ship q=cape]
[%init p=@p]
== == ==
++ began-args ,[his=@p tic=@p eny=@t ges=gens]
++ began-args ,[his=@p tic=@p eny=@t ges=gens ~]
--
::
!:

4
main/app/begin/core.hook
View File

@ -27,7 +27,7 @@
:* :* ost %pass /to-gan %g %mess [our.hid /began] our.hid
%began-args !>([his tic eny ges])
==
(spam %rush %prompt "[waiting...]" %text '')
(spam %rush %prompt '[waiting...]' %text '')
==
::
++ loon
@ -383,7 +383,7 @@
==
::
++ poke-begin-args
|= [ost=bone you=ship arg=?(~ [his=ship ~])]
|= [ost=bone you=ship arg=$|(~ [his=ship ~])]
=^ res +>.$
^- [[pot=(unit ,[cord prom cord]) tak=(list cord)] _+>.$]
?~ arg

4
main/app/cat/core.hook
View File

@ -12,10 +12,10 @@
++ poke--args
%+ args-into-gate .
|= [arg=(list path)]
=- tang/(flop `(list tank)`(zing -))
=- tang/(zing -)
%+ turn arg
|= pax=path
^- (list tank)
^- tang
=+ ark=;;(arch .^(%cy pax))
?^ q.ark
:- leaf/(spud pax)

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

@ -31,7 +31,7 @@
%nice
[ost %give %nice ~]~
%rush
%+ weld (spam %rush %prompt 'searching for {<arg>}...')
%+ weld (spam %rush %prompt 'searching for {<arg>}...' %text ~)
%- spam
?- &3.sih
%txt

7
main/app/hi/core.hook
View File

@ -40,10 +40,7 @@
|= [ost=bone pax=path sih=sign]
?> ?=([%hi @t ~] pax)
%. +<
%- add-exit
%^ add-output +>.$
=+ ack=?+(+<.sih "unsuccesful" %nice "succesful")
rush/tang/[leaf/"hi {(trip i.t.pax)} {ack}"]~
,_`+>.$
=+ ack=?+(+<.sih "unsuccesful" %nice "succesful")
(add-exit (print +>.$ "hi {(trip i.t.pax)} {ack}"))
::
--

1
main/app/pope/core.hook
View File

@ -41,7 +41,6 @@
%t =- %.(+<.$ (add-exit (return tang/-)))
=+ bur=(shax (add who (shax fra)))
=+ arc=(cryp 2.048 bur)
%- flop ^- (list tank)
:~ leaf/"generator: {(scow %uw bur)}"
leaf/"fingerprint: {(scow %uw fig:ex:arc)}"
== ==

1
main/app/reboot/core.hook
View File

@ -17,7 +17,6 @@
:_ |= [tip=@tasD nam=@tas]
=+ pax=[(scot %p our.hid) %arvo (scot %da lat.hid) nam %hoon ~]
[%veer tip pax (,@ .^(%cx pax))]
%- flop
^- (list ,[p=@tas q=@tas])
:~ [%$ %zuse]
[%a %ames]

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

@ -13,7 +13,7 @@
rush/tang/[leaf/"done"]~
%+ args-into-resp .
|= all=(list ,@tas)
%+ turn (flop all)
%+ turn all
=+ ark=(arch .^(%cy /(scot %p our.hid)/arvo/(scot %da lat.hid)))
=+ van=(~(tap by r.ark))
|= nam=@tas

7
main/app/reset/core.hook
View File

@ -8,11 +8,10 @@
|= [ost=bone you=ship arg=$|(~ [_| ~])]
:_ +>.$
=+ top=`path`/(scot %p our.hid)/arvo/(scot %da lat.hid)
:+ [ost %give %nice ~]
[ost %pass ?~(arg /refresh /) %t %wait lat.hid]
%- welp :_ [ost %give %vega (weld top `path`/hoon)]~
:^ [ost %give %nice ~]
[ost %pass ?~(arg /refresh /) %t %wait lat.hid]
[ost %give %vega (weld top `path`/hoon)]
%+ turn
%- flop
^- (list ,[p=@tas q=@tas])
:~ [%$ %zuse]
[%a %ames]

3
main/app/rodeo/core.hook
View File

@ -91,8 +91,7 @@
|_ [ost=bone moves=(list move)]
++ ra-abet :: resolve core
^- [(list move) _+>]
:: [(flop moves) +>] :: XX return when order is correct
[moves +>]
[(flop moves) +>]
::
++ ra-emil :: ra-emit move list
|= mol=(list move)

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

@ -142,7 +142,7 @@
::
--
--
::
!:
:::: per event
::
|%
@ -157,7 +157,7 @@
::
++ blab
|= mof=(list move)
+>.$(mow (welp mof mow))
+>.$(mow (welp (flop mof) mow))
::
++ chew-file
|= [paf=path mor=$|(cord toro)]
@ -283,15 +283,16 @@
|.
=> a
=+ cil=(scot %ud pid)
%_ +>
pid +(pid)
=: pid +(pid)
pip ?~ inp pip (~(put by pip) cil u.inp)
pop ?~ inp pop (~(put by pop) u.inp cil)
inp `cil
mow
==
%_ +>
..blab
%- blab
=+ yon=[our.hid cil imp.hid]
=+ mez=[(cat 3 p.app '-args') (exec [%clsg q.app])]
%- welp :_ mow
^- (list move)
:~ [ost %pass /child/[cil]/fork %g %sire p.app cil]
[ost %pass /child/[cil]/out %g %show yon you /out]
@ -364,7 +365,7 @@
=. act `p.gal
(blab ping)
::
++ ping (print-vase !>(*(list tank)))
++ ping (print-vase !>(*tang))
++ poke-kyev
|= [you=ship key=kyev]
^+ +>
@ -383,7 +384,7 @@
%g =+ =- tak=rose/[" " "[" "]"]^(turn cubs -)
|= a=span
leaf/(trip (rap 3 (~(got by cub.hid) a) '(' a ')' ~))
(blab [ost give/nice/~] (print tak))
(blab [ost %give %nice ~] (print tak))
%x =. +>.$ next-act
(blab [ost %give %nice ~] ping)
==
@ -413,9 +414,9 @@
(spam /active/[u.act] %rush %type tiv)
(blab [ost %give %nice ~] ~)
::
++ print |=(a=tank (print-vase !>(`(list tank)`[a ~])))
++ print |=(a=tank (print-vase !>(`tang`[a ~])))
++ print-vase
|= tan=vase :: [p=p:!>(*(list tank)) q=*]
|= tan=vase :: [p=p:!>(*tang) q=*]
^- (list move)
%^ spam /out %meta
:(slop !>(%rush) !>(%term-line) !>(prompt) !>(~) tan)
@ -459,7 +460,7 @@
%- print-vase
?+ p.sih
!>([(sell (slot 15 [typ sih]))]~)
%tang (slot 15 [typ sih])
%tang (slam !>(flop) p:!>(*tang) q.sih)
%txt
?^ q.sih !! :: move to vase space?
!>([leaf/(trip q.sih)]~)

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

@ -12,5 +12,5 @@
%+ gate-bang
|= [syd=@tas her=@p sud=@tas ~]
[%c %font our.hid syd her sud]
(args-into-gate . ,_[%txt 'synced'])
(print . "synced")
--

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

@ -75,6 +75,7 @@
::
++ start-shell
|= [our=ship imp=path ost=bone you=ship pax=path]
%- flop
^- (list move)
=+ auc=(pack aut pax)
:- [ost %pass [%fork pax] %g %sire [aut auc]]
@ -138,9 +139,9 @@
r.tel :_(r.tel leaf/"+ {(trip auc)}")
mow
;: welp
(spam tel)
[ost %give %nice ~]~
(start-shell our.hid imp.hid ost you pax)
[ost %give %nice ~]~
(spam tel)
mow
==
==

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

@ -16,7 +16,7 @@
%earl (bex 32)
==
:- %tang
|- ^- (list tank)
|- ^- tang
?: ?=(0 n) ~
=+ tic=/(scot %p our.hid)/tick/(scot %da lat.hid)/(scot %p her)
:- leaf/"{<her>}: {<(,@p .^(%a tic))>}"

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

@ -14,7 +14,7 @@
=+ len=(lent pax)
=+ rend=?^(fla dank:ut |=(a=path (dank:ut (slag len a))))
:- %tang
|- ^- (list tank)
|- ^- tang
=+ ark=;;(arch .^(cy/pax))
=- ?~ q.ark -
[(rend pax) -]

4
main/app/type/core.hook
View File

@ -11,8 +11,8 @@
++ pock--args
%+ args-into-gate .
|= a=vase
:- %tang %- flop
|- ^- (list tank)
:- %tang
|- ^- tang
=+ nex=(slew 3 a)
?~ nex ~
[(skol p:(slot 2 a)) $(a u.nex)]

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

@ -12,5 +12,5 @@
%+ gate-bang
|= [syd=@tas her=@p sud=@tas ~]
[%c %plug our.hid syd her sud]
(args-into-gate . ,_[%txt 'unsynced'])
(print . "unsynced")
--

13
main/app/ye/core.hook
View File

@ -26,22 +26,17 @@
|= [tex=tape ~]
=+ mez=(crip "{<our.hid>}: {tex}")
[%a %want [our.hid (sein our.hid)] /q/ye mez]
%+ add-resp [%give %nice ~]
,_`.
(add-nice ,_`.)
::
++ poke-txt
%+ add-resp [%give %nice ~]
%+ gate-bang |=(cor=@t [%d %flog `flog`[%text "> {(trip cor)}"]])
,_`.
(add-nice ,_`.)
::
++ pour
|= [ost=bone pax=path sih=sign]
?> ?=([%bang ~] pax)
%. +<
%- add-exit
%^ add-output +>.$
=+ ack=?+(q.sih "failed" %good "recieved")
rush/tang/[leaf/"ye {ack}"]~
,_`+>.$
=+ ack=?+(q.sih "failed" %good "recieved")
(add-exit (print +>.$ "ye {ack}"))
::
--

4
main/lib/sh-utils/core.hook
View File

@ -74,6 +74,10 @@
|* [ost=bone * arg=_+<.gat]
((add-output con (gat arg) ref) +<)
::
++ print
|* [con=[* [hide *] *] tap=tape]
(add-output con [%rush %tang [%leaf tap] ~] ,_[~ con])
::
++ verify :: type-check with context and move
|* [con=^ mof=[@ *]]
|* ref=_,[(list ,_mof) _con]

4
try/readme.md
View File

@ -1,3 +1,3 @@
/=main=/try/
/=try=/
This is the try desk. Feel free to try out whatever you want here.
This is the try desk. Feel free to try out whatever you want here.