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

Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach

Browse Source 
Conflicts:
	Makefile
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-06-09 13:09:50 -07:00
commit 47db363c25
5 changed files with 74 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arvo/ames.hoon
View File

@ -1123,7 +1123,6 @@
++ done :: done:ho:um:am ++ done :: done:ho:um:am
|= [cha=path num=@ud] :: complete outgoing |= [cha=path num=@ud] :: complete outgoing
^- [(unit duct) _+>] ^- [(unit duct) _+>]
~? =(~wicwyc-sitlyr her) [%done cha num]
=+ rol=(need (~(get by ryl.bah) cha)) =+ rol=(need (~(get by ryl.bah) cha))
=+ rix=(~(get by san.rol) num) =+ rix=(~(get by san.rol) num)
?~ rix [~ +>.$] ?~ rix [~ +>.$]

11
arvo/batz.hoon
View File

@ -27,6 +27,8 @@
++ kiss :: in request ->$ ++ kiss :: in request ->$
$% [%crud p=@tas q=(list tank)] :: error with trace $% [%crud p=@tas q=(list tank)] :: error with trace
[%hail ~] :: refresh [%hail ~] :: refresh
[%hook ~] :: this term hung up
[%harm ~] :: all terms hung up
[%init p=@p] :: report install [%init p=@p] :: report install
[%kill p=~] :: kill a task [%kill p=~] :: kill a task
[%line p=@t] :: source line [%line p=@t] :: source line
@ -269,6 +271,8 @@
?- -.kyz ?- -.kyz
%crud [[[hen [%slip %d %flog kyz]] ~] +<.^^$] %crud [[[hen [%slip %d %flog kyz]] ~] +<.^^$]
%hail [[[hen [%give %helo prot]] ~] +<.^^$] %hail [[[hen [%give %helo prot]] ~] +<.^^$]
%harm ~&(%batz-harm [~ +<.^^$])
%hook ~&(%batz-hook [~ +<.^^$])
%line =+ gyp=?>(?=(^ fog) i.fog) %line =+ gyp=?>(?=(^ fog) i.fog)
?: &(=(0 gyp) =(%$ p.kyz)) $(kyz [%hail ~]) ?: &(=(0 gyp) =(%$ p.kyz)) $(kyz [%hail ~])
=< abet =< abet
@ -276,8 +280,11 @@
lash:(gill:(fist hen) p.kyz) lash:(gill:(fist hen) p.kyz)
lash:(como:(fest gyp hen) p.kyz) lash:(como:(fest gyp hen) p.kyz)
%kill =+ gyp=?>(?=(^ fog) i.fog) %kill =+ gyp=?>(?=(^ fog) i.fog)
?: =(0 gyp) [[[hen [%give %logo ~]] ~] +<.^^$] ?. =(0 gyp)
abet:kill:(fest gyp hen) abet:kill:(fest gyp hen)
?: =(~[/gold/term/1] ?>(?=(^ hen) t.hen)) :: XX gross
[[[hen [%give %logo ~]] ~] +<.^^$]
[~ +<.^^$]
%ling ?> ?=(^ fog) %ling ?> ?=(^ fog)
=> .(fog (weld t.fog `(list ,@ud)`[i.fog ~])) => .(fog (weld t.fog `(list ,@ud)`[i.fog ~]))
[[[hen [%give %helo prot]] ~] +<.^^$] [[[hen [%give %helo prot]] ~] +<.^^$]

73
arvo/dill.hoon
View File

