Improved eyre/gall integration.

This commit is contained in:
C. Guy Yarvin 2014-06-01 14:07:13 -07:00
parent 08400bbefb
commit ea54293ee2
5 changed files with 82 additions and 69 deletions

View File

@ -33,7 +33,7 @@
+>(mos [[hen [%give %blit (flop wab)]] mos])
::
++ wod :: word forward
|= bed=bean
|= bed=bein
^- @ud
?: =(bul.bed bus.bed)
bus.bed
@ -48,7 +48,7 @@
$(bus.bed +(bus.bed))
::
++ wob :: word backward
|= bed=bean
|= bed=bein
^- @ud
?: =(0 bus.bed)
bus.bed
@ -63,7 +63,7 @@
$(bus.bed (dec bus.bed))
::
++ edit :: change the bed
|= bed=bean
|= bed=bein
^+ +>
=. q.q.yar [~ bed]
?> ?=(^ q.q.yar)
@ -388,7 +388,7 @@
::
%helo :: trigger prompt
%- edit
=| bed=bean
=| bed=bein
=+ ^= hyt ^- hist
=+ hyt=(~(get by r.yar) p.fav)
?~(hyt *hist u.hyt)

View File

@ -442,13 +442,13 @@
==
::
++ hoth :: simple app request
|= [our=ship num=@ud ses=hole app=term pax=path]
|= [our=ship num=@ud ses=hole app=term hop=hope]
%_ +>
mow
:_ mow
:^ hen %toss %g
:- [%hoth (scot %p our) ses (scot %ud num) ~]
[%show [our app] ~ `(unit plan)``[%x [now `~0s] pax]]
[%show [our app] ~ hop]
==
::
++ hork :: remote request
@ -854,7 +854,7 @@
^- (unit seam)
?> ?=(^ fur)
?> ?=(^ paw)
`[%aps u.fur i.paw t.paw]
`[%apg u.fur i.paw t.paw]
::
++ flea :: permissive decimal
|= txt=@t
@ -1449,9 +1449,14 @@
%way [[~ pip] +>.$]
%new
?- -.som.pip
%aps :: XX a mere stub
%apg :: XX a mere stub
:- [~ pip(pez %way)]
+>.$(..ya (hoth our num ses p.som.pip r.som.pip))
+>.$(..ya (hoth our num ses p.som.pip %& r.som.pip))
::
%apl !!
%apm !!
%aps !!
%apu !!
::
%con
:_ +>.$
@ -1559,7 +1564,9 @@
;
; if(e.keyCode == 69 && ctrl == true) {
; console.log('^e')
; $input[0].selectionStart = $input[0].selectionEnd = $input.val().length
; $input[0].selectionStart =
; $input[0].selectionEnd =
; $input.val().length;
; return
; }
; if(e.keyCode == 65 && ctrl == true) {
@ -1591,7 +1598,8 @@
; $input.val(hist[hind])
; setTimeout(function() {
; console.log(hist[hind].length)
; $input[0].setSelectionRange(hist[hind].length,hist[hind].length)
; $input[0].setSelectionRange
; (hist[hind].length,hist[hind].length)
; }, 0)
; return;
; }

View File

