mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-22 07:59:22 +03:00
Merge branch 'dish' of https://github.com/urbit/urbit into dish
This commit is contained in:
commit
fa0aac2a5c
@ -114,7 +114,8 @@
|
||||
[%res p=span] ::
|
||||
[%cmd p=char] ::
|
||||
== == ::
|
||||
++ term-line ,[p=cord q=(list cord) r=(list tank)] ::
|
||||
++ term-line ,[p=cord q=(list cord) r=(list tark)] ::
|
||||
++ tark ?(tank [%stem p=tank q=tank]) ::
|
||||
:::::::: :: dill tiles
|
||||
++ bein :: terminal control
|
||||
$: $: bul=@ud :: buffer length
|
||||
@ -362,7 +363,13 @@
|
||||
%note ?.(p.yar +>.$ (fume p.+.sih q.+.sih)) :: debug message
|
||||
?(%rush %rust) :: XX reset prompt
|
||||
?> ?=(%term-line +>-.sih)
|
||||
=. +>.$ (furl (zing (turn r.q.sih |=(a=tank (~(win re a) 0 p.q.yar)))))
|
||||
=. +>.$
|
||||
=- (furl (zing (turn r.q.sih -)))
|
||||
|= a=tark
|
||||
^- wall
|
||||
?+ -.a (~(win re a) 0 p.q.yar)
|
||||
%stem ~[~(ram re p.a) ~(ram re p.a)]
|
||||
==
|
||||
%- edit
|
||||
=| bed=bein
|
||||
=+ ^= hyt ^- hist
|
||||
|
@ -3258,8 +3258,6 @@
|
||||
|=(a=tape (rap 3 ^-((list ,@) a)))
|
||||
(star ;~(pose nud low hep dot sig))
|
||||
++ voy ;~(pfix bas ;~(pose bas soq bix))
|
||||
++ vym (bass 256 ;~(plug low (star ;~(pose low nud))))
|
||||
++ vyn (bass 256 ;~(plug hep vym (easy ~)))
|
||||
--
|
||||
++ ag
|
||||
|%
|
||||
@ -3279,13 +3277,6 @@
|
||||
++ hex (ape (bass 0x1.0000 ;~(plug qex:ab (star ;~(pfix dog qix:ab)))))
|
||||
++ lip =+ tod=(ape ted:ab)
|
||||
(bass 256 ;~(plug tod (stun [3 3] ;~(pfix dog tod))))
|
||||
++ qut %+ ifix [soq soq]
|
||||
%+ boss 256
|
||||
%- star ;~ pose
|
||||
;~(pfix bas ;~(pose bas soq bix:ab))
|
||||
;~(less bas soq prn)
|
||||
==
|
||||
++ sym (cook |=(a=(list ,@) (rap 3 a)) ;~(plug vym:ab (star vyn:ab)))
|
||||
++ tyq (cook |=(a=(list ,@) (rap 3 a)) (plus siq:ab))
|
||||
++ viz (ape (bass 0x200.0000 ;~(plug pev:ab (star ;~(pfix dog piv:ab)))))
|
||||
++ vum (bass 32 (plus siv:ab))
|
||||
|
@ -148,7 +148,7 @@
|
||||
%line :: command entered
|
||||
=. r.tel
|
||||
:_ r.tel
|
||||
rose/[~ ~ ~]^~[leaf/(trip p.tel) leaf/(trip p.jof)]
|
||||
stem/[leaf/(trip p.tel) leaf/(trip p.jof)]
|
||||
=. hiz (~(put by hiz) pax tel)
|
||||
?: =('\\' (end 3 1 p.jof))
|
||||
$(jof [%cmd (rsh 3 1 p.jof)])
|
||||
|
@ -35,7 +35,7 @@ $(function() {
|
||||
if(e.shiftKey) return true
|
||||
v = prom.val().replace(/\xa0/g, ' ')
|
||||
$(cont).append($('<b>').html(prem.innerHTML),
|
||||
$('<span>').text(v))
|
||||
$('<div class="prom">').text(v))
|
||||
|
||||
jpok('line', v)
|
||||
hist.unshift(v)
|
||||
@ -90,8 +90,7 @@ $(function() {
|
||||
$(cont).append($('<div>').text(lom))
|
||||
else {
|
||||
$(cont).append($('<b>').text(lom.prompt),
|
||||
$('<span>').text(lom.task),
|
||||
$('<br>'))
|
||||
$('<div class="prom">').text(lom.task))
|
||||
}
|
||||
}
|
||||
window.scrollTo(0,document.body.scrollHeight)
|
||||
|
@ -26,9 +26,11 @@ button {
|
||||
background-color: #fff;
|
||||
padding: 1rem;
|
||||
}
|
||||
#prom-cont {
|
||||
#prom-cont,
|
||||
.prom {
|
||||
display: block;
|
||||
position:relative;
|
||||
left: 1rem;
|
||||
}
|
||||
textarea,
|
||||
#prom-size {
|
||||
|
@ -18,10 +18,10 @@
|
||||
[%history %a (turn q.tel |=(a=cord [%s a]))]
|
||||
:+ %lines %a
|
||||
%- zing ^- (list (list ^json))
|
||||
%+ turn (flop r.tel) |= a=tank
|
||||
?. ?=([%rose [[%'>' %' ' ~] ~ ~] [%leaf *] [%leaf *] ~] a)
|
||||
%+ turn (flop r.tel) |= a=?(tank [%stem p=tank q=tank])
|
||||
?. ?=(%stem -.a)
|
||||
(turn (wash 0^80 a) jape)
|
||||
[(jobe prompt/(jape p.i.q.a) task/(jape p.i.t.q.a) ~)]~
|
||||
[(jobe prompt/(jape ~(ram re p.a)) task/(jape ~(ram re q.a)) ~)]~
|
||||
==
|
||||
--
|
||||
--
|
||||
|
@ -1 +1 @@
|
||||
,[p=cord q=(list cord) r=(list tank)]
|
||||
,[p=cord q=(list cord) r=(list ?(tank [%stem p=tank q=tank]))]
|
||||
|
Loading…
Reference in New Issue
Block a user