@ -1,8 +1,8 @@
:: !:
:: dill (4d), terminal handling :: dill (4d), terminal handling
:: ::
|= pit=vase |= pit=vase
=> |% => |% :: interface tiles
++ gift :: out result <-$ ++ gift :: out result <-$
$% [%bbye ~] :: reset prompt $% [%bbye ~] :: reset prompt
[%blit p=(list blit)] :: terminal output [%blit p=(list blit)] :: terminal output
@ -20,10 +20,11 @@
[%crud p=@tas q=(list tank)] :: error with trace [%crud p=@tas q=(list tank)] :: error with trace
[%flog p=flog] :: wrapped error [%flog p=flog] :: wrapped error
[%hail ~] :: terminal refresh [%hail ~] :: terminal refresh
[%hook ~] :: this term hung up
[%harm ~] :: all terms hung up
[%noop ~] :: no operation [%noop ~] :: no operation
[%talk p=tank] :: [%talk p=tank] ::
[%text p=tape] :: [%text p=tape] ::
[%wipe ~] :: clear terminal
== :: == ::
++ flog :: sent to %dill ++ flog :: sent to %dill
$% [%crud p=@tas q=(list tank)] :: $% [%crud p=@tas q=(list tank)] ::
@ -33,6 +34,8 @@
++ note :: out request $-> ++ note :: out request $->
$% [%crud p=@tas q=(list tank)] :: to %dill $% [%crud p=@tas q=(list tank)] :: to %dill
[%hail ~] :: to %batz [%hail ~] :: to %batz
[%harm ~] :: to %batz
[%hook ~] :: to %batz
[%kill p=~] :: to %batz [%kill p=~] :: to %batz
[%line p=@t] :: to %batz [%line p=@t] :: to %batz
[%ling ~] :: to %batz [%ling ~] :: to %batz
@ -57,11 +60,56 @@
[%vega p=path] :: by %batz [%vega p=path] :: by %batz
[%warn p=tape] :: by %batz [%warn p=tape] :: by %batz
== ==
:::::::: :: dill tiles
++ bein :: terminal control
$: $: bul=@ud :: buffer length
bus=@ud :: cursor in buffer
but=(list ,@c) :: buffer text
buy=prom :: input style
== ::
$: hiz=@ud :: history depth
hux=path :: history path
hym=(map ,@ud (list ,@c)) :: history overlay
hyt=hist :: history object
hyr=(unit (list ,@c)) :: history search
== ::
$: pol=@ud :: length of prompt
pot=tape :: prompt text
== ::
== ::
++ blew ,[p=@ud q=@ud] :: columns rows
++ belt :: raw console input
$% [%aro p=?(%d %l %r %u)] :: arrow key
[%bac ~] :: true backspace
[%ctl p=@ud] :: control-key
[%del ~] :: true delete
[%met p=@ud] :: meta-key
[%ret ~] :: return
[%txt p=(list ,@c)] :: utf32 text
== ::
++ blit :: raw console output
$% [%bel ~] :: make a noise
[%clr ~] :: clear the screen
[%hop p=@ud] :: set cursor position
[%lin p=(list ,@c)] :: set current line
[%mor ~] :: newline
[%sav p=path q=@] :: save to file
== ::
++ blot :: kill ring
$: p=@ud :: length
q=@ud :: depth
r=(list (list ,@c)) :: kills
== ::
++ blur ,[p=@ud q=(unit bein) r=blot] :: columns, prompt
++ yard :: terminal state
$: p=? :: verbose
q=blur :: display state
r=(map path hist) :: history
== ::
-- => -- =>
|% |%
++ dy ++ dy
|= [hen=duct dug=(map duct yard)] |= [hen=duct dug=(map duct yard)]
=+ wip=|
=+ ^= yar ^- yard =+ ^= yar ^- yard
=+ yur=(~(get by dug) hen) =+ yur=(~(get by dug) hen)
?^ yur u.yur ?^ yur u.yur
@ -487,17 +535,26 @@
:: ::
%hail :: refresh %hail :: refresh
+>.$(mos :_(mos [hen %toss %b ~ kyz])) +>.$(mos :_(mos [hen %toss %b ~ kyz]))
::
%harm :: all terms hung up
=+ nug=((map duct yard) [[hen (~(get by dug) hen)] ~ ~])
^+ +>.$
%= +>.$
dug nug
mos :_(mos [hen %toss %b ~ kyz])
==
::
%hook :: this term hung up
+>.$(dug (~(del by dug) hen), mos :_(mos [hen %toss %b ~ kyz]))
:: ::
%talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output %talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output
%text $(kyz [%talk %leaf p.kyz]) :: simple message %text $(kyz [%talk %leaf p.kyz]) :: simple message
::
%wipe +>.$(wip &) :: delete old
== ==
:: ::
++ yerk :: complete core ++ yerk :: complete core
^- [p=(list move) q=(map duct yard)] ^- [p=(list move) q=(map duct yard)]
:- (flop mos) :- (flop mos)
?.(wip (~(put by dug) hen yar) (~(del by dug) hen)) (~(put by dug) hen yar)
-- --
-- --
=| $: %0 :: =| $: %0 ::
@ -540,7 +597,7 @@
++ scry ++ scry
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit (pair lode ,*))) ^- (unit (unit (pair lode ,*)))
~ [~ ~ [%tank >dug<]]
:: ::
++ stay [%0 dug] ++ stay [%0 dug]
++ take :: process move ++ take :: process move