@ -3,7 +3,7 @@
::::
|= pit=vase
=> =~
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: structures
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: structures
++ axle :: all %gall state
$: %0 :: state version
pol=(map ship mast) :: apps by ship
@ -11,24 +11,31 @@
++ bone ,@ud :: opaque duct
++ gift :: out result <-$
$% [%back p=?] :: %mess ack good/bad
[%bock p=path q=?] :: %show on/off
[%bust ~] :: reset duct
[%crud p=(list tank)] :: error
[%meta p=vase] :: application gift
[%rash p=json] :: web reaction
[%rasp p=cage] :: urbit reaction
[%rush p=@da q=json] :: web result
[%rust p=@da q=cage] :: urbit result
[%meta p=vase] :: meta-gift
== ::
++ kiss :: in request ->$
$% [%mess p=hasp q=(disk)] :: urbit message
$% [%cuff p=(unit cuff) q=kiss] :: controlled kiss
[%mesh p=hasp q=path r=json] :: web message (json)
[%mess p=hasp q=cage] :: urbit message
[%mush p=hasp q=path r=cage] :: web message (mime)
[%nuke p=hasp] :: reset this duct
:: [%puke p=(list tank) q=kiss] :: inbound error
[%user p=(unit chop) q=kiss] :: restriction
[%show p=hasp q=path r=(unit plan)] :: subscription
:: [%puke p=(list tank) q=kiss] :: kiss will fail
[%shah p=hasp q=(unit hope)] :: web subscribe
[%show p=hasp q=(unit hope)] :: urbit subscribe
[%soft p=*] :: soft kiss
== ::
++ knob :: pending action
$% [%boot ~] :: boot/reboot
[%crud p=(list tank)] :: error
[%mess p=(disk)] :: message
[%mess p=cage] :: message
[%nuke ~] :: reboot
[%show p=path q=(unit plan)] :: subscription
[%show p=(unit hope)] :: subscription
[%take p=path q=vase] :: user result
== ::
++ mast :: apps by ship
@ -39,7 +46,7 @@
++ rapt |*(a=$+(* *) (qual path path ,@da a)) :: versioned result
++ scar :: opaque duct system
$: p=@ud :: bone sequence
q=(map duct ,[p=bone q=(unit chop)]) :: by duct
q=(map duct ,[p=bone q=(unit cuff)]) :: by duct
r=(map bone duct) :: by bone
== ::
++ seat :: the living app
@ -55,20 +62,6 @@
[%ruse p=curd] :: user wrapper
[%writ p=riot] :: version result
== ::
++ suit :: application gift
$% [%back p=?] :: %mess ack good/bad
[%bock p=path q=?] :: %show on/off
[%boom ~] :: reset all ducts
[%bust ~] :: reset this duct
[%barn p=(rapt (disk))] :: %v report
[%crud p=(list tank)] :: error notification
[%dash p=(rapt null)] :: %u report
[%dish p=(rapt (disk))] :: %z report
[%diff p=(rapt (unit (disk)))] :: %w report
[%file p=(rapt (disk))] :: %x report
[%fold p=(rapt arch)] :: %y report
[%rasp p=(disk)] :: response message
== ::
++ toil (pair duct knob) :: work in progress
-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: functions
@ -83,17 +76,17 @@
all
::
++ read :: read permission
|= law=(unit chop)
|= law=(unit cuff)
^- (unit (set monk))
?~(law [~ ~] p.u.law)
::
++ ride :: all permission
|= [use=(unit (set monk)) say=(unit (set monk))]
^- (unit chop)
^- (unit cuff)
?~(say ~ `[use u.say])
::
++ rite :: write permission
|= law=(unit chop)
|= law=(unit cuff)
^- (unit (set monk))
?~(law ~ `q.u.law)
::
@ -107,9 +100,9 @@
^+ one
(~(gas by one) (~(tap by two) ~)) :: XX ugh
::
++ limp :: merge chops
|= [a=(unit chop) b=(unit chop)]
^- (unit chop)
++ limp :: merge cuffs
|= [a=(unit cuff) b=(unit cuff)]
^- (unit cuff)
?~ a b
?~ b a
:- ~
@ -135,17 +128,20 @@
++ call :: handle request
|= [hen=duct hil=(hypo kiss)]
|- ^- [p=(list move) q=_..^^$]
=+ =| law=(unit chop)
|- ^- $: law=(unit chop)
=+ =| law=(unit cuff)
|- ^- $: law=(unit cuff)
hap=hasp
kon=knob
==
?- -.q.hil
%cuff $(q.hil q.q.hil, law (limp p.q.hil law))
%mesh !!
%mess [law p.q.hil %mess q.q.hil]
%show [law p.q.hil %show q.q.hil r.q.hil]
%mush !!
%shah !!
%show [law p.q.hil %show q.q.hil]
%soft $(q.hil ((hard kiss) p.q.hil))
%nuke [law p.q.hil %nuke ~]
%user $(q.hil q.q.hil, law (limp p.q.hil law))
==
abet:work:(quem:(boar:(goat hap) hen law) kon)
::
@ -250,7 +246,7 @@
::
++ boar :: write forward
|= $: hen=duct :: cause
law=(unit chop) :: permissions
law=(unit cuff) :: permissions
==
=^ orf zam.sat
=+ orf=(~(get by q.zam.sat) hen)
@ -466,9 +462,9 @@
[(sump (slot 2 vud)) $(vud (slot 3 vud))]
::
++ show :: subscribe
|= [pax=path pul=(unit plan)] :: subscription
|= hup=(unit hope) :: subscription
^+ +>
%_(+> vey.sat (~(put to vey.sat) hen %show pax pul))
%_(+> vey.sat (~(put to vey.sat) hen %show hup))
::
++ sump
|= wec=vase
@ -540,9 +536,9 @@
~& %yawn-show
?~ huv.sat
~& [%show-none our app]
gone:(give %bock p.kon |)
gone:(give %bust ~)
%^ game [%step %peer] u.huv.sat
!>([ost use p.kon q.kon])
!>([ost use p.kon])
::
%take
~& %yawn-take

