Various fixes and improvements.

This commit is contained in:
C. Guy Yarvin 2015-06-02 11:36:56 -07:00
parent 3db089b444
commit 282a9ec75f
13 changed files with 60 additions and 20 deletions

View File

@ -32,7 +32,8 @@
q=dojo-build :: general build
== ::
++ dojo-build :: one ford step
$% [%ex p=twig] :: hoon expression
$% [%ec p=mark q=twig] :: caged expression
[%ex p=twig] :: hoon expression
[%di p=dojo-model] :: dialog
[%dv p=path] :: gate from source
[%fi p=dojo-filter q=dojo-source] :: filter
@ -229,9 +230,9 @@
;~ pose
;~(pfix lus (stag %ge dp-model-cat))
;~(pfix wut (stag %di dp-model-dog))
;~(pfix pam (stag %sc dp-model-pig))
;~(pfix buc (stag %va sym))
(stag %ex dp-twig)
;~(pfix pam (stag %ec ;~(plug sym ;~(pfix dot dp-twig))))
(ifix [sel ser] (stag %tu (most ace dp-source)))
==
::
@ -345,6 +346,7 @@
|= bul=dojo-build
^+ [bul +>]
?- -.bul
%ec [bul +>.$]
%ex [bul +>.$]
%di =^(mod +>.$ (dy-init-model p.bul) [[%di mod] +>.$])
%dv [bul +>.$]
@ -553,7 +555,8 @@
%di [/dial (dy-silk-init-modo (dy-cage p.p.p.q.u.cud) q.p.q.u.cud)]
%ge [/gent (dy-silk-init-modo (dy-cage p.p.p.q.u.cud) q.p.q.u.cud)]
%dv [/hand (dy-silk-device p.q.u.cud)]
%ex [/hand [%ride p.q.u.cud [[%done ~ %$ dy-twig-head] [%reef ~]]]]
%ec [/hand [%cast p.q.u.cud (dy-mare q.q.u.cud)]]
%ex [/hand (dy-mare p.q.u.cud)]
%tu :- /hand
:+ %done ~
:- %noun
@ -564,6 +567,11 @@
(slop hed $(p.q.u.cud t.p.q.u.cud))
==
::
++ dy-mare :: build expression
|= gen=twig
^- silk
[%ride gen [[%done ~ %$ dy-twig-head] [%reef ~]]]
::
++ dy-step :: advance project
|= nex=@ud
^+ +>+>

View File

@ -80,6 +80,7 @@
::
++ poke-dill-belt (wrap poke-dill-belt):from-drum
++ poke-helm-init (wrap poke-init):from-helm
++ poke-hood-link (wrap poke-link):from-drum
++ poke-hood-mass (wrap poke-mass):from-helm
++ poke-hood-sync (wrap poke-sync):from-kiln
++ poke-hood-unix (wrap poke-unix):from-kiln

View File

@ -77,6 +77,8 @@
:::: :::::: arvo handlers
:: :: ::
++ peer-sole |=(* abet:show:seen) :: console subscribe
++ prep |=((unit ,[* * axle]) ::
abet:?~(+< +> wild(+<+ +<+))) :: app update
++ poke-sole-action |=(sole-action abet:(work +<)) :: console input
++ pull-sole |=(* abet:sawn) :: console unsubscribe
--

View File

@ -723,9 +723,11 @@
|= [inv=sole-edit buf=(list ,@c)]
^- (list sole-edit)
?~ buf ~
?: =(';' i.buf)
((sh-sane-rule sh-scad) inv (tufa t.buf))
?: =('@' i.buf)
=+ txt=(tufa buf)
?: =(& -:(rose txt aurf:urlp)) ~
?: =(';' -.txt)
((sh-sane-rule sh-scad) inv +.txt)
?: =('@' -.txt)
(sh-sane-chat +.buf)
(sh-sane-chat buf)
::
@ -749,11 +751,14 @@
++ sh-pork :: parse work
^- (unit work)
?~ buf.say.she ~
?: =(';' -.buf.say.she)
(rust (tufa +.buf.say.she) sh-scad)
?: =('@' -.buf.say.she)
`[%say %lin | (crip (tufa +.buf.say.she))]
`[%say %lin & (crip (tufa buf.say.she))]
=+ txt=(tufa buf.say.she)
=+ rou=(rust txt aurf:urlp)
?^ rou `[%say %url u.rou]
?: =(';' -.txt)
(rust +.txt sh-scad)
?: =('@' -.txt)
`[%say %lin | (crip +.txt)]
`[%say %lin & (crip txt)]
::
++ sh-lame :: send error
|= txt=tape
@ -1628,7 +1633,7 @@
^- tape
?+ -.sep ""
%url
(earn p.sep)
[':' ' ' (earf p.sep)]
::
%lin
=+ txt=(trip q.sep)
@ -1639,7 +1644,7 @@
(weld " " txt)
::
%app
[' ' (trip p.sep)]
"[:{(trip p.sep)}]: {(trip q.sep)}"
==
--
::

View File

@ -62,7 +62,7 @@
[%many p=(list coin)] ::
== ::
++ cord ,@t :: text atom (UTF-8)
++ dock (pair ,@p term) :: message target
++ dock (pair ,@p term) :: message target
++ date ,[[a=? y=@ud] m=@ud t=tarp] :: parsed date
++ dime ,[p=@ta q=@] ::
++ each |*([a=$+(* *) b=$+(* *)] $%([& p=a] [| p=b])) :: either a or b

View File

@ -1242,6 +1242,10 @@
=+ nex=$(tep t.tep)
?~(nex ~ [~ i.tep u.nex])
::
++ earf :: purf to tape
|= purf
(weld (earn p) ?~(q "" `tape`['#' (trip u.q)]))
::
++ earl :: localize purl
|= [who=@p pul=purl]
^- purl
@ -1301,6 +1305,8 @@
++ apat :: 2396 abs_path
%+ cook deft
(ifix [fas ;~(pose fas (easy ~))] (more fas smeg))
++ aurf :: 2396 with fragment
;~(plug auri (punt ;~(pfix hax (cook crip (star pque)))))
++ auri :: 2396 URL
%+ cook
|= a=purl
@ -2152,6 +2158,7 @@
++ pred ,[p=@ta q=@tas r=@ta ~] :: proto-path
++ prod ,[p=prom q=tape r=tape] :: prompt
++ prom ?(%text %pass %none) :: format type
++ purf (pair purl (unit ,@t)) :: url with fragment
++ purl ,[p=hart q=pork r=quay] :: parsed url
++ putt :: outgoing message
$: ski=snow :: sequence acked/sent

View File

@ -0,0 +1,11 @@
::
:::: /hook/gate/link/hood/cat
::
/? 314
::
::::
!:
|= $: [now=@da eny=@uvI bec=beak]
[[who=ship dap=term ~] ~]
==
[%hood-link who dap]

View File

@ -8,4 +8,4 @@
|= $: [now=@da eny=@uvI bec=beak]
[[syd=desk dap=term ~] ~]
==
[%hood-start who dap]
[%hood-start syd dap]

View File

@ -202,6 +202,11 @@
=< se-abet =< se-view
(se-born wel)
::
++ poke-link ::
|= gyl=gill
=< se-abet =< se-view
(se-link gyl)
::
++ reap ::
|= [way=wire saw=(unit tang)]
=< se-abet =< se-view

View File

@ -7,7 +7,7 @@
:::: :: :: semantics
!: :: ::
|%
++ icon |=(? ?:(+< 'X' 'O')) :: display at
++ icon |=(? ?:(+< 'Z' 'O')) :: display at
++ bo :: per board
|_ bud=board ::
++ bit |=(@ =(1 (cut 0 [+< 1] bud))) :: moved at address

View File

@ -16,6 +16,7 @@
%czar %court
%king %floor
==
::
++ said :: app message
|= [our=@p dap=term now=@da eny=@uvI mes=(list tank)]
:- %talk-command
@ -33,5 +34,5 @@
^- thought
:+ -
[[[%& our (main our)] [*envelope %pending]] ~ ~]
[now *bouquet [%app (crip ~(ram re tan))]]
[now *bouquet [%app dap (crip ~(ram re tan))]]
--

View File

@ -72,7 +72,7 @@
^- $+(json (unit statement))
=- (ot date/di bouquet/(as (ar so)) speech/(of -) ~)
:~ lin/(ot say/bo txt/so ~)
url/(su auri:urlp)
url/(su aurf:urlp)
:: exp/(cu |=(a=cord [a ~]) so)
:: inv/(ot ship/(su fed:ag) party/(su urs:ab) ~)
==

View File

@ -59,11 +59,11 @@
[%ext p=@tas q=*] :: extended action
[%fat p=torso q=speech] :: attachment
:: [%inv p=station] :: invite to station
[%url p=purl] :: parsed url
[%url p=purf] :: parsed url
[%ire p=serial q=speech] :: in-reply-to
[%lin p=? q=@t] :: no=@, text line
[%mor p=(list speech)] :: multiplex
[%app p=@t] :: app message
[%app p=@tas q=@t] :: app message
== ::
++ serial ,@uvH :: unique identity
++ partner (each station passport) :: interlocutor