45
arvo/zuse.hoon
View File

@ -2023,22 +2023,6 @@
raz=(map path race) :: statements inbound raz=(map path race) :: statements inbound
ryl=(map path rill) :: statements outbound ryl=(map path rill) :: statements outbound
== :: == ::
++ bein :: terminal control
$: $: bul=@ud :: buffer length
bus=@ud :: cursor in buffer
but=(list ,@c) :: buffer text
buy=prom :: input style
== ::
$: hiz=@ud :: history depth
hux=path :: history path
hym=(map ,@ud (list ,@c)) :: history overlay
hyt=hist :: history object
hyr=(unit (list ,@c)) :: history search
== ::
$: pol=@ud :: length of prompt
pot=tape :: prompt text
== ::
== ::
++ bead ,[p=(set beam) q=cage] :: computed result ++ bead ,[p=(set beam) q=cage] :: computed result
++ beam ,[[p=ship q=desk r=case] s=path] :: global name ++ beam ,[[p=ship q=desk r=case] s=path] :: global name
++ beak ,[p=ship q=desk r=case] :: garnish with beak ++ beak ,[p=ship q=desk r=case] :: garnish with beak
@ -2049,30 +2033,6 @@
lys=@da :: last sent lys=@da :: last sent
pac=rock :: packet data pac=rock :: packet data
== :: == ::
++ belt :: raw console input
$% [%aro p=?(%d %l %r %u)] :: arrow key
[%bac ~] :: true backspace
[%ctl p=@ud] :: control-key
[%del ~] :: true delete
[%met p=@ud] :: meta-key
[%ret ~] :: return
[%txt p=(list ,@c)] :: utf32 text
== ::
++ blew ,[p=@ud q=@ud] :: columns rows
++ blit :: raw console output
$% [%bel ~] :: make a noise
[%clr ~] :: clear the screen
[%hop p=@ud] :: set cursor position
[%lin p=(list ,@c)] :: set current line
[%mor ~] :: newline
[%sav p=path q=@] :: save to file
== ::
++ blot :: kill ring
$: p=@ud :: length
q=@ud :: depth
r=(list (list ,@c)) :: kills
== ::
++ blur ,[p=@ud q=(unit bein) r=blot] :: columns, prompt
++ boat ,[(list slip) tart] :: user stage ++ boat ,[(list slip) tart] :: user stage
++ boon :: fort output ++ boon :: fort output
$% [%beer p=ship q=@uvG] :: gained ownership $% [%beer p=ship q=@uvG] :: gained ownership
@ -2530,9 +2490,4 @@
++ wund (list ,[p=life q=ring r=acru]) :: mace in action ++ wund (list ,[p=life q=ring r=acru]) :: mace in action
++ will (list deed) :: certificate ++ will (list deed) :: certificate
++ worm ,* :: vase of tart ++ worm ,* :: vase of tart
++ yard :: terminal state
$: p=? :: verbose
q=blur :: display state
r=(map path hist) :: history
== ::
-- --

8
main/bin/tach.hoon
View File

@ -1,8 +0,0 @@
::
:: /=main=/bin/tach/hoon
::
|= *
|= ~
^- bowl
:_ ~ :_ ~
[%la %leaf "you probably meant to run :chat."]