View File

@ -5156,7 +5156,7 @@
%void
[%face cog der]
::
++ bean ^-(type [%fork [%cube 0 %atom %f] [%cube 1 %atom %f]])
++ bool ^-(type [%fork [%cube 0 %atom %f] [%cube 1 %atom %f]])
++ flay
~/ %flay
|= pok=port
@ -7023,9 +7023,9 @@
[(nice %noun) [%2 q:$(gen p.gen, gol %noun) q:$(gen q.gen, gol %noun)]]
::
[%dtts *]
[(nice bean) [%5 q:$(gen p.gen, gol %noun) q:$(gen q.gen, gol %noun)]]
[(nice bool) [%5 q:$(gen p.gen, gol %noun) q:$(gen q.gen, gol %noun)]]
::
[%dtwt *] [(nice bean) [%3 q:$(gen p.gen, gol %noun)]]
[%dtwt *] [(nice bool) [%3 q:$(gen p.gen, gol %noun)]]
[%ktbr *] =+(vat=$(gen p.gen) [(wrap(sut p.vat) %iron) q.vat])
[%ktls *]
=+(hif=(nice (play p.gen)) [hif q:$(gen q.gen, gol hif)])
@ -7058,7 +7058,7 @@
$(gen r.gen, sut (busk p.gen q.gen))
::
[%wtcl *]
=+ nor=$(gen p.gen, gol bean)
=+ nor=$(gen p.gen, gol bool)
=+ fex=(gain p.gen)
=+ wux=(lose p.gen)
=+ ^= duy
@ -7070,7 +7070,7 @@
[(fork p.hiq p.ran) (cond duy q.hiq q.ran)]
::
[%wtts *]
:- (nice bean)
:- (nice bool)
%- fish(sut (play ~(bunt al p.gen)))
(cove q:$(gen [%cnzz q.gen], gol %noun))
::
@ -7184,9 +7184,9 @@
=+([$(gen p.gen, gol %noun) $(gen q.gen, gol %noun)] (both %noun))
::
[%dtts *]
=+([$(gen p.gen, gol %noun) $(gen q.gen, gol %noun)] (both bean))
=+([$(gen p.gen, gol %noun) $(gen q.gen, gol %noun)] (both bool))
::
[%dtwt *] =+($(gen p.gen, gol %noun) (both bean)) :: XX =|
[%dtwt *] =+($(gen p.gen, gol %noun) (both bool)) :: XX =|
[%ktbr *]
=+(vat=$(gen p.gen) [(wrap(sut p.vat) %iron) (wrap(sut q.vat) %iron)])
::
@ -7218,7 +7218,7 @@
==
::
[%wtcl *]
=+ nor=$(gen p.gen, gol bean)
=+ nor=$(gen p.gen, gol bool)
=+ ^= hiq ^- [p=type q=type]
=+ fex=[p=(gain p.gen) q=(gain(sut dox) p.gen)]
?: =(%void p.fex)
@ -7243,7 +7243,7 @@
=+ pov=[p=(fish(sut p.waz) p.syx) q=(fish(sut q.waz) q.syx)]
?. &(=(p.syx q.syx) =(p.pov q.pov))
~|(%mull-bonk-a !!)
(both bean)
(both bool)
::
[%zpcb *] ~_((show %o p.gen) $(gen q.gen))
[%zpcm *] [(nice (play p.gen)) (play(sut dox) p.gen)]
@ -7536,11 +7536,11 @@
$(mew t.mew, rag q:(tock p.i.mew ^$(gen q.i.mew) rag))
[%dtkt *] %noun
[%dtls *] [%atom %$]
[%dtzy *] ?:(=(%f p.gen) ?>((lte q.gen 1) bean) [%atom p.gen])
[%dtzy *] ?:(=(%f p.gen) ?>((lte q.gen 1) bool) [%atom p.gen])
[%dtzz *] [%cube q.gen ?:(.?(q.gen) %noun [%atom p.gen])]
[%dttr *] %noun
[%dtts *] bean
[%dtwt *] bean
[%dtts *] bool
[%dtwt *] bool
[%ktbr *] (wrap(sut $(gen p.gen)) %iron)
[%ktls *] $(gen p.gen)
[%ktpm *] (wrap(sut $(gen p.gen)) %zinc)
@ -8814,7 +8814,7 @@
== ::
++ desk ,@tas :: ship desk case spur
++ cage ,[p=lode q=vase] :: structured data
++ chop :: permissions
++ cuff :: permissions
$: p=(unit (set monk)) :: readers
q=(set monk) :: authors
== ::

View File

@ -2000,7 +2000,7 @@
raz=(map path race) :: statements inbound
ryl=(map path rill) :: statements outbound
== ::
++ bean :: terminal control
++ bein :: terminal control
$: $: bul=@ud :: buffer length
bus=@ud :: cursor in buffer
but=(list ,@c) :: buffer text
@ -2055,7 +2055,7 @@
q=@ud :: depth
r=(list (list ,@c)) :: kills
== ::
++ blur ,[p=@ud q=(unit bean) r=blot] :: columns, prompt
++ blur ,[p=@ud q=(unit bein) r=blot] :: columns, prompt
++ boar :: execution instance
$% [%n p=(unit coal) q=claw r=lath] :: new/ready
[%r p=(unit worm)] :: running/done
@ -2121,7 +2121,6 @@
[%helo p=path q=prod] :: trigger prompt
[%hole p=lane q=@] :: packet failed
[%hoop p=(unit)] :: namespace response
[%hope p=path] :: namespace request
[%info p=@p q=@tas r=nori] :: internal edit
[%init p=@p] :: report install
[%into p=@p q=@tas r=nori] :: external edit
@ -2140,7 +2139,7 @@
[%logo p=@] :: logout
[%loot p=@tas q=path] :: request directory
[%make p=(unit ,@t) q=@ud r=@] :: wild license
[%mean p=ship q=term r=chop s=vase] :: application event
[%mean p=ship q=term r=cuff s=vase] :: application event
[%meta p=vase] :: meta-card
[%meat p=ship q=card] :: concrete app action
[%mess p=hasp q=(disk)] :: urbit message
@ -2159,7 +2158,7 @@
[%rest ~] :: reset to factory
[%save p=path q=@] :: write atomic file
[%send p=lane q=@] :: transmit packet
[%show p=hasp q=path r=(unit plan)] :: subscription
[%show p=hasp q=(unit hope)] :: urbit subscribe
[%sith p=@p q=@uw] :: imperial generator
[%soft p=*] :: untyped card
[%sync ~] :: reset soft state
@ -2229,6 +2228,10 @@
cum=(map ,@tas ,*) :: custom dirt
== ::
++ cult (map duct rave) :: subscriptions
++ cuff :: permissions
$: p=(unit (set monk)) :: readers
q=(set monk) :: authors
== ::
++ deed ,[p=@ q=step] :: signature, stage
++ dome :: project state
$: ang=agon :: pedigree
@ -2341,6 +2344,7 @@
++ hiss ,[p=purl q=moth] :: outbound request
++ hist ,[p=@ud q=(list ,@t)] :: depth texts
++ hole ,@t :: session identity
++ hope (pair ,? path) :: view/subscribe
++ hook path :: request origin
++ hoot ,[p=? q=? r=(unit ,@ud) s=host] :: secure/mapped/host
++ hort ,[p=(unit ,@ud) q=host] :: http port/host
@ -2535,6 +2539,7 @@
++ rump ,[p=care q=case r=@tas s=path] :: relative path
++ rung $: rus=(map desk rede) :: neighbor desks
== ::
++ sash (pair term (unit hope)) :: web subscribe
++ saba ,[p=ship q=@tas r=moar s=(list nori)] :: patch/merge
++ sufi :: domestic host
$: hoy=(list ship) :: hierarchy
@ -2552,7 +2557,11 @@
pus=(unit ,@ta) :: password
== ::
++ seam :: logical request
$% [%aps p=term q=term r=path] :: app; logo; path
$% [%apg p=term q=logo r=path] :: app get
[%apl p=term q=@ud r=term] :: app poll
[%apm p=term q=json] :: app message
[%aps p=term q=term r=(unit path)] :: app subscribe
[%apu p=term q=logo r=octs] :: app upload
[%cog p=@ud q=@ud] :: console get
[%con p=@ud] :: console face
[%cop p=@ud q=@ud r=json] :: console put