mirror of
https://github.com/urbit/shrub.git
synced 2024-12-15 21:03:10 +03:00
Merge branch 'nobreach' into test
This commit is contained in:
commit
2ba55308fd
@ -119,6 +119,7 @@
|
|||||||
?~(b [%brev a] [[%verb a] u.b])
|
?~(b [%brev a] [[%verb a] u.b])
|
||||||
::
|
::
|
||||||
++ dp-command :: ++dojo-command
|
++ dp-command :: ++dojo-command
|
||||||
|
:: =< ;~(less |-(;~(pose (jest '|*') ;~(pfix next (knee ** |.(^$))))) .)
|
||||||
%+ knee *dojo-command |. ~+
|
%+ knee *dojo-command |. ~+
|
||||||
;~ pose
|
;~ pose
|
||||||
;~ pfix bar
|
;~ pfix bar
|
||||||
@ -253,9 +254,10 @@
|
|||||||
::
|
::
|
||||||
++ dy-stop :: stop work
|
++ dy-stop :: stop work
|
||||||
^+ +>
|
^+ +>
|
||||||
|
=. poy ~
|
||||||
?~ pux +>
|
?~ pux +>
|
||||||
%. [%txt "! cancel {<u.pux>}"]
|
%. [%txt "! cancel {<u.pux>}"]
|
||||||
he-diff:(he-card(poy ~) %exec u.pux our.hid ~)
|
he-diff:(he-card %exec u.pux our.hid ~)
|
||||||
::
|
::
|
||||||
++ dy-slam :: call by ford
|
++ dy-slam :: call by ford
|
||||||
|= [way=wire gat=vase sam=vase]
|
|= [way=wire gat=vase sam=vase]
|
||||||
@ -543,6 +545,7 @@
|
|||||||
?- -.act
|
?- -.act
|
||||||
%det (dy-edit +.act)
|
%det (dy-edit +.act)
|
||||||
%ret (dy-done (tufa buf.say))
|
%ret (dy-done (tufa buf.say))
|
||||||
|
%clr dy-stop
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ dy-cage |=(num=@ud (~(got by rez) num)) :: known cage
|
++ dy-cage |=(num=@ud (~(got by rez) num)) :: known cage
|
||||||
@ -710,7 +713,6 @@
|
|||||||
dy-make(cud `[nex (~(got by job) nex)])
|
dy-make(cud `[nex (~(got by job) nex)])
|
||||||
--
|
--
|
||||||
::
|
::
|
||||||
++ he-baxp |=(~ he-pine:he-stop) :: exit out of project
|
|
||||||
++ he-dope :: sole user of ++dp
|
++ he-dope :: sole user of ++dp
|
||||||
|= txt=tape ::
|
|= txt=tape ::
|
||||||
^- (each (unit (each dojo-command tape)) hair) :: prefix/result
|
^- (each (unit (each dojo-command tape)) hair) :: prefix/result
|
||||||
@ -762,7 +764,6 @@
|
|||||||
::
|
::
|
||||||
++ he-stop :: abort work
|
++ he-stop :: abort work
|
||||||
^+ .
|
^+ .
|
||||||
=. buf ""
|
|
||||||
?~(poy . ~(dy-stop dy u.poy))
|
?~(poy . ~(dy-stop dy u.poy))
|
||||||
::
|
::
|
||||||
++ he-peer :: subscribe to
|
++ he-peer :: subscribe to
|
||||||
@ -885,6 +886,7 @@
|
|||||||
?- -.act
|
?- -.act
|
||||||
%det (he-stir +.act)
|
%det (he-stir +.act)
|
||||||
%ret (he-done (tufa buf.say))
|
%ret (he-done (tufa buf.say))
|
||||||
|
%clr he-pine(buf "")
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ he-lame :: handle error
|
++ he-lame :: handle error
|
||||||
@ -939,8 +941,6 @@
|
|||||||
++ poke-sole-action
|
++ poke-sole-action
|
||||||
|= act=sole-action ~| poke/act %. act
|
|= act=sole-action ~| poke/act %. act
|
||||||
(wrap he-type):arm
|
(wrap he-type):arm
|
||||||
::
|
|
||||||
++ poke-sole-back (wrap he-baxp):arm
|
|
||||||
++ made (wrap he-made):arm
|
++ made (wrap he-made):arm
|
||||||
++ sigh-httr (wrap he-sigh):arm
|
++ sigh-httr (wrap he-sigh):arm
|
||||||
++ sigh-tang |=([a=wire b=tang] ~|(`term`(cat 3 'sigh-' -.a) (mean b)))
|
++ sigh-tang |=([a=wire b=tang] ~|(`term`(cat 3 'sigh-' -.a) (mean b)))
|
||||||
|
@ -1049,12 +1049,12 @@
|
|||||||
[%txt (weld "----------------| " (tufa buf))]
|
[%txt (weld "----------------| " (tufa buf))]
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ sh-baxp (sh-pact ~) :: clear target
|
|
||||||
++ sh-sole :: apply edit
|
++ sh-sole :: apply edit
|
||||||
|= act=sole-action
|
|= act=sole-action
|
||||||
^+ +>
|
^+ +>
|
||||||
?- -.act
|
?- -.act
|
||||||
%det (sh-stir +.act)
|
%det (sh-stir +.act)
|
||||||
|
%clr (sh-pact ~)
|
||||||
%ret sh-done
|
%ret sh-done
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
@ -1117,14 +1117,6 @@
|
|||||||
+>.$
|
+>.$
|
||||||
sh-abet:(~(sh-sole sh ~ u.shu) act)
|
sh-abet:(~(sh-sole sh ~ u.shu) act)
|
||||||
::
|
::
|
||||||
++ ra-baxp
|
|
||||||
^+ ..ra-baxp
|
|
||||||
=+ shu=(~(get by shells) ost.hid)
|
|
||||||
?~ shu
|
|
||||||
~& [%ra-console-broken ost.hid]
|
|
||||||
..ra-baxp
|
|
||||||
sh-abet:~(sh-baxp sh ~ u.shu)
|
|
||||||
::
|
|
||||||
++ ra-emil :: ra-emit move list
|
++ ra-emil :: ra-emit move list
|
||||||
|= mol=(list move)
|
|= mol=(list move)
|
||||||
%_(+> moves (welp (flop mol) moves))
|
%_(+> moves (welp (flop mol) moves))
|
||||||
@ -1916,7 +1908,6 @@
|
|||||||
|= [act=sole-action]
|
|= [act=sole-action]
|
||||||
ra-abet:(ra-sole:ra act)
|
ra-abet:(ra-sole:ra act)
|
||||||
::
|
::
|
||||||
++ poke-sole-back |=(~ ra-abet:ra-baxp:ra) :: SOL backspace
|
|
||||||
++ diff-talk-report ::
|
++ diff-talk-report ::
|
||||||
|= [way=wire rad=report]
|
|= [way=wire rad=report]
|
||||||
^- (quip move +>)
|
^- (quip move +>)
|
||||||
|
@ -134,7 +134,6 @@
|
|||||||
=> |% :: arvo structures
|
=> |% :: arvo structures
|
||||||
++ pear :: request
|
++ pear :: request
|
||||||
$% [%sole-action p=sole-action] ::
|
$% [%sole-action p=sole-action] ::
|
||||||
[%sole-back ~] :: back out of dialog
|
|
||||||
[%talk-command command:talk] ::
|
[%talk-command command:talk] ::
|
||||||
== ::
|
== ::
|
||||||
++ lime :: update
|
++ lime :: update
|
||||||
@ -615,7 +614,7 @@
|
|||||||
ta-bel
|
ta-bel
|
||||||
.(str.u.ris (scag (dec (lent str.u.ris)) str.u.ris))
|
.(str.u.ris (scag (dec (lent str.u.ris)) str.u.ris))
|
||||||
?: =(0 pos.inp)
|
?: =(0 pos.inp)
|
||||||
(ta-poke %sole-back ~)
|
(ta-act %clr ~)
|
||||||
:: .(+> (se-blit %bel ~))
|
:: .(+> (se-blit %bel ~))
|
||||||
=+ pre=(dec pos.inp)
|
=+ pre=(dec pos.inp)
|
||||||
(ta-hom(pos.inp pre) %del pre)
|
(ta-hom(pos.inp pre) %del pre)
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
::
|
|
||||||
:::: /hoon/back/sole/mar
|
|
||||||
::
|
|
||||||
!:
|
|
||||||
|_ ~
|
|
||||||
++ grab
|
|
||||||
|% ++ noun ,~
|
|
||||||
--
|
|
||||||
--
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
|||||||
$% :: [%abo ~] :: reset interaction
|
$% :: [%abo ~] :: reset interaction
|
||||||
[%det sole-change] :: command line edit
|
[%det sole-change] :: command line edit
|
||||||
[%ret ~] :: submit and clear
|
[%ret ~] :: submit and clear
|
||||||
|
[%clr ~] :: exit context
|
||||||
== ::
|
== ::
|
||||||
++ sole-buffer (list ,@c) :: command state
|
++ sole-buffer (list ,@c) :: command state
|
||||||
++ sole-change :: network change
|
++ sole-change :: network change
|
||||||
|
Loading…
Reference in New Issue
Block a user