put flops on all tang->text boundaries

This commit is contained in:
Anton Dyudin 2015-06-16 14:01:07 -07:00
parent 035d5c1efa
commit e042154265
8 changed files with 13 additions and 27 deletions

View File

@ -159,7 +159,7 @@
|= [err=@tas tac=(list tank)]
=+ ^= wol ^- wall
:- (trip err)
(zing (turn tac |=(a=tank (~(win re a) [0 wid]))))
(zing (turn (flop tac) |=(a=tank (~(win re a) [0 wid]))))
|- ^+ +>.^$
?~ wol +>.^$
$(wol t.wol, +>.^$ (from %out (tuba i.wol)))
@ -285,12 +285,7 @@
[%c %mere *]
?: ?=(%& -.p.sih)
+>.$
~| %dill-mere-fail
~| p.p.p.sih
|-
?~ q.p.p.sih !!
~> %mean.|.(i.q.p.p.sih) :: pull ford fail into stack trace
$(q.p.p.sih t.q.p.p.sih)
(mean >%dill-mere-fail< >p.p.p.sih< q.p.p.sih)
::
[%g %onto *]
:: ~& [%take-gall-onto +>.sih]

View File

@ -918,9 +918,9 @@
^+ +>
=+ cug=(ap-find /lame)
?~ cug
=. why (turn why |=(a=tank rose/[~ "! " ~]^[a]~))
=. why [>%ap-lame< >wut< (turn why |=(a=tank rose/[~ "! " ~]^[a]~))]
~& [%ap-lame dap]
~> %slog.`%*(. >[%ap-lame wut %why]< |2.+> why)
~> %slog.`%*(. >[%wh %y]< +> (flop why))
+>.$
=^ cam +>.$
%+ ap-call q.u.cug

View File

@ -155,7 +155,7 @@
++ rule |=(tub=nail `edge`[p.tub ~ ~ tub]) :: parsing rule
++ span ,@ta :: text-atom (ASCII)
++ spot ,[p=path q=pint] :: range in file
++ tang (list tank) :: general error
++ tang (list tank) :: bottom-first error
++ tank $% [%leaf p=tape] :: printing formats
$: %palm :: backstep list
p=[p=tape q=tape r=tape s=tape] ::
@ -1854,7 +1854,7 @@
|= [a=?(~ @u) b=tang] ^+ same :: .= ~&(%a 1)
?~(b same ~>(%slog.[a i.b] $(b t.b))) :: ((slog `~[>%a<]) 1)
::
++ mean |=(a=tang (fear a |.(!!))) :: deify stack trace
++ mean |=(a=tang (fear (flop a) |.(!!))) :: deify stack trace
++ fear :: insert user mean
|* [a=tang _|?(**)]
^+ (+<+)

View File

@ -222,7 +222,7 @@
?~ saw +>
=+ gyl=(drum-phat way)
?: (se-aint gyl) +>.$
~& [%drum-coup-fail src ost gyl u.saw]
=. u.saw :_(u.saw >[%drum-coup-fail src ost gyl]<)
(se-dump:(se-drop & gyl) u.saw)
::
++ take-onto ::
@ -366,7 +366,7 @@
|= tac=(list tank)
^+ +>
?. se-ably (se-talk tac)
=+ wol=`wall`(zing (turn tac |=(a=tank (~(win re a) [0 edg]))))
=+ wol=`wall`(zing (turn (flop tac) |=(a=tank (~(win re a) [0 edg]))))
|- ^+ +>.^$
?~ wol +>.^$
$(wol t.wol, +>.^$ (se-blit %out (tuba i.wol)))
@ -791,7 +791,7 @@
::
++ ta-tan :: print tanks
|= tac=(list tank)
=+ wol=`wall`(zing (turn tac |=(a=tank (~(win re a) [0 edg]))))
=+ wol=`wall`(zing (turn (flop tac) |=(a=tank (~(win re a) [0 edg]))))
|- ^+ +>.^$
?~ wol +>.^$
$(wol t.wol, +>+>.^$ (se-text i.wol))

View File

@ -1,9 +0,0 @@
|% ++ mean |=(a=tang (mean-wrap a |.(!!)))
++ mean-wrap
|* [a=tang _|?(**)]
^+ (+<+)
=> .(a `tang`a)
?~ a (+<+)
~> %mean.|.(i.a)
$(a t.a)
--

View File

@ -2,8 +2,8 @@
:::: /hoon/httr/mar
::
/? 314
!:
|_ hit=httr
::
++ grow |% ++ wall (turn wain trip)
++ wain (lore cord)
++ json (need (poja cord))

View File

@ -28,7 +28,7 @@
|= [wid=@u tan=tang]
^- tape
=+ rolt=|=(a=wall `tape`?~(a ~ ?~(t.a i.a :(weld i.a "\0a" $(a t.a)))))
(rolt (turn tan |=(a=tank (rolt (wash 0^wid a)))))
(rolt (turn (flop tan) |=(a=tank (rolt (wash 0^wid a)))))
::
--
!:

View File

@ -1,5 +1,5 @@
::
:::: /hoon/core/elem/mar
:::: /hoon/core/tang/mar
::
/? 314
!:
@ -10,7 +10,7 @@
++ elem
=- ;pre:code:"{(trip (role (turn - crip)))}" :: XX
^- wall %- zing ^- (list wall)
(turn tan |=(a=tank (wash 0^160 a)))
(turn (flop tan) |=(a=tank (wash 0^160 a)))
--
++ grab :: convert from